diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json index d6dd61dc6f48..56911d99554c 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json @@ -9,7 +9,7 @@ "regions": [ "westus" ], - "$skipToken": "fakeSkipTokenCode" + "skipToken": "fakeSkipTokenCode" } }, "responses": { @@ -24,7 +24,12 @@ "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", "connectivityTopology": "HubAndSpoke", - "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "hubs": [ + { + "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "resourceType": "Microsoft.Network/virtualNetworks" + } + ], "isGlobal": "True", "deleteExistingPeering": "True", "appliesToGroups": [ @@ -43,10 +48,10 @@ "properties": { "displayName": "My Network Group", "description": "A group for all test Virtual Networks", - "memberType": "VirtualNetwork", + "memberType": "Microsoft.Network/virtualNetworks", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" } ], "conditionalMembership": "", @@ -56,7 +61,7 @@ ] } ], - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json index 49d3635ff736..40360627aab9 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json @@ -9,7 +9,7 @@ "regions": [ "westus" ], - "$skipToken": "fakeSkipTokenCode" + "skipToken": "fakeSkipTokenCode" } }, "responses": { @@ -64,10 +64,10 @@ "properties": { "displayName": "My Network Group", "description": "A group for all test Virtual Networks", - "memberType": "VirtualNetwork", + "memberType": "Microsoft.Network/virtualNetworks", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" } ], "conditionalMembership": "", @@ -77,7 +77,7 @@ ] } ], - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityUserRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityUserRulesList.json index 9396eb74d235..41aa16fdca54 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityUserRulesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityUserRulesList.json @@ -9,7 +9,7 @@ "regions": [ "westus" ], - "$skipToken": "fakeSkipTokenCode" + "skipToken": "fakeSkipTokenCode" } }, "responses": { @@ -61,10 +61,10 @@ "properties": { "displayName": "My Network Group", "description": "A group for all test Virtual Networks", - "memberType": "VirtualNetwork", + "memberType": "Microsoft.Network/virtualNetworks", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" } ], "conditionalMembership": "", @@ -74,7 +74,7 @@ ] } ], - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json index 0f975692a4bb..d17b0c5e7817 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json @@ -12,7 +12,7 @@ "body": { "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", "name": "testRuleCollection", - "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json index 49e04b4dbf73..34cfcf4f51f7 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json @@ -13,7 +13,7 @@ { "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", "name": "testRuleCollection", - "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionPut.json index ec9dc2e17b78..b3c85257c820 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionPut.json @@ -47,7 +47,7 @@ "body": { "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig", "name": "myTestSecurityConfig", - "type": "Microsoft.Network/networkManagers/securityConfigurations", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json index 9d1f7bbaf8ab..c893db0c2a36 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationGet.json @@ -25,12 +25,17 @@ "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", "connectivityTopology": "HubAndSpoke", - "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "hubs": [ + { + "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "resourceType": "Microsoft.Network/virtualNetworks" + } + ], "isGlobal": "True", "deleteExistingPeering": "True", "appliesToGroups": [ { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", + "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1", "useHubGateway": "True", "groupConnectivity": "None", "isGlobal": "False" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json index 1da054d3a714..b3eeedcce836 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationList.json @@ -26,12 +26,17 @@ "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", "connectivityTopology": "HubAndSpoke", - "hubId": "subscriptions/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "hubs": [ + { + "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "resourceType": "Microsoft.Network/virtualNetworks" + } + ], "deleteExistingPeering": "True", "isGlobal": "True", "appliesToGroups": [ { - "networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", + "networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/netwrokGroups/group1", "useHubGateway": "True", "groupConnectivity": "None", "isGlobal": "False" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json index 6b95e1b019dd..dee544021977 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerConnectivityConfigurationPut.json @@ -11,12 +11,17 @@ "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", "connectivityTopology": "HubAndSpoke", - "hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "hubs": [ + { + "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "resourceType": "Microsoft.Network/virtualNetworks" + } + ], "deleteExistingPeering": "True", "isGlobal": "True", "appliesToGroups": [ { - "networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagerGroups/group1", + "networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1", "useHubGateway": "True", "groupConnectivity": "None", "isGlobal": "False" @@ -43,7 +48,12 @@ "displayName": "myTestConnectivityConfig", "description": "Sample Connectivity Configuration", "connectivityTopology": "HubAndSpoke", - "hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "hubs": [ + { + "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "resourceType": "Microsoft.Network/virtualNetworks" + } + ], "deleteExistingPeering": "True", "isGlobal": "True", "appliesToGroups": [ @@ -75,12 +85,17 @@ "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", "connectivityTopology": "HubAndSpoke", - "hubId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "hubs": [ + { + "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "resourceType": "Microsoft.Network/virtualNetworks" + } + ], "deleteExistingPeering": "True", "isGlobal": "True", "appliesToGroups": [ { - "networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagerGroups/group1", + "networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1", "useHubGateway": "True", "groupConnectivity": "None", "isGlobal": "False" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json index 9073e69aec49..63ad4ba63cda 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRulePut.json @@ -18,7 +18,7 @@ "200": { "body": { "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/SecurityUserConfigurations/Policy1/ruleCollections/testRuleCollection/rules/SampleUserRule", - "type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations/ruleCollections/rules", "name": "SampleDefaultUserRule", "kind": "Default", "systemData": { @@ -59,7 +59,7 @@ "201": { "body": { "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleDefaultUserRule", - "type": "Microsoft.Network/networkManagers/SecurityUserConfigurations/ruleCollections/rules", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations/ruleCollections/rules", "name": "SampleDefaultUserRule", "kind": "Default", "systemData": { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDeploymentStatusList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDeploymentStatusList.json index e4070ae0b344..9f0bec264fd2 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDeploymentStatusList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDeploymentStatusList.json @@ -14,7 +14,7 @@ "Connectivity", "AdminPolicy" ], - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } }, "responses": { @@ -44,7 +44,7 @@ "errorMessage": "" } ], - "$skipToken": "NextFakeSkipTokenCode" + "skipToken": "NextFakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json index dae0d97fcebd..0ba12cb2a778 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json @@ -6,7 +6,7 @@ "resourceGroupName": "myResourceGroup", "virtualNetworkName": "testVirtualNetwork", "parameters": { - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } }, "responses": { @@ -19,7 +19,12 @@ "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", "connectivityTopology": "HubAndSpoke", - "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "hubs": [ + { + "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "resourceType": "Microsoft.Network/virtualNetworks" + } + ], "isGlobal": "True", "deleteExistingPeering": "True", "appliesToGroups": [ @@ -38,10 +43,10 @@ "properties": { "displayName": "My Network Group", "description": "A group for all test Virtual Networks", - "memberType": "VirtualNetwork", + "memberType": "Microsoft.Network/virtualNetworks", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" } ], "conditionalMembership": "", @@ -51,7 +56,7 @@ ] } ], - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityAdminRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityAdminRulesList.json index 2d947017c9a0..d0f8644289f2 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityAdminRulesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityAdminRulesList.json @@ -6,7 +6,7 @@ "resourceGroupName": "myResourceGroup", "virtualNetworkName": "testVirtualNetwork", "parameters": { - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } }, "responses": { @@ -62,7 +62,7 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" } ], "conditionalMembership": "", @@ -72,7 +72,7 @@ ] } ], - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksList.json index 77e6534be6ca..0434514f8011 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksList.json @@ -7,7 +7,7 @@ "networkManagerName": "testNetworkManager", "networkGroupName": "TestNetworkGroup", "parameters": { - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } }, "responses": { @@ -20,7 +20,7 @@ "membershipType": "Static" } ], - "$skipToken": "NextFakeSkipTokenCode" + "skipToken": "NextFakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json index d28c208753f5..dee2ec946812 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveVirtualNetworksListByNetworkManager.json @@ -7,7 +7,7 @@ "networkManagerName": "testNetworkManager", "parameters": { "conditionalMembers": "location='useast2'", - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } }, "responses": { @@ -20,7 +20,7 @@ "membershipType": "Static" } ], - "$skipToken": "NextFakeSkipTokenCode" + "skipToken": "NextFakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupGet.json index 81a8884ec628..e69da703e107 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupGet.json @@ -27,8 +27,7 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1", - "subnetId": "" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" } ], "conditionalMembership": "", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupList.json index 2857e2c241f2..5e4dd8701d5c 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupList.json @@ -28,7 +28,7 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" } ], "conditionalMembership": "", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupPut.json index 3c3ac5b8c03e..fc7ae985854d 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGroupPut.json @@ -13,8 +13,7 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1", - "subnetId": "" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" } ], "conditionalMembership": "" @@ -44,8 +43,7 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1", - "subnetId": "" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetworks/vnet1" } ], "conditionalMembership": "", @@ -75,8 +73,7 @@ "memberType": "VirtualNetwork", "groupMembers": [ { - "vnetId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1", - "subnetId": "" + "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" } ], "conditionalMembership": "", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationGet.json index db64b57fad1b..44ceaafd13d9 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationGet.json @@ -9,9 +9,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig", "name": "myTestSecurityConfig", - "type": "Microsoft.Network/networkManagers/securityConfigurations", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationList.json index 6d5536e42812..3d50290a5e51 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationList.json @@ -10,9 +10,9 @@ "body": { "value": [ { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig", "name": "myTestSecurityConfig", - "type": "Microsoft.Network/networkManagers/securityConfigurations", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -30,7 +30,7 @@ } } ], - "nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations?api-version=2021-02-01-preview&$skipToken=10" + "nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations?api-version=2021-02-01-preview&$skipToken=10" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationPut.json index feaae888ed13..10769ed69bea 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityAdminConfigurationPut.json @@ -16,9 +16,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig", "name": "myTestSecurityConfig", - "type": "Microsoft.Network/networkManagers/securityConfigurations", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -38,9 +38,9 @@ }, "201": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManager/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig", "name": "myTestSecurityConfig", - "type": "Microsoft.Network/networkManagers/securityConfigurations", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationGet.json index 4c07b47433e3..b43b504e3503 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationGet.json @@ -9,9 +9,9 @@ "responses": { "200": { "body": { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig", "name": "myTestSecurityConfig", - "type": "Microsoft.Network/networkManagers/securityConfigurations", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationList.json index 41b9a56f35d0..a18279f244de 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationList.json @@ -10,9 +10,9 @@ "body": { "value": [ { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/myTestSecurityConfig", + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig", "name": "myTestSecurityConfig", - "type": "Microsoft.Network/networkManagers/securityConfigurations", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", @@ -30,7 +30,7 @@ } } ], - "nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations?api-version=2021-02-01-preview&$skipToken=10" + "nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations?api-version=2021-02-01-preview&$skipToken=10" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionGet.json index 8f55c9d627ad..8b1af45420ca 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionGet.json @@ -12,7 +12,7 @@ "body": { "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", "name": "testRuleCollection", - "type": "Microsoft.Network/networkManagers/securityUserConfigurations/RuleCollections", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations/ruleCollections", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionList.json index 86f6b6c1b164..73729b7ed4d1 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionList.json @@ -13,7 +13,7 @@ { "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", "name": "testRuleCollection", - "type": "Microsoft.Network/networkManagers/securityUserConfigurations/RuleCollections", + "type": "Microsoft.Network/networkManagers/securityUserConfigurations/ruleCollections", "systemData": { "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", "createdByType": "User", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleList.json index 450a68d6d5dc..9ff254e5e12d 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleList.json @@ -13,7 +13,7 @@ "value": [ { "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/ruleCollections/UserRules", + "type": "Microsoft.Network/networkManagers/securityConfigurations/ruleCollections/rules", "name": "SampleUserRule", "kind": "Custom", "systemData": { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManager.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManager.json index a10657c5b844..afea315d69a7 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManager.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManager.json @@ -410,7 +410,7 @@ { "name": "parameters", "in": "body", - "required": false, + "required": true, "schema": { "$ref": "#/definitions/EffectiveVirtualNetworksParameter" }, @@ -572,7 +572,7 @@ }, "description": "List of deployment types." }, - "$skipToken": { + "skipToken": { "description": "Continuation token for pagination, capturing the next page size and offset, as well as the context of the query.", "type": "string" } @@ -588,7 +588,7 @@ }, "description": "Gets a page of Network Manager Deployment Status" }, - "$skipToken": { + "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" } @@ -657,7 +657,7 @@ "type": "string", "description": "Conditional Members." }, - "$skipToken": { + "skipToken": { "description": "Continuation token for pagination, capturing the next page size and offset, as well as the context of the query.", "type": "string" } 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 fa0ae03a5abb..11722edfe471 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 @@ -199,7 +199,7 @@ }, "description": "List of regions." }, - "$skipToken": { + "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" } @@ -236,7 +236,7 @@ }, "description": "Gets a page of active connectivity configurations." }, - "$skipToken": { + "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" } @@ -253,7 +253,7 @@ }, "description": "Gets a page of active security admin rules." }, - "$skipToken": { + "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" } @@ -270,7 +270,7 @@ }, "description": "Gets a page of active security user rules." }, - "$skipToken": { + "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" } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json index 39348f651e58..05e0bf874eb4 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json @@ -259,9 +259,12 @@ }, "description": "Connectivity topology type." }, - "hubId": { - "type": "string", - "description": "The hub vnet Id." + "hubs": { + "type": "array", + "items": { + "$ref": "#/definitions/Hub" + }, + "description": "List of hubItems" }, "isGlobal": { "type": "string", @@ -305,6 +308,20 @@ ], "description": "Properties of network manager connectivity configuration" }, + "Hub": { + "type": "object", + "properties": { + "resourceId": { + "type": "string", + "description": "Resource Id." + }, + "resourceType": { + "type": "string", + "description": "Resource Type." + } + }, + "description": "Hub Item." + }, "connectivityGroupItem": { "type": "object", "properties": { 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 240721e56035..d4904a945b31 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 @@ -148,7 +148,7 @@ }, "description": "Gets a page of NetworkManagerEffectiveConnectivityConfiguration" }, - "$skipToken": { + "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" } @@ -165,7 +165,7 @@ }, "description": "Gets a page of NetworkManagerEffectiveSecurityAdminRules" }, - "$skipToken": { + "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" } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json index b15d672de320..8c2b26ad18fc 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json @@ -324,15 +324,7 @@ }, "memberType": { "type": "string", - "description": "Group member type.", - "enum": [ - "VirtualNetwork", - "Subnet" - ], - "x-ms-enum": { - "name": "MemberType", - "modelAsString": true - } + "description": "Group member type." }, "groupMembers": { "type": "array", @@ -356,20 +348,16 @@ "groupMembersItem": { "type": "object", "properties": { - "vnetId": { - "type": "string", - "description": "Vnet Id." - }, - "subnetId": { + "resourceId": { "type": "string", - "description": "Subnet Id." + "description": "Resource Id." } }, "description": "GroupMembers Item." }, "QueryRequestOptions": { "properties": { - "$skipToken": { + "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" } @@ -385,7 +373,7 @@ }, "description": "Gets a page of EffectiveVirtualNetwork" }, - "$skipToken": { + "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" } diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index 6bf4a0660afb..494a5e55514a 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-03 +tag: package-2021-02-preview ``` ### Tag: package-2021-03