diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json deleted file mode 100644 index 8874039ebcef..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "title": "List Azure Virtual Network Manager Effective Configuration by Subnet", - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subscriptionA", - "resourceGroupName": "myResourceGroup", - "virtualNetworkName": "testVirtualNetwork", - "subnetName": "testSubnet", - "parameters": { - "$skipToken": "FakeSkipTokenCode" - } - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", - "configurationDisplayName": "SampleConfig", - "configurationDescription": "SampleDescription", - "ruleCollectionDisplayName": "SampleRuleCollection", - "ruleCollectionDescription": "SampleRuleCollectionDescription", - "ruleCollectionAppliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ], - "kind": "Custom", - "properties": { - "displayName": "SampleUserRule", - "description": "Sample User Rule", - "protocol": "Tcp", - "sources": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destinations": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "direction": "Inbound", - "provisioningState": "Succeeded" - }, - "ruleGroups": [ - { - "id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1", - "properties": { - "displayName": "My Network Group", - "description": "A group for all test Virtual Networks", - "memberType": "VirtualNetwork", - "groupMembers": [ - { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" - } - ], - "conditionalMembership": "", - "provisioningState": "Succeeded" - } - } - ] - } - ], - "$skipToken": "FakeSkipTokenCode" - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json index e1e2f6d687c9..fa0ae03a5abb 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json @@ -51,7 +51,7 @@ { "name": "parameters", "in": "body", - "required": false, + "required": true, "schema": { "$ref": "#/definitions/ActiveConfigurationParameter" }, @@ -102,7 +102,7 @@ { "name": "parameters", "in": "body", - "required": false, + "required": true, "schema": { "$ref": "#/definitions/ActiveConfigurationParameter" }, @@ -153,7 +153,7 @@ { "name": "parameters", "in": "body", - "required": false, + "required": true, "schema": { "$ref": "#/definitions/ActiveConfigurationParameter" }, diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json index ccfae67be11d..240721e56035 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json @@ -135,64 +135,6 @@ } } } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/listNetworkManagerEffectiveSecurityUserRules": { - "parameters": [ - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/VirtualNetworkNameParameter" - }, - { - "name": "subnetName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the subnet." - }, - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "name": "parameters", - "in": "body", - "required": true, - "schema": { - "$ref": "./networkManagerGroup.json#/definitions/QueryRequestOptions" - }, - "description": "Parameters supplied to list correct page." - } - ], - "post": { - "tags": [ - "NetworkManagerEffectiveSecurityUserRules" - ], - "operationId": "EffectiveSecurityUserRules_ListBySubnet", - "description": "List all effective security user rules in a subnet.", - "responses": { - "200": { - "description": "OK - Returns information about all effective configurations in a subnet.", - "schema": { - "$ref": "#/definitions/NetworkManagerEffectiveSecurityUserRulesListResult" - } - }, - "default": { - "description": "Resource Provider error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "List effective security user rules applied on a subnet": { - "$ref": "./examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json" - } - } - } } }, "definitions": { @@ -230,23 +172,6 @@ }, "description": "Result of the request to list networkManagerEffectiveSecurityAdminRules. It contains a list of groups and a skiptoken to get the next set of results." }, - "NetworkManagerEffectiveSecurityUserRulesListResult": { - "type": "object", - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/EffectiveBaseSecurityUserRule" - }, - "description": "Gets a page of NetworkManagerEffectiveSecurityUserRules" - }, - "$skipToken": { - "description": "When present, the value can be passed to a subsequent query call (together with the same query and scopes used in the current request) to retrieve the next page of data.", - "type": "string" - } - }, - "description": "Result of the request to list NetworkManagerEffectiveSecurityUserRules. It contains a list of groups and a skiptoken to get the next set of results." - }, "EffectiveConnectivityConfiguration": { "type": "object", "properties": { @@ -359,96 +284,6 @@ "description": "Network default admin rule.", "x-ms-discriminator-value": "Default" }, - "EffectiveBaseSecurityUserRule": { - "type": "object", - "properties": { - "id": { - "type": "string", - "description": "Resource ID." - }, - "configurationDisplayName": { - "type": "string", - "description": "A display name of the security user configuration." - }, - "configurationDescription": { - "type": "string", - "description": "A description of the security user configuration." - }, - "ruleCollectionDisplayName": { - "type": "string", - "description": "A display name of the rule collection." - }, - "ruleCollectionDescription": { - "type": "string", - "description": "A description of the rule collection." - }, - "ruleCollectionAppliesToGroups": { - "type": "array", - "items": { - "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/NetworkManagerSecurityGroupItem" - }, - "description": "Groups for rule collection" - }, - "ruleGroups": { - "type": "array", - "items": { - "$ref": "#/definitions/ConfigurationGroup" - }, - "description": "Effective configuration groups." - }, - "kind": { - "type": "string", - "description": "Whether the rule is custom or default.", - "enum": [ - "Custom", - "Default" - ], - "x-ms-enum": { - "name": "EffectiveUserRuleKind", - "modelAsString": true - } - } - }, - "required": [ - "kind" - ], - "discriminator": "kind", - "description": "Network base rule." - }, - "EffectiveSecurityUserRule": { - "type": "object", - "properties": { - "properties": { - "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/UserRulePropertiesFormat", - "x-ms-client-flatten": true, - "description": "Indicates the properties of the security user rule" - } - }, - "allOf": [ - { - "$ref": "#/definitions/EffectiveBaseSecurityUserRule" - } - ], - "description": "Network security user rule.", - "x-ms-discriminator-value": "Custom" - }, - "EffectiveDefaultSecurityUserRule": { - "type": "object", - "properties": { - "properties": { - "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/DefaultUserRulePropertiesFormat", - "x-ms-client-flatten": true, - "description": "Indicates the properties of the security default user rule" - } - }, - "allOf": [ - { - "$ref": "#/definitions/EffectiveBaseSecurityUserRule" - } - ], - "description": "Network security default user rule.", - "x-ms-discriminator-value": "Default" - }, "ConfigurationGroup": { "type": "object", "properties": { diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index a99ad8d102a5..2a21b6efb755 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -28,7 +28,7 @@ These are the global settings for the Network API. title: NetworkManagementClient description: Network Client openapi-type: arm -tag: package-2021-02 +tag: package-2021-02-preview ```