From 4e07577882e630ccbb5820bb2c397c5860394b65 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Thu, 17 Jun 2021 14:14:13 -0700 Subject: [PATCH 01/23] Add ResourceGuid to NetworkManager --- ...NetworkManagerActiveConfigurationList.json | 8 ++++++++ .../NetworkManagerAdminRuleCollectionGet.json | 1 + ...NetworkManagerAdminRuleCollectionList.json | 1 + .../NetworkManagerAdminRuleCollectionPut.json | 2 ++ .../examples/NetworkManagerAdminRuleGet.json | 1 + .../examples/NetworkManagerAdminRulePut.json | 2 ++ .../NetworkManagerAdminRulesList.json | 1 + ...rkManagerConnectivityConfigurationGet.json | 1 + ...kManagerConnectivityConfigurationList.json | 1 + ...rkManagerConnectivityConfigurationPut.json | 2 ++ .../NetworkManagerDefaultAdminRuleGet.json | 1 + .../NetworkManagerDefaultAdminRulePut.json | 2 ++ .../NetworkManagerDefaultUserRuleGet.json | 1 + .../NetworkManagerDefaultUserRulePut.json | 2 ++ ...orkManagerEffectiveConfigurationsList.json | 8 ++++++++ ...erEffectiveConfigurationsListBySubnet.json | 8 ++++++++ .../examples/NetworkManagerGet.json | 1 + .../examples/NetworkManagerGroupGet.json | 1 + .../examples/NetworkManagerGroupList.json | 1 + .../examples/NetworkManagerGroupPut.json | 2 ++ .../examples/NetworkManagerList.json | 1 + .../examples/NetworkManagerListAll.json | 1 + .../examples/NetworkManagerPatch.json | 1 + .../examples/NetworkManagerPut.json | 2 ++ ...kManagerSecurityAdminConfigurationGet.json | 1 + ...ManagerSecurityAdminConfigurationList.json | 1 + ...kManagerSecurityAdminConfigurationPut.json | 2 ++ ...rkManagerSecurityUserConfigurationGet.json | 1 + ...kManagerSecurityUserConfigurationList.json | 1 + ...rkManagerSecurityUserConfigurationPut.json | 2 ++ .../NetworkManagerUserRuleCollectionGet.json | 1 + .../NetworkManagerUserRuleCollectionList.json | 1 + .../NetworkManagerUserRuleCollectionPut.json | 2 ++ .../examples/NetworkManagerUserRuleGet.json | 1 + .../examples/NetworkManagerUserRulePut.json | 2 ++ .../examples/NetworkManagerUserRulesList.json | 1 + .../2021-02-01-preview/networkManager.json | 5 +++++ ...tworkManagerConnectivityConfiguration.json | 5 +++++ .../networkManagerEffectiveConfiguration.json | 5 +++++ .../networkManagerGroup.json | 5 +++++ ...workManagerSecurityAdminConfiguration.json | 20 +++++++++++++++++++ ...tworkManagerSecurityUserConfiguration.json | 10 ++++++++++ 42 files changed, 118 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json index d34d2aed0503..ab303e1bfcd6 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json @@ -37,6 +37,7 @@ "isGlobal": "True" } ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" }, "configurationGroups": [ @@ -52,6 +53,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -69,6 +71,7 @@ "configurationDescription": "Sample User Config", "displayName": "testRuleCollection", "description": "A sample rule collection", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -97,6 +100,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -120,6 +124,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -137,6 +142,7 @@ "configurationDescription": "Sample Admin Config", "displayName": "testRuleCollection", "description": "A sample rule collection", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -168,6 +174,7 @@ "direction": "Inbound", "access": "Deny", "priority": 1, + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -191,6 +198,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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..ec4cdc5e690c 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 @@ -25,6 +25,7 @@ "displayName": "testRuleCollection", "description": "A sample rule collection", "provisioningState": "Succeeded", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" 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..62c922544932 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 @@ -26,6 +26,7 @@ "displayName": "testRuleCollection", "description": "A sample rule collection", "provisioningState": "Succeeded", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" 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..c4f3b500882d 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 @@ -35,6 +35,7 @@ "displayName": "myTestSecurityConfig", "description": "A sample policy", "provisioningState": "Succeeded", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" @@ -60,6 +61,7 @@ "displayName": "myTestSecurityConfig", "description": "A sample policy", "provisioningState": "Succeeded", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json index a7dea3683b32..d570e1cac35a 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json @@ -48,6 +48,7 @@ "access": "Deny", "priority": 1, "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json index 7d38b0c7d5cf..87f3b183c208 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json @@ -75,6 +75,7 @@ "access": "Deny", "priority": 1, "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -117,6 +118,7 @@ "access": "Deny", "priority": 1, "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json index 38f8fef50044..bceac8ca1175 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json @@ -48,6 +48,7 @@ "access": "Deny", "priority": 1, "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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..a9bb900f1545 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 @@ -36,6 +36,7 @@ "isGlobal": "False" } ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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..deac336317d9 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 @@ -37,6 +37,7 @@ "isGlobal": "False" } ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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..10625154c0e4 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 @@ -54,6 +54,7 @@ "isGlobal": "False" } ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -86,6 +87,7 @@ "isGlobal": "False" } ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json index cffdf54e631f..98d58d59408a 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json @@ -49,6 +49,7 @@ "access": "Deny", "priority": 1, "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json index 224559196dc7..96999048fd67 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json @@ -54,6 +54,7 @@ "access": "Deny", "priority": 1, "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -97,6 +98,7 @@ "access": "Deny", "priority": 1, "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json index c8adcacd2598..d0b2bf66d9a5 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json @@ -47,6 +47,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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..465f7e46ba70 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 @@ -52,6 +52,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -93,6 +94,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json index 34f200e69116..ab99faf0037e 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json @@ -31,6 +31,7 @@ "isGlobal": "False" } ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" }, "configurationGroups": [ @@ -46,6 +47,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -59,6 +61,7 @@ "configurationDescription": "Sample User Config", "displayName": "testRuleCollection", "description": "A sample rule collection", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -87,6 +90,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -110,6 +114,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -123,6 +128,7 @@ "configurationDescription": "Sample Admin Config", "displayName": "testRuleCollection", "description": "A sample rule collection", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -154,6 +160,7 @@ "direction": "Inbound", "access": "Deny", "priority": 1, + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -177,6 +184,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json index cf7dcf245fc4..731014d4b6a0 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json @@ -32,6 +32,7 @@ "isGlobal": "False" } ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" }, "configurationGroups": [ @@ -47,6 +48,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -58,6 +60,7 @@ "properties": { "displayName": "testRuleCollection", "description": "A sample rule collection", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -86,6 +89,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -109,6 +113,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -122,6 +127,7 @@ "configurationDescription": "Sample Admin Config", "displayName": "testRuleCollection", "description": "A sample rule collection", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -153,6 +159,7 @@ "direction": "Inbound", "access": "Deny", "priority": 1, + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -176,6 +183,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json index 763addbf35bb..a7edeea3530b 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json @@ -32,6 +32,7 @@ "networkManagerScopeAccesses": [ "UserSecurity" ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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..6c67b7965c13 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 @@ -32,6 +32,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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..efd9679fdc7d 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 @@ -32,6 +32,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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..b7e3e91a54d3 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 @@ -49,6 +49,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -80,6 +81,7 @@ } ], "conditionalMembership": "", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json index 50f571f4958a..4af209c0c5dc 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json @@ -34,6 +34,7 @@ "networkManagerScopeAccesses": [ "Connectivity" ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json index 4a53208631dc..a035138b639b 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json @@ -33,6 +33,7 @@ "networkManagerScopeAccesses": [ "UserSecurity" ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json index 8f9037afec2c..ba6a039692e1 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json @@ -44,6 +44,7 @@ "networkManagerScopeAccesses": [ "UserSecurity" ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json index 95f43c7e8fad..49794669ff3a 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json @@ -52,6 +52,7 @@ "networkManagerScopeAccesses": [ "Connectivity" ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -84,6 +85,7 @@ "networkManagerScopeAccesses": [ "Connectivity" ], + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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..7ab4e8f0837b 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 @@ -25,6 +25,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "AdminPolicy", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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..1c4e69d03fb6 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 @@ -26,6 +26,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "AdminPolicy", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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..9586f054feac 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 @@ -32,6 +32,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "AdminPolicy", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } @@ -54,6 +55,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "AdminPolicy", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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..9131a21741d5 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 @@ -25,6 +25,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "UserPolicy", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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..36a9e260cce3 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 @@ -26,6 +26,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "UserPolicy", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json index dbdfceff66c0..2af1449a5eb3 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json @@ -32,6 +32,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "UserPolicy", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } @@ -54,6 +55,7 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "UserPolicy", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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..8ff08bf91a0f 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 @@ -25,6 +25,7 @@ "displayName": "testRuleCollection", "description": "A sample rule collection", "provisioningState": "Succeeded", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" 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..31914a26e382 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 @@ -25,6 +25,7 @@ "properties": { "displayName": "testRuleCollection", "description": "A sample rule collection", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "appliesToGroups": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json index d91c5d8a74fd..45a99fb00b34 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json @@ -35,6 +35,7 @@ "displayName": "myTestSecurityConfig", "description": "A sample policy", "provisioningState": "Succeeded", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" @@ -60,6 +61,7 @@ "displayName": "myTestSecurityConfig", "description": "A sample policy", "provisioningState": "Succeeded", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json index 10459a5f40ce..f77a1a747709 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json @@ -46,6 +46,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json index c9538b7cac28..4e407f242978 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json @@ -71,6 +71,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -111,6 +112,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json index 450a68d6d5dc..772dad7ba88b 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json @@ -46,6 +46,7 @@ "22" ], "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 e5493cedb794..cc6679c9c8f1 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 @@ -511,6 +511,11 @@ }, "description": "Scope of Network Manager." }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "networkManagerScopeAccesses": { "type": "array", "items": { 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..38c261bbcfc2 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 @@ -282,6 +282,11 @@ }, "description": "Groups for configuration" }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", 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 1e84f4cc7eed..5edf2227a159 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 @@ -285,6 +285,11 @@ }, "description": "Groups for configuration" }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", 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..ebd85975eeaa 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 @@ -345,6 +345,11 @@ "type": "string", "description": "Network group conditional filter." }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json index 866078791d18..280aa42f0179 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json @@ -608,6 +608,11 @@ }, "description": "Flag if need to delete existing network security groups." }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -701,6 +706,11 @@ }, "description": "Groups for configuration" }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -816,6 +826,11 @@ "$ref": "#/definitions/SecurityConfigurationRuleDirection", "description": "Indicates if the traffic matched against the rule in inbound or outbound." }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -918,6 +933,11 @@ "readOnly": true, "description": "Indicates if the traffic matched against the rule in inbound or outbound." }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json index c951a3ff65ac..92435297dac8 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json @@ -667,6 +667,11 @@ "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/SecurityConfigurationRuleDirection", "description": "Indicates if the traffic matched against the rule in inbound or outbound." }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -757,6 +762,11 @@ "readOnly": true, "description": "Indicates if the traffic matched against the rule in inbound or outbound." }, + "resourceGuid": { + "readOnly": true, + "type": "string", + "description": "The resourceGuid property of the resource." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", From 6f79cbb470bd3656704aff30f5aad9479f94e858 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Fri, 25 Jun 2021 12:18:51 -0700 Subject: [PATCH 02/23] add list by config --- .../NetworkManagerAdminRulesListByConfig.json | 59 +++++++++++++++++++ .../NetworkManagerUserRulesListByConfig.json | 57 ++++++++++++++++++ ...workManagerSecurityAdminConfiguration.json | 54 +++++++++++++++++ ...tworkManagerSecurityUserConfiguration.json | 54 +++++++++++++++++ 4 files changed, 224 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json new file mode 100644 index 000000000000..07fc3b93ca05 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json @@ -0,0 +1,59 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkManagerName": "testNetworkManager", + "configurationName": "myTestSecurityConfig" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", + "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules", + "name": "SampleAdminRule", + "systemData": { + "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", + "createdByType": "User", + "createdAt": "2021-01-11T18:52:27Z", + "lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-01-11T18:52:27Z" + }, + "kind": "Custom", + "properties": { + "description": "This is Sample Admin Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "access": "Deny", + "priority": 1, + "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", + "provisioningState": "Succeeded" + } + } + ], + "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagers/securityAdminConfigurations/myTestSecurityConfig/rules?api-version=2021-02-01-preview&$skipToken=10" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json new file mode 100644 index 000000000000..bb8775304d98 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json @@ -0,0 +1,57 @@ +{ + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subId", + "resourceGroupName": "rg1", + "networkManagerName": "testNetworkManager", + "configurationName": "myTestSecurityConfig" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", + "type": "Microsoft.Network/networkManagers/securityConfigurations/ruleCollections/UserRules", + "name": "SampleUserRule", + "kind": "Custom", + "systemData": { + "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", + "createdByType": "User", + "createdAt": "2021-01-11T18:52:27Z", + "lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5", + "lastModifiedByType": "User", + "lastModifiedAt": "2021-01-11T18:52:27Z" + }, + "properties": { + "description": "Sample User Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", + "provisioningState": "Succeeded" + } + } + ], + "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/rules?api-version=2021-02-01-preview&$skipToken=10" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json index 280aa42f0179..684b8fac2edc 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json @@ -426,6 +426,60 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/rules": { + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "$ref": "#/parameters/SecurityConfigurationParameter" + }, + { + "$ref": "#/parameters/ListTopParameter" + }, + { + "$ref": "#/parameters/ListSkipTokenParameter" + } + ], + "get": { + "tags": [ + "AdminRules" + ], + "description": "List all network manager security configuration admin rules by configuration.", + "operationId": "AdminRules_ListByConfiguration", + "responses": { + "200": { + "description": "Successful operation", + "schema": { + "$ref": "#/definitions/AdminRuleListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List security admin rules by configuration": { + "$ref": "./examples/NetworkManagerAdminRulesListByConfig.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules/{ruleName}": { "parameters": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json index 92435297dac8..d546df249345 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json @@ -426,6 +426,60 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/rules": { + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "$ref": "#/parameters/SecurityConfigurationParameter" + }, + { + "$ref": "#/parameters/ListTopParameter" + }, + { + "$ref": "#/parameters/ListSkipTokenParameter" + } + ], + "get": { + "tags": [ + "UserRules" + ], + "description": "Lists all user rules in a security user configuration.", + "operationId": "UserRules_ListByConfiguration", + "responses": { + "200": { + "description": "Successful operation", + "schema": { + "$ref": "#/definitions/UserRuleListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List security user rules by configuration": { + "$ref": "./examples/NetworkManagerUserRulesListByConfig.json" + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules/{ruleName}": { "parameters": [ { From d83503086739d658262320eeb21e8af66108f07c Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Fri, 25 Jun 2021 12:21:40 -0700 Subject: [PATCH 03/23] Revert "Add ResourceGuid to NetworkManager" This reverts commit 4e07577882e630ccbb5820bb2c397c5860394b65. --- ...NetworkManagerActiveConfigurationList.json | 8 -------- .../NetworkManagerAdminRuleCollectionGet.json | 1 - ...NetworkManagerAdminRuleCollectionList.json | 1 - .../NetworkManagerAdminRuleCollectionPut.json | 2 -- .../examples/NetworkManagerAdminRuleGet.json | 1 - .../examples/NetworkManagerAdminRulePut.json | 2 -- .../NetworkManagerAdminRulesList.json | 1 - ...rkManagerConnectivityConfigurationGet.json | 1 - ...kManagerConnectivityConfigurationList.json | 1 - ...rkManagerConnectivityConfigurationPut.json | 2 -- .../NetworkManagerDefaultAdminRuleGet.json | 1 - .../NetworkManagerDefaultAdminRulePut.json | 2 -- .../NetworkManagerDefaultUserRuleGet.json | 1 - .../NetworkManagerDefaultUserRulePut.json | 2 -- ...orkManagerEffectiveConfigurationsList.json | 8 -------- ...erEffectiveConfigurationsListBySubnet.json | 8 -------- .../examples/NetworkManagerGet.json | 1 - .../examples/NetworkManagerGroupGet.json | 1 - .../examples/NetworkManagerGroupList.json | 1 - .../examples/NetworkManagerGroupPut.json | 2 -- .../examples/NetworkManagerList.json | 1 - .../examples/NetworkManagerListAll.json | 1 - .../examples/NetworkManagerPatch.json | 1 - .../examples/NetworkManagerPut.json | 2 -- ...kManagerSecurityAdminConfigurationGet.json | 1 - ...ManagerSecurityAdminConfigurationList.json | 1 - ...kManagerSecurityAdminConfigurationPut.json | 2 -- ...rkManagerSecurityUserConfigurationGet.json | 1 - ...kManagerSecurityUserConfigurationList.json | 1 - ...rkManagerSecurityUserConfigurationPut.json | 2 -- .../NetworkManagerUserRuleCollectionGet.json | 1 - .../NetworkManagerUserRuleCollectionList.json | 1 - .../NetworkManagerUserRuleCollectionPut.json | 2 -- .../examples/NetworkManagerUserRuleGet.json | 1 - .../examples/NetworkManagerUserRulePut.json | 2 -- .../examples/NetworkManagerUserRulesList.json | 1 - .../2021-02-01-preview/networkManager.json | 5 ----- ...tworkManagerConnectivityConfiguration.json | 5 ----- .../networkManagerEffectiveConfiguration.json | 5 ----- .../networkManagerGroup.json | 5 ----- ...workManagerSecurityAdminConfiguration.json | 20 ------------------- ...tworkManagerSecurityUserConfiguration.json | 10 ---------- 42 files changed, 118 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json index ab303e1bfcd6..d34d2aed0503 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json @@ -37,7 +37,6 @@ "isGlobal": "True" } ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" }, "configurationGroups": [ @@ -53,7 +52,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -71,7 +69,6 @@ "configurationDescription": "Sample User Config", "displayName": "testRuleCollection", "description": "A sample rule collection", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -100,7 +97,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -124,7 +120,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -142,7 +137,6 @@ "configurationDescription": "Sample Admin Config", "displayName": "testRuleCollection", "description": "A sample rule collection", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -174,7 +168,6 @@ "direction": "Inbound", "access": "Deny", "priority": 1, - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -198,7 +191,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 ec4cdc5e690c..0f975692a4bb 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 @@ -25,7 +25,6 @@ "displayName": "testRuleCollection", "description": "A sample rule collection", "provisioningState": "Succeeded", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" 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 62c922544932..49e04b4dbf73 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 @@ -26,7 +26,6 @@ "displayName": "testRuleCollection", "description": "A sample rule collection", "provisioningState": "Succeeded", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" 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 c4f3b500882d..ec9dc2e17b78 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 @@ -35,7 +35,6 @@ "displayName": "myTestSecurityConfig", "description": "A sample policy", "provisioningState": "Succeeded", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" @@ -61,7 +60,6 @@ "displayName": "myTestSecurityConfig", "description": "A sample policy", "provisioningState": "Succeeded", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json index d570e1cac35a..a7dea3683b32 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleGet.json @@ -48,7 +48,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json index 87f3b183c208..7d38b0c7d5cf 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulePut.json @@ -75,7 +75,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -118,7 +117,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json index bceac8ca1175..38f8fef50044 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json @@ -48,7 +48,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 a9bb900f1545..9d1f7bbaf8ab 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 @@ -36,7 +36,6 @@ "isGlobal": "False" } ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 deac336317d9..1da054d3a714 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 @@ -37,7 +37,6 @@ "isGlobal": "False" } ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 10625154c0e4..6b95e1b019dd 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 @@ -54,7 +54,6 @@ "isGlobal": "False" } ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -87,7 +86,6 @@ "isGlobal": "False" } ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json index 98d58d59408a..cffdf54e631f 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRuleGet.json @@ -49,7 +49,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json index 96999048fd67..224559196dc7 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultAdminRulePut.json @@ -54,7 +54,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -98,7 +97,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json index d0b2bf66d9a5..c8adcacd2598 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerDefaultUserRuleGet.json @@ -47,7 +47,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 465f7e46ba70..9073e69aec49 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 @@ -52,7 +52,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -94,7 +93,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json index ab99faf0037e..34f200e69116 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json @@ -31,7 +31,6 @@ "isGlobal": "False" } ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" }, "configurationGroups": [ @@ -47,7 +46,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -61,7 +59,6 @@ "configurationDescription": "Sample User Config", "displayName": "testRuleCollection", "description": "A sample rule collection", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -90,7 +87,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -114,7 +110,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -128,7 +123,6 @@ "configurationDescription": "Sample Admin Config", "displayName": "testRuleCollection", "description": "A sample rule collection", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -160,7 +154,6 @@ "direction": "Inbound", "access": "Deny", "priority": 1, - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -184,7 +177,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json index 731014d4b6a0..cf7dcf245fc4 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json @@ -32,7 +32,6 @@ "isGlobal": "False" } ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" }, "configurationGroups": [ @@ -48,7 +47,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -60,7 +58,6 @@ "properties": { "displayName": "testRuleCollection", "description": "A sample rule collection", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -89,7 +86,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -113,7 +109,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -127,7 +122,6 @@ "configurationDescription": "Sample Admin Config", "displayName": "testRuleCollection", "description": "A sample rule collection", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "rules": [ { @@ -159,7 +153,6 @@ "direction": "Inbound", "access": "Deny", "priority": 1, - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -183,7 +176,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json index a7edeea3530b..763addbf35bb 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json @@ -32,7 +32,6 @@ "networkManagerScopeAccesses": [ "UserSecurity" ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 6c67b7965c13..81a8884ec628 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 @@ -32,7 +32,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 efd9679fdc7d..2857e2c241f2 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 @@ -32,7 +32,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 b7e3e91a54d3..3c3ac5b8c03e 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 @@ -49,7 +49,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -81,7 +80,6 @@ } ], "conditionalMembership": "", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json index 4af209c0c5dc..50f571f4958a 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerList.json @@ -34,7 +34,6 @@ "networkManagerScopeAccesses": [ "Connectivity" ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json index a035138b639b..4a53208631dc 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json @@ -33,7 +33,6 @@ "networkManagerScopeAccesses": [ "UserSecurity" ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json index ba6a039692e1..8f9037afec2c 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json @@ -44,7 +44,6 @@ "networkManagerScopeAccesses": [ "UserSecurity" ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json index 49794669ff3a..95f43c7e8fad 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPut.json @@ -52,7 +52,6 @@ "networkManagerScopeAccesses": [ "Connectivity" ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -85,7 +84,6 @@ "networkManagerScopeAccesses": [ "Connectivity" ], - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 7ab4e8f0837b..db64b57fad1b 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 @@ -25,7 +25,6 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "AdminPolicy", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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 1c4e69d03fb6..6d5536e42812 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 @@ -26,7 +26,6 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "AdminPolicy", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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 9586f054feac..feaae888ed13 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 @@ -32,7 +32,6 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "AdminPolicy", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } @@ -55,7 +54,6 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "AdminPolicy", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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 9131a21741d5..4c07b47433e3 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 @@ -25,7 +25,6 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "UserPolicy", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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 36a9e260cce3..41b9a56f35d0 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 @@ -26,7 +26,6 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "UserPolicy", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json index 2af1449a5eb3..dbdfceff66c0 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerSecurityUserConfigurationPut.json @@ -32,7 +32,6 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "UserPolicy", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } @@ -55,7 +54,6 @@ "description": "A sample policy", "provisioningState": "Succeeded", "securityType": "UserPolicy", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "deleteExistingNSGs": "True" } } 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 8ff08bf91a0f..8f55c9d627ad 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 @@ -25,7 +25,6 @@ "displayName": "testRuleCollection", "description": "A sample rule collection", "provisioningState": "Succeeded", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" 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 31914a26e382..86f6b6c1b164 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 @@ -25,7 +25,6 @@ "properties": { "displayName": "testRuleCollection", "description": "A sample rule collection", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded", "appliesToGroups": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json index 45a99fb00b34..d91c5d8a74fd 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleCollectionPut.json @@ -35,7 +35,6 @@ "displayName": "myTestSecurityConfig", "description": "A sample policy", "provisioningState": "Succeeded", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" @@ -61,7 +60,6 @@ "displayName": "myTestSecurityConfig", "description": "A sample policy", "provisioningState": "Succeeded", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "appliesToGroups": [ { "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup" diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json index f77a1a747709..10459a5f40ce 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleGet.json @@ -46,7 +46,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json index 4e407f242978..c9538b7cac28 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulePut.json @@ -71,7 +71,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } @@ -112,7 +111,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json index 772dad7ba88b..450a68d6d5dc 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json @@ -46,7 +46,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } 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 cc6679c9c8f1..e5493cedb794 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 @@ -511,11 +511,6 @@ }, "description": "Scope of Network Manager." }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "networkManagerScopeAccesses": { "type": "array", "items": { 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 38c261bbcfc2..39348f651e58 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 @@ -282,11 +282,6 @@ }, "description": "Groups for configuration" }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", 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 5edf2227a159..1e84f4cc7eed 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 @@ -285,11 +285,6 @@ }, "description": "Groups for configuration" }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", 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 ebd85975eeaa..b15d672de320 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 @@ -345,11 +345,6 @@ "type": "string", "description": "Network group conditional filter." }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json index 684b8fac2edc..9c3adcc3b3c9 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json @@ -662,11 +662,6 @@ }, "description": "Flag if need to delete existing network security groups." }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -760,11 +755,6 @@ }, "description": "Groups for configuration" }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -880,11 +870,6 @@ "$ref": "#/definitions/SecurityConfigurationRuleDirection", "description": "Indicates if the traffic matched against the rule in inbound or outbound." }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -987,11 +972,6 @@ "readOnly": true, "description": "Indicates if the traffic matched against the rule in inbound or outbound." }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json index d546df249345..adb80f27105a 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json @@ -721,11 +721,6 @@ "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/SecurityConfigurationRuleDirection", "description": "Indicates if the traffic matched against the rule in inbound or outbound." }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -816,11 +811,6 @@ "readOnly": true, "description": "Indicates if the traffic matched against the rule in inbound or outbound." }, - "resourceGuid": { - "readOnly": true, - "type": "string", - "description": "The resourceGuid property of the resource." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", From d6af618fa10601b3b1be2ca79d10725c006c08b8 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Fri, 25 Jun 2021 12:35:03 -0700 Subject: [PATCH 04/23] resourceGuid --- .../examples/NetworkManagerAdminRulesListByConfig.json | 1 - .../examples/NetworkManagerUserRulesListByConfig.json | 1 - 2 files changed, 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json index 07fc3b93ca05..c0177cc40500 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json @@ -47,7 +47,6 @@ "access": "Deny", "priority": 1, "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json index bb8775304d98..5be929b508ed 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json @@ -45,7 +45,6 @@ "22" ], "direction": "Inbound", - "resourceGuid": "226d4a16-5112-4286-bdc8-3458b553b7b4", "provisioningState": "Succeeded" } } From c4c1ae5b3b6a238d6e1e582c5a30cfc42504493b Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Tue, 20 Jul 2021 21:45:17 -0700 Subject: [PATCH 05/23] [NetworkManager] Remove discriminator from ActiveConfiguration --- ...NetworkManagerActiveConfigurationList.json | 258 ++++++++---------- ...orkManagerEffectiveConfigurationsList.json | 196 ++++++------- ...erEffectiveConfigurationsListBySubnet.json | 194 ++++++------- .../networkManagerActiveConfiguration.json | 10 +- .../networkManagerEffectiveConfiguration.json | 174 ++++-------- 5 files changed, 348 insertions(+), 484 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json index d34d2aed0503..cd073ccb65d9 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json @@ -19,186 +19,160 @@ { "region": "westus", "commitTime": "2020-07-10T18:03:22.2578238+05:30", - "committedConfiguration": { - "kind": "ConnectivityConfiguration", + "configurationType": "Connectivity", + "connectivityConfiguration": { "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", "properties": { "displayName": "myTestConnectivityConfig", "description": "Sample Configuration", "connectivityTopology": "HubAndSpoke", - "hubId": "subscriptions/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "deleteExistingPeering": "True", + "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", "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/groups/group1", "useHubGateway": "True", "groupConnectivity": "None", - "isGlobal": "True" + "isGlobal": "False" } ], "provisioningState": "Succeeded" - }, - "configurationGroups": [ - { - "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" - } + } + }, + "configurationGroups": [ + { + "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" } - ] - } + } + ] }, { "region": "westus", "commitTime": "2020-07-10T18:03:22.2578238+05:30", - "committedConfiguration": { - "kind": "SecurityUserRuleCollection", - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", + "configurationType": "UserPolicy", + "securityUserRule": { + "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", + "configurationDisplayName": "SampleConfig", + "configurationDescription": "SampleDescription", + "ruleCollectionDisplayName": "SampleRuleCollection", + "ruleCollectionDescription": "SampleRuleCollectionDescription", + "kind": "Custom", "properties": { - "configurationDisplayName": "SampleUserConfig", - "configurationDescription": "Sample User Config", - "displayName": "testRuleCollection", - "description": "A sample rule collection", - "provisioningState": "Succeeded", - "rules": [ + "displayName": "SampleUserRule", + "description": "Sample User Rule", + "protocol": "Tcp", + "sources": [ { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", - "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" - } + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" } ], - "appliesToGroups": [ + "destinations": [ { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ] - }, - "configurationGroups": [ - { - "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" + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "provisioningState": "Succeeded" + } + }, + "configurationGroups": [ + { + "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" } - ] - } + } + ] }, { "region": "westus", "commitTime": "2020-07-10T18:03:22.2578238+05:30", - "committedConfiguration": { - "kind": "SecurityAdminRuleCollection", - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", + "configurationType": "AdminPolicy", + "securityAdminRule": { + "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", + "configurationDisplayName": "SampleConfig", + "configurationDescription": "SampleDescription", + "ruleCollectionDisplayName": "SampleRuleCollection", + "ruleCollectionDescription": "SampleRuleCollectionDescription", + "kind": "Default", "properties": { - "configurationDisplayName": "SampleAdminConfig", - "configurationDescription": "Sample Admin Config", - "displayName": "testRuleCollection", - "description": "A sample rule collection", - "provisioningState": "Succeeded", - "rules": [ + "displayName": "SampleAdminRule", + "description": "Sample Admin Rule", + "flag": "AllowVnetInbound", + "protocol": "Tcp", + "sources": [ { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", - "kind": "Default", - "properties": { - "displayName": "SampleAdminRule", - "description": "Sample Admin Rule", - "flag": "AllowVnetInbound", - "protocol": "Tcp", - "sources": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destinations": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "direction": "Inbound", - "access": "Deny", - "priority": 1, - "provisioningState": "Succeeded" - } + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" } ], - "appliesToGroups": [ + "destinations": [ { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ] - }, - "configurationGroups": [ - { - "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" + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "access": "Deny", + "priority": 1, + "provisioningState": "Succeeded" + } + }, + "configurationGroups": [ + { + "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": "nextFakeSkipToken" + "$skipToken": "FakeSkipTokenCode" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json index 34f200e69116..00c19b1ac055 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json @@ -14,24 +14,26 @@ "body": { "value": [ { - "kind": "ConnectivityConfiguration", - "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", - "properties": { - "displayName": "myTestConnectivityConfig", - "description": "Sample Configuration", - "connectivityTopology": "HubAndSpoke", - "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "isGlobal": "True", - "deleteExistingPeering": "True", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", - "useHubGateway": "True", - "groupConnectivity": "None", - "isGlobal": "False" - } - ], - "provisioningState": "Succeeded" + "configurationType": "Connectivity", + "connectivityConfiguration": { + "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", + "properties": { + "displayName": "myTestConnectivityConfig", + "description": "Sample Configuration", + "connectivityTopology": "HubAndSpoke", + "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "isGlobal": "True", + "deleteExistingPeering": "True", + "appliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", + "useHubGateway": "True", + "groupConnectivity": "None", + "isGlobal": "False" + } + ], + "provisioningState": "Succeeded" + } }, "configurationGroups": [ { @@ -52,50 +54,40 @@ ] }, { - "kind": "SecurityUserRuleCollection", - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", - "properties": { - "configurationDisplayName": "SampleUserConfig", - "configurationDescription": "Sample User Config", - "displayName": "testRuleCollection", - "description": "A sample rule collection", - "provisioningState": "Succeeded", - "rules": [ - { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", - "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" + "configurationType": "UserPolicy", + "connectivityConfiguration": null, + "securityUserRule": { + "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", + "configurationDisplayName": "SampleConfig", + "configurationDescription": "SampleDescription", + "ruleCollectionDisplayName": "SampleRuleCollection", + "ruleCollectionDescription": "SampleRuleCollectionDescription", + "kind": "Custom", + "properties": { + "displayName": "SampleUserRule", + "description": "Sample User Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" } - } - ], - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ] + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "provisioningState": "Succeeded" + } }, "configurationGroups": [ { @@ -116,53 +108,43 @@ ] }, { - "kind": "SecurityAdminRuleCollection", - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", - "properties": { - "configurationDisplayName": "SampleAdminConfig", - "configurationDescription": "Sample Admin Config", - "displayName": "testRuleCollection", - "description": "A sample rule collection", - "provisioningState": "Succeeded", - "rules": [ - { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", - "kind": "Default", - "properties": { - "displayName": "SampleAdminRule", - "description": "Sample Admin Rule", - "flag": "AllowVnetInbound", - "protocol": "Tcp", - "sources": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destinations": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "direction": "Inbound", - "access": "Deny", - "priority": 1, - "provisioningState": "Succeeded" + "configurationType": "AdminPolicy", + "connectivityConfiguration": null, + "securityAdminRule": { + "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", + "configurationDisplayName": "SampleConfig", + "configurationDescription": "SampleDescription", + "ruleCollectionDisplayName": "SampleRuleCollection", + "ruleCollectionDescription": "SampleRuleCollectionDescription", + "kind": "Default", + "properties": { + "displayName": "SampleAdminRule", + "description": "Sample Admin Rule", + "flag": "AllowVnetInbound", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" } - } - ], - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ] + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "access": "Deny", + "priority": 1, + "provisioningState": "Succeeded" + } }, "configurationGroups": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json index cf7dcf245fc4..daa314973562 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json @@ -15,24 +15,26 @@ "body": { "value": [ { - "kind": "ConnectivityConfiguration", - "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", - "properties": { - "displayName": "myTestConnectivityConfig", - "description": "Sample Configuration", - "connectivityTopology": "HubAndSpoke", - "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "isGlobal": "True", - "deleteExistingPeering": "True", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", - "useHubGateway": "True", - "groupConnectivity": "None", - "isGlobal": "False" - } - ], - "provisioningState": "Succeeded" + "configurationType": "Connectivity", + "connectivityConfiguration": { + "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", + "properties": { + "displayName": "myTestConnectivityConfig", + "description": "Sample Configuration", + "connectivityTopology": "HubAndSpoke", + "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "isGlobal": "True", + "deleteExistingPeering": "True", + "appliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", + "useHubGateway": "True", + "groupConnectivity": "None", + "isGlobal": "False" + } + ], + "provisioningState": "Succeeded" + } }, "configurationGroups": [ { @@ -53,48 +55,39 @@ ] }, { - "kind": "SecurityUserRuleCollection", - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", - "properties": { - "displayName": "testRuleCollection", - "description": "A sample rule collection", - "provisioningState": "Succeeded", - "rules": [ - { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", - "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" + "configurationType": "UserPolicy", + "securityUserRule": { + "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", + "configurationDisplayName": "SampleConfig", + "configurationDescription": "SampleDescription", + "ruleCollectionDisplayName": "SampleRuleCollection", + "ruleCollectionDescription": "SampleRuleCollectionDescription", + "kind": "Custom", + "properties": { + "displayName": "SampleUserRule", + "description": "Sample User Rule", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" } - } - ], - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ] + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "provisioningState": "Succeeded" + } }, "configurationGroups": [ { @@ -115,53 +108,42 @@ ] }, { - "kind": "SecurityAdminRuleCollection", - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection", - "properties": { - "configurationDisplayName": "SampleAdminConfig", - "configurationDescription": "Sample Admin Config", - "displayName": "testRuleCollection", - "description": "A sample rule collection", - "provisioningState": "Succeeded", - "rules": [ - { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", - "kind": "Default", - "properties": { - "displayName": "SampleAdminRule", - "description": "Sample Admin Rule", - "flag": "AllowVnetInbound", - "protocol": "Tcp", - "sources": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destinations": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "direction": "Inbound", - "access": "Deny", - "priority": 1, - "provisioningState": "Succeeded" + "configurationType": "AdminPolicy", + "securityAdminRule": { + "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", + "configurationDisplayName": "SampleConfig", + "configurationDescription": "SampleDescription", + "ruleCollectionDisplayName": "SampleRuleCollection", + "ruleCollectionDescription": "SampleRuleCollectionDescription", + "kind": "Default", + "properties": { + "displayName": "SampleAdminRule", + "description": "Sample Admin Rule", + "flag": "AllowVnetInbound", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" } - } - ], - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ] + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "access": "Deny", + "priority": 1, + "provisioningState": "Succeeded" + } }, "configurationGroups": [ { @@ -182,7 +164,7 @@ ] } ], - "$skipToken": "NextFakeSkipTokenCode" + "$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 81623cd01620..9f6b16516511 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 @@ -97,13 +97,13 @@ "region": { "type": "string", "description": "Deployment region." - }, - "committedConfiguration": { - "type": "object", - "$ref": "./networkManagerEffectiveConfiguration.json#/definitions/EffectiveConfiguration", - "description": "Configuration such as connectivity configuration or security rule collection." } }, + "allOf": [ + { + "$ref": "./networkManagerEffectiveConfiguration.json#/definitions/EffectiveConfiguration" + } + ], "description": "Active Configuration." }, "ActiveConfigurationListResult": { 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 1e84f4cc7eed..54cfb04b04b8 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 @@ -147,22 +147,32 @@ "definitions": { "EffectiveConfiguration": { "properties": { - "id": { + "configurationType": { "type": "string", - "description": "Resource ID." + "$ref": "./networkManager.json#/definitions/ConfigurationType", + "description": "Commit Type." }, - "kind": { - "type": "string", - "enum": [ - "ConnectivityConfiguration", - "SecurityUserRuleCollection", - "SecurityAdminRuleCollection" - ], - "x-ms-enum": { - "name": "EffectiveConfigurationKind", - "modelAsString": true + "connectivityConfiguration": { + "properties": { + "id": { + "type": "string", + "description": "Resource ID." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "./networkManagerConnectivityConfiguration.json#/definitions/ConnectivityConfigurationProperties", + "description": "Properties of a network manager connectivity configuration" + } }, - "description": "Effective configuration Type." + "description": "The network manager connectivity configuration resource" + }, + "securityAdminRule": { + "$ref": "#/definitions/AdminBaseRule", + "description": "Security Admin Rule." + }, + "securityUserRule": { + "$ref": "#/definitions/UserBaseRule", + "description": "Security User Rule." }, "configurationGroups": { "type": "array", @@ -173,132 +183,32 @@ } }, "required": [ - "kind" + "configurationType" ], - "discriminator": "kind", "description": "The network manager effective configuration" }, - "EffectiveConnectivityConfiguration": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "./networkManagerConnectivityConfiguration.json#/definitions/ConnectivityConfigurationProperties", - "description": "Properties of a network manager connectivity configuration" - } - }, - "allOf": [ - { - "$ref": "#/definitions/EffectiveConfiguration" - } - ], - "description": "The network manager connectivity configuration resource", - "x-ms-discriminator-value": "ConnectivityConfiguration" - }, - "SecurityUserRuleCollection": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecurityUserRuleCollectionProperties", - "description": "The security user rule collection properties" - } - }, - "allOf": [ - { - "$ref": "#/definitions/EffectiveConfiguration" - } - ], - "description": "The network manager effective security user rule collection", - "x-ms-discriminator-value": "SecurityUserRuleCollection" - }, - "SecurityAdminRuleCollection": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/SecurityAdminRuleCollectionProperties", - "description": "The security admin rule collection properties" - } - }, - "allOf": [ - { - "$ref": "#/definitions/EffectiveConfiguration" - } - ], - "description": "The network manager effective security admin rule collection", - "x-ms-discriminator-value": "SecurityAdminRuleCollection" - }, - "SecurityUserRuleCollectionProperties": { - "properties": { - "rules": { - "type": "array", - "items": { - "$ref": "#/definitions/UserBaseRule" - }, - "description": "Base user rule List" - } - }, - "allOf": [ - { - "$ref": "#/definitions/RuleCollectionProperties" - } - ], - "description": "The network manager security user rule collection properties" - }, - "SecurityAdminRuleCollectionProperties": { - "properties": { - "rules": { - "type": "array", - "items": { - "$ref": "#/definitions/AdminBaseRule" - }, - "description": "Base admin rule List" - } - }, - "allOf": [ - { - "$ref": "#/definitions/RuleCollectionProperties" - } - ], - "description": "The network manager security rule admin collection properties" - }, - "RuleCollectionProperties": { + "AdminBaseRule": { "properties": { + "id": { + "type": "string", + "description": "Resource ID." + }, "configurationDisplayName": { "type": "string", - "description": "A display name of the rule collection." + "description": "A display name of the security admin configuration." }, "configurationDescription": { "type": "string", - "description": "A description of the rule collection." + "description": "A description of the security admin configuration." }, - "displayName": { + "ruleCollectionDisplayName": { "type": "string", "description": "A display name of the rule collection." }, - "description": { + "ruleCollectionDescription": { "type": "string", "description": "A description of the rule collection." }, - "appliesToGroups": { - "type": "array", - "items": { - "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/NetworkManagerSecurityGroupItem" - }, - "description": "Groups for configuration" - }, - "provisioningState": { - "readOnly": true, - "$ref": "./network.json#/definitions/ProvisioningState", - "description": "The provisioning state of the the resource." - } - }, - "description": "The network manager security rule collection properties" - }, - "AdminBaseRule": { - "properties": { - "id": { - "type": "string", - "description": "Resource ID." - }, "kind": { "type": "string", "description": "Whether the rule collection is custom or default.", @@ -316,7 +226,7 @@ "kind" ], "discriminator": "kind", - "description": "Network base rule." + "description": "Network base admin rule." }, "EffectiveAdminRule": { "properties": { @@ -356,6 +266,22 @@ "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." + }, "kind": { "type": "string", "description": "Whether the rule collection is custom or default.", From 33ead479947af2f15360078f197c986b2eac991c Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Tue, 20 Jul 2021 21:53:55 -0700 Subject: [PATCH 06/23] revert change --- .../NetworkManagerAdminRulesListByConfig.json | 58 ------------------- .../NetworkManagerUserRulesListByConfig.json | 56 ------------------ ...workManagerSecurityAdminConfiguration.json | 56 +----------------- ...tworkManagerSecurityUserConfiguration.json | 54 ----------------- 4 files changed, 1 insertion(+), 223 deletions(-) delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json deleted file mode 100644 index c0177cc40500..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesListByConfig.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId", - "resourceGroupName": "rg1", - "networkManagerName": "testNetworkManager", - "configurationName": "myTestSecurityConfig" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", - "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections/rules", - "name": "SampleAdminRule", - "systemData": { - "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", - "createdByType": "User", - "createdAt": "2021-01-11T18:52:27Z", - "lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-01-11T18:52:27Z" - }, - "kind": "Custom", - "properties": { - "description": "This is Sample Admin Rule", - "protocol": "Tcp", - "sources": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destinations": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "access": "Deny", - "priority": 1, - "direction": "Inbound", - "provisioningState": "Succeeded" - } - } - ], - "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkManagers/securityAdminConfigurations/myTestSecurityConfig/rules?api-version=2021-02-01-preview&$skipToken=10" - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json deleted file mode 100644 index 5be929b508ed..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesListByConfig.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subId", - "resourceGroupName": "rg1", - "networkManagerName": "testNetworkManager", - "configurationName": "myTestSecurityConfig" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkmanagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleUserRule", - "type": "Microsoft.Network/networkManagers/securityConfigurations/ruleCollections/UserRules", - "name": "SampleUserRule", - "kind": "Custom", - "systemData": { - "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5", - "createdByType": "User", - "createdAt": "2021-01-11T18:52:27Z", - "lastModifiedBy": "b69a9388-9488-4534-b470-7ec6d41beef5", - "lastModifiedByType": "User", - "lastModifiedAt": "2021-01-11T18:52:27Z" - }, - "properties": { - "description": "Sample User Rule", - "protocol": "Tcp", - "sources": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destinations": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "direction": "Inbound", - "provisioningState": "Succeeded" - } - } - ], - "nextLink": "{baseurl}/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityUserConfigurations/myTestSecurityConfig/rules?api-version=2021-02-01-preview&$skipToken=10" - } - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json index 9c3adcc3b3c9..84369b95f108 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json @@ -425,61 +425,7 @@ "nextLinkName": "nextLink" } } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/rules": { - "parameters": [ - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/NetworkManagerNameParameter" - }, - { - "$ref": "#/parameters/SecurityConfigurationParameter" - }, - { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" - } - ], - "get": { - "tags": [ - "AdminRules" - ], - "description": "List all network manager security configuration admin rules by configuration.", - "operationId": "AdminRules_ListByConfiguration", - "responses": { - "200": { - "description": "Successful operation", - "schema": { - "$ref": "#/definitions/AdminRuleListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "List security admin rules by configuration": { - "$ref": "./examples/NetworkManagerAdminRulesListByConfig.json" - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules/{ruleName}": { "parameters": [ { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json index adb80f27105a..c951a3ff65ac 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json @@ -426,60 +426,6 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/rules": { - "parameters": [ - { - "$ref": "./network.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "./network.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupNameParameter" - }, - { - "$ref": "#/parameters/NetworkManagerNameParameter" - }, - { - "$ref": "#/parameters/SecurityConfigurationParameter" - }, - { - "$ref": "#/parameters/ListTopParameter" - }, - { - "$ref": "#/parameters/ListSkipTokenParameter" - } - ], - "get": { - "tags": [ - "UserRules" - ], - "description": "Lists all user rules in a security user configuration.", - "operationId": "UserRules_ListByConfiguration", - "responses": { - "200": { - "description": "Successful operation", - "schema": { - "$ref": "#/definitions/UserRuleListResult" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "./network.json#/definitions/CloudError" - } - } - }, - "x-ms-examples": { - "List security user rules by configuration": { - "$ref": "./examples/NetworkManagerUserRulesListByConfig.json" - } - }, - "x-ms-pageable": { - "nextLinkName": "nextLink" - } - } - }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules/{ruleName}": { "parameters": [ { From aed0651cb23722f1ea8d58a4bb9ed6328af0e2ab Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Tue, 20 Jul 2021 21:57:21 -0700 Subject: [PATCH 07/23] fix format --- .../networkManagerSecurityAdminConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json index 84369b95f108..866078791d18 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json @@ -425,7 +425,7 @@ "nextLinkName": "nextLink" } } - }, + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules/{ruleName}": { "parameters": [ { From 06ee276cd6ceb7704ac69fc1e699ee1d3ebc5237 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Wed, 21 Jul 2021 16:55:15 -0700 Subject: [PATCH 08/23] Fix as commnets --- .../NetworkManagerActiveConfigurationList.json | 10 ++++++++++ ...etworkManagerEffectiveConfigurationsList.json | 10 ++++++++++ ...nagerEffectiveConfigurationsListBySubnet.json | 10 ++++++++++ .../networkManagerEffectiveConfiguration.json | 16 ++++++++++++++++ 4 files changed, 46 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json index cd073ccb65d9..2d34ab269291 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json @@ -68,6 +68,11 @@ "configurationDescription": "SampleDescription", "ruleCollectionDisplayName": "SampleRuleCollection", "ruleCollectionDescription": "SampleRuleCollectionDescription", + "ruleCollectionAppliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" + } + ], "kind": "Custom", "properties": { "displayName": "SampleUserRule", @@ -123,6 +128,11 @@ "configurationDescription": "SampleDescription", "ruleCollectionDisplayName": "SampleRuleCollection", "ruleCollectionDescription": "SampleRuleCollectionDescription", + "ruleCollectionAppliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" + } + ], "kind": "Default", "properties": { "displayName": "SampleAdminRule", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json index 00c19b1ac055..18eb2b91b34a 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json @@ -62,6 +62,11 @@ "configurationDescription": "SampleDescription", "ruleCollectionDisplayName": "SampleRuleCollection", "ruleCollectionDescription": "SampleRuleCollectionDescription", + "ruleCollectionAppliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" + } + ], "kind": "Custom", "properties": { "displayName": "SampleUserRule", @@ -116,6 +121,11 @@ "configurationDescription": "SampleDescription", "ruleCollectionDisplayName": "SampleRuleCollection", "ruleCollectionDescription": "SampleRuleCollectionDescription", + "ruleCollectionAppliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" + } + ], "kind": "Default", "properties": { "displayName": "SampleAdminRule", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json index daa314973562..f229ee1d48f3 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json @@ -62,6 +62,11 @@ "configurationDescription": "SampleDescription", "ruleCollectionDisplayName": "SampleRuleCollection", "ruleCollectionDescription": "SampleRuleCollectionDescription", + "ruleCollectionAppliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" + } + ], "kind": "Custom", "properties": { "displayName": "SampleUserRule", @@ -115,6 +120,11 @@ "configurationDescription": "SampleDescription", "ruleCollectionDisplayName": "SampleRuleCollection", "ruleCollectionDescription": "SampleRuleCollectionDescription", + "ruleCollectionAppliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" + } + ], "kind": "Default", "properties": { "displayName": "SampleAdminRule", 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 54cfb04b04b8..a4775a86fd4b 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 @@ -167,10 +167,12 @@ "description": "The network manager connectivity configuration resource" }, "securityAdminRule": { + "type": "object", "$ref": "#/definitions/AdminBaseRule", "description": "Security Admin Rule." }, "securityUserRule": { + "type": "object", "$ref": "#/definitions/UserBaseRule", "description": "Security User Rule." }, @@ -209,6 +211,13 @@ "type": "string", "description": "A description of the rule collection." }, + "ruleCollectionAppliesToGroups": { + "type": "array", + "items": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/NetworkManagerSecurityGroupItem" + }, + "description": "Groups for rule collection" + }, "kind": { "type": "string", "description": "Whether the rule collection is custom or default.", @@ -282,6 +291,13 @@ "type": "string", "description": "A description of the rule collection." }, + "ruleCollectionAppliesToGroups": { + "type": "array", + "items": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/NetworkManagerSecurityGroupItem" + }, + "description": "Groups for rule collection" + }, "kind": { "type": "string", "description": "Whether the rule collection is custom or default.", From 4aab9e1b07df61bd49831cd9e86d4865dc2bb041 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Wed, 21 Jul 2021 17:24:58 -0700 Subject: [PATCH 09/23] fix test --- .../2021-02-01-preview/networkManagerEffectiveConfiguration.json | 1 + 1 file changed, 1 insertion(+) 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 a4775a86fd4b..7a41f849d907 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 @@ -153,6 +153,7 @@ "description": "Commit Type." }, "connectivityConfiguration": { + "type": "object", "properties": { "id": { "type": "string", From 75f88822a28c3316da5f2ebd019addbf4e576d90 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Mon, 26 Jul 2021 21:33:43 -0700 Subject: [PATCH 10/23] Update Example --- ...orkManagerEffectiveConfigurationsList.json | 59 ---------- ...erEffectiveConfigurationsListBySubnet.json | 101 ------------------ 2 files changed, 160 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json index 18eb2b91b34a..5c9eeb344d51 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json @@ -53,65 +53,6 @@ } ] }, - { - "configurationType": "UserPolicy", - "connectivityConfiguration": null, - "securityUserRule": { - "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" - } - }, - "configurationGroups": [ - { - "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" - } - } - ] - }, { "configurationType": "AdminPolicy", "connectivityConfiguration": null, diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json index f229ee1d48f3..99824c672e30 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json @@ -14,46 +14,6 @@ "200": { "body": { "value": [ - { - "configurationType": "Connectivity", - "connectivityConfiguration": { - "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", - "properties": { - "displayName": "myTestConnectivityConfig", - "description": "Sample Configuration", - "connectivityTopology": "HubAndSpoke", - "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "isGlobal": "True", - "deleteExistingPeering": "True", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", - "useHubGateway": "True", - "groupConnectivity": "None", - "isGlobal": "False" - } - ], - "provisioningState": "Succeeded" - } - }, - "configurationGroups": [ - { - "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" - } - } - ] - }, { "configurationType": "UserPolicy", "securityUserRule": { @@ -111,67 +71,6 @@ } } ] - }, - { - "configurationType": "AdminPolicy", - "securityAdminRule": { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", - "configurationDisplayName": "SampleConfig", - "configurationDescription": "SampleDescription", - "ruleCollectionDisplayName": "SampleRuleCollection", - "ruleCollectionDescription": "SampleRuleCollectionDescription", - "ruleCollectionAppliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ], - "kind": "Default", - "properties": { - "displayName": "SampleAdminRule", - "description": "Sample Admin Rule", - "flag": "AllowVnetInbound", - "protocol": "Tcp", - "sources": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destinations": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "direction": "Inbound", - "access": "Deny", - "priority": 1, - "provisioningState": "Succeeded" - } - }, - "configurationGroups": [ - { - "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" From 698aedf60e1a050349e54b99174a2b56ca3efd2c Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Mon, 2 Aug 2021 21:44:40 -0700 Subject: [PATCH 11/23] Split current APIs --- ...NetworkManagerActiveConfigurationList.json | 189 --------- ...erActiveConnectivityConfigurationList.json | 63 +++ ...rkManagerActiveSecurityAdminRulesList.json | 84 ++++ ...orkManagerActiveSecurityUserRulesList.json | 81 ++++ .../examples/NetworkManagerCommitPost.json | 2 +- ...orkManagerEffectiveConfigurationsList.json | 123 ------ ...erEffectiveConfigurationsListBySubnet.json | 80 ---- ...fectiveConnectivityConfigurationsList.json | 58 +++ ...anagerEffectiveSecurityAdminRulesList.json | 79 ++++ ...ffectiveSecurityUserRulesListBySubnet.json | 77 ++++ .../examples/NetworkManagerGet.json | 2 +- .../examples/NetworkManagerListAll.json | 2 +- .../examples/NetworkManagerPatch.json | 2 +- .../2021-02-01-preview/networkManager.json | 4 +- .../networkManagerActiveConfiguration.json | 369 ++++++++++++++++-- .../networkManagerEffectiveConfiguration.json | 219 +++++++---- 16 files changed, 941 insertions(+), 493 deletions(-) delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityUserRulesList.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityAdminRulesList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json deleted file mode 100644 index 2d34ab269291..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "title": "Get Azure Virtual Network Manager Active Configuration", - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subscriptionA", - "resourceGroupName": "myResourceGroup", - "networkManagerName": "testNetworkManager", - "parameters": { - "regions": [ - "westus" - ], - "$skipToken": "fakeSkipTokenCode" - } - }, - "responses": { - "200": { - "body": { - "value": [ - { - "region": "westus", - "commitTime": "2020-07-10T18:03:22.2578238+05:30", - "configurationType": "Connectivity", - "connectivityConfiguration": { - "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", - "properties": { - "displayName": "myTestConnectivityConfig", - "description": "Sample Configuration", - "connectivityTopology": "HubAndSpoke", - "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "isGlobal": "True", - "deleteExistingPeering": "True", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", - "useHubGateway": "True", - "groupConnectivity": "None", - "isGlobal": "False" - } - ], - "provisioningState": "Succeeded" - } - }, - "configurationGroups": [ - { - "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" - } - } - ] - }, - { - "region": "westus", - "commitTime": "2020-07-10T18:03:22.2578238+05:30", - "configurationType": "UserPolicy", - "securityUserRule": { - "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" - } - }, - "configurationGroups": [ - { - "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" - } - } - ] - }, - { - "region": "westus", - "commitTime": "2020-07-10T18:03:22.2578238+05:30", - "configurationType": "AdminPolicy", - "securityAdminRule": { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", - "configurationDisplayName": "SampleConfig", - "configurationDescription": "SampleDescription", - "ruleCollectionDisplayName": "SampleRuleCollection", - "ruleCollectionDescription": "SampleRuleCollectionDescription", - "ruleCollectionAppliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ], - "kind": "Default", - "properties": { - "displayName": "SampleAdminRule", - "description": "Sample Admin Rule", - "flag": "AllowVnetInbound", - "protocol": "Tcp", - "sources": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destinations": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "direction": "Inbound", - "access": "Deny", - "priority": 1, - "provisioningState": "Succeeded" - } - }, - "configurationGroups": [ - { - "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/examples/NetworkManagerActiveConnectivityConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationList.json new file mode 100644 index 000000000000..a3af95d42ada --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationList.json @@ -0,0 +1,63 @@ +{ + "title": "Get Azure Virtual Network Manager Active Configuration", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subscriptionA", + "resourceGroupName": "myResourceGroup", + "networkManagerName": "testNetworkManager", + "parameters": { + "regions": [ + "westus" + ], + "$skipToken": "fakeSkipTokenCode" + } + }, + "responses": { + "200": { + "body": { + "value": [ + { + "region": "westus", + "commitTime": "2020-07-10T18:03:22.2578238+05:30", + "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", + "properties": { + "displayName": "myTestConnectivityConfig", + "description": "Sample Configuration", + "connectivityTopology": "HubAndSpoke", + "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "isGlobal": "True", + "deleteExistingPeering": "True", + "appliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", + "useHubGateway": "True", + "groupConnectivity": "None", + "isGlobal": "False" + } + ], + "provisioningState": "Succeeded" + }, + "configurationGroups": [ + { + "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/examples/NetworkManagerActiveSecurityAdminRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json new file mode 100644 index 000000000000..dbb546f9504a --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityAdminRulesList.json @@ -0,0 +1,84 @@ +{ + "title": "Get Azure Virtual Network Manager Active Configuration", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subscriptionA", + "resourceGroupName": "myResourceGroup", + "networkManagerName": "testNetworkManager", + "parameters": { + "regions": [ + "westus" + ], + "$skipToken": "fakeSkipTokenCode" + } + }, + "responses": { + "200": { + "body": { + "value": [ + { + "region": "westus", + "commitTime": "2020-07-10T18:03:22.2578238+05:30", + "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", + "configurationDisplayName": "SampleConfig", + "configurationDescription": "SampleDescription", + "ruleCollectionDisplayName": "SampleRuleCollection", + "ruleCollectionDescription": "SampleRuleCollectionDescription", + "ruleCollectionAppliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" + } + ], + "kind": "Default", + "properties": { + "displayName": "SampleAdminRule", + "description": "Sample Admin Rule", + "flag": "AllowVnetInbound", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "access": "Deny", + "priority": 1, + "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/examples/NetworkManagerActiveSecurityUserRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityUserRulesList.json new file mode 100644 index 000000000000..f288885b13bc --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveSecurityUserRulesList.json @@ -0,0 +1,81 @@ +{ + "title": "Get Azure Virtual Network Manager Active Configuration", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subscriptionA", + "resourceGroupName": "myResourceGroup", + "networkManagerName": "testNetworkManager", + "parameters": { + "regions": [ + "westus" + ], + "$skipToken": "fakeSkipTokenCode" + } + }, + "responses": { + "200": { + "body": { + "value": [ + { + "region": "westus", + "commitTime": "2020-07-10T18:03:22.2578238+05:30", + "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/examples/NetworkManagerCommitPost.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json index 962b122a4294..acc7dbf80845 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json @@ -25,7 +25,7 @@ "configurationIds": [ "/subscriptions/subscriptionC/resourceGroups/resoureGroupSample/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/SampleSecurityConfig" ], - "commitType": "AdminSecurity" + "commitType": "SecurityAdmin" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json deleted file mode 100644 index 5c9eeb344d51..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsList.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "title": "List Azure Virtual Network Manager Effective Configuration", - "parameters": { - "api-version": "2021-02-01-preview", - "subscriptionId": "subscriptionA", - "resourceGroupName": "myResourceGroup", - "virtualNetworkName": "testVirtualNetwork", - "parameters": { - "$skipToken": "FakeSkipTokenCode" - } - }, - "responses": { - "200": { - "body": { - "value": [ - { - "configurationType": "Connectivity", - "connectivityConfiguration": { - "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", - "properties": { - "displayName": "myTestConnectivityConfig", - "description": "Sample Configuration", - "connectivityTopology": "HubAndSpoke", - "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "isGlobal": "True", - "deleteExistingPeering": "True", - "appliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", - "useHubGateway": "True", - "groupConnectivity": "None", - "isGlobal": "False" - } - ], - "provisioningState": "Succeeded" - } - }, - "configurationGroups": [ - { - "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" - } - } - ] - }, - { - "configurationType": "AdminPolicy", - "connectivityConfiguration": null, - "securityAdminRule": { - "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", - "configurationDisplayName": "SampleConfig", - "configurationDescription": "SampleDescription", - "ruleCollectionDisplayName": "SampleRuleCollection", - "ruleCollectionDescription": "SampleRuleCollectionDescription", - "ruleCollectionAppliesToGroups": [ - { - "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" - } - ], - "kind": "Default", - "properties": { - "displayName": "SampleAdminRule", - "description": "Sample Admin Rule", - "flag": "AllowVnetInbound", - "protocol": "Tcp", - "sources": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "destinations": [ - { - "addressPrefixType": "IPPrefix", - "addressPrefix": "*" - } - ], - "sourcePortRanges": [ - "0-65535" - ], - "destinationPortRanges": [ - "22" - ], - "direction": "Inbound", - "access": "Deny", - "priority": 1, - "provisioningState": "Succeeded" - } - }, - "configurationGroups": [ - { - "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/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json deleted file mode 100644 index 99824c672e30..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConfigurationsListBySubnet.json +++ /dev/null @@ -1,80 +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": [ - { - "configurationType": "UserPolicy", - "securityUserRule": { - "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" - } - }, - "configurationGroups": [ - { - "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/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json new file mode 100644 index 000000000000..dae0d97fcebd --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json @@ -0,0 +1,58 @@ +{ + "title": "List Azure Virtual Network Manager Effective Configuration", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subscriptionA", + "resourceGroupName": "myResourceGroup", + "virtualNetworkName": "testVirtualNetwork", + "parameters": { + "$skipToken": "FakeSkipTokenCode" + } + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig", + "properties": { + "displayName": "myTestConnectivityConfig", + "description": "Sample Configuration", + "connectivityTopology": "HubAndSpoke", + "hubId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "isGlobal": "True", + "deleteExistingPeering": "True", + "appliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1", + "useHubGateway": "True", + "groupConnectivity": "None", + "isGlobal": "False" + } + ], + "provisioningState": "Succeeded" + }, + "configurationGroups": [ + { + "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/examples/NetworkManagerEffectiveSecurityAdminRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityAdminRulesList.json new file mode 100644 index 000000000000..2d947017c9a0 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityAdminRulesList.json @@ -0,0 +1,79 @@ +{ + "title": "List Azure Virtual Network Manager Effective Configuration", + "parameters": { + "api-version": "2021-02-01-preview", + "subscriptionId": "subscriptionA", + "resourceGroupName": "myResourceGroup", + "virtualNetworkName": "testVirtualNetwork", + "parameters": { + "$skipToken": "FakeSkipTokenCode" + } + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection/rules/SampleAdminRule", + "configurationDisplayName": "SampleConfig", + "configurationDescription": "SampleDescription", + "ruleCollectionDisplayName": "SampleRuleCollection", + "ruleCollectionDescription": "SampleRuleCollectionDescription", + "ruleCollectionAppliesToGroups": [ + { + "networkGroupId": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1" + } + ], + "kind": "Default", + "properties": { + "displayName": "SampleAdminRule", + "description": "Sample Admin Rule", + "flag": "AllowVnetInbound", + "protocol": "Tcp", + "sources": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "destinations": [ + { + "addressPrefixType": "IPPrefix", + "addressPrefix": "*" + } + ], + "sourcePortRanges": [ + "0-65535" + ], + "destinationPortRanges": [ + "22" + ], + "direction": "Inbound", + "access": "Deny", + "priority": 1, + "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/examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json new file mode 100644 index 000000000000..8874039ebcef --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json @@ -0,0 +1,77 @@ +{ + "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/examples/NetworkManagerGet.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json index 763addbf35bb..4491032f5202 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerGet.json @@ -30,7 +30,7 @@ ] }, "networkManagerScopeAccesses": [ - "UserSecurity" + "SecurityUser" ], "provisioningState": "Succeeded" } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json index 4a53208631dc..a55c52a4c7ca 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerListAll.json @@ -31,7 +31,7 @@ ] }, "networkManagerScopeAccesses": [ - "UserSecurity" + "SecurityUser" ], "provisioningState": "Succeeded" } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json index 8f9037afec2c..ad71ddf0332e 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json @@ -42,7 +42,7 @@ ] }, "networkManagerScopeAccesses": [ - "UserSecurity" + "SecurityUser" ], "provisioningState": "Succeeded" } 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 e5493cedb794..a10657c5b844 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 @@ -641,8 +641,8 @@ "ConfigurationType": { "type": "string", "enum": [ - "AdminSecurity", - "UserSecurity", + "SecurityAdmin", + "SecurityUser", "Connectivity" ], "x-ms-enum": { 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 9f6b16516511..3234a607d720 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 @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/listActiveConfigurations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/listActiveConnectivityConfigurations": { "parameters": [ { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -55,20 +55,71 @@ "schema": { "$ref": "#/definitions/ActiveConfigurationParameter" }, - "description": "Effective Virtual Networks Parameter." + "description": "Active Configuration Parameter." + } + ], + "post": { + "tags": [ + "NetworkManagerActiveConnectivityConfigurations" + ], + "operationId": "ActiveConnectivityConfigurations_List", + "description": "Lists active connectivity configurations in a network manager.", + "responses": { + "200": { + "description": "Post successful. The operation returns the specified Managed Network active connectivity configuration resource.", + "schema": { + "$ref": "#/definitions/ActiveConnectivityConfigurationsListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List Active Connectivity Configurations": { + "$ref": "./examples/NetworkManagerActiveConnectivityConfigurationList.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/listActiveSecurityAdminRules": { + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": false, + "schema": { + "$ref": "#/definitions/ActiveConfigurationParameter" + }, + "description": "Active Configuration Parameter." } ], "post": { "tags": [ "NetworkManagerActiveConfigurations" ], - "operationId": "ActiveConfigurations_List", - "description": "Lists active configurations in a network manager.", + "operationId": "ActiveSecurityAdminRules_List", + "description": "Lists active security admin rules in a network manager.", "responses": { "200": { - "description": "Get successful. The operation returns the specified Managed Network active configuration resource.", + "description": "Post successful. The operation returns the specified Managed Network active security admin rules resource.", "schema": { - "$ref": "#/definitions/ActiveConfigurationListResult" + "$ref": "#/definitions/ActiveSecurityAdminRulesListResult" } }, "default": { @@ -79,15 +130,83 @@ } }, "x-ms-examples": { - "List Active Configurations": { - "$ref": "./examples/NetworkManagerActiveConfigurationList.json" + "List Active Security Admin Rules": { + "$ref": "./examples/NetworkManagerActiveSecurityAdminRulesList.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/listActiveSecurityUserRules": { + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/NetworkManagerNameParameter" + }, + { + "name": "parameters", + "in": "body", + "required": false, + "schema": { + "$ref": "#/definitions/ActiveConfigurationParameter" + }, + "description": "Active Configuration Parameter." + } + ], + "post": { + "tags": [ + "NetworkManagerActiveSecurityUserRules" + ], + "operationId": "ActiveSecurityUserRules_List", + "description": "Lists Active Security User Rules in a network manager.", + "responses": { + "200": { + "description": "Post successful. The operation returns the specified Managed Network active security user rules resource.", + "schema": { + "$ref": "#/definitions/ActiveSecurityUserRulesListResult" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List Active Security User Rules": { + "$ref": "./examples/NetworkManagerActiveSecurityUserRulesList.json" } } } } }, "definitions": { - "ActiveConfiguration": { + "ActiveConfigurationParameter": { + "properties": { + "regions": { + "type": "array", + "items": { + "type": "string", + "description": "region Name." + }, + "description": "List of regions." + }, + "$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": "Effective Virtual Networks Parameter." + }, + "ActiveConnectivityConfiguration": { "properties": { "commitTime": { "type": "string", @@ -101,43 +220,249 @@ }, "allOf": [ { - "$ref": "./networkManagerEffectiveConfiguration.json#/definitions/EffectiveConfiguration" + "$ref": "./networkManagerEffectiveConfiguration.json#/definitions/EffectiveConnectivityConfiguration" } - ], - "description": "Active Configuration." + ] }, - "ActiveConfigurationListResult": { + "ActiveConnectivityConfigurationsListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/ActiveConfiguration" + "$ref": "#/definitions/ActiveConnectivityConfiguration" }, - "description": "Gets a page of active configurations." + "description": "Gets a page of active connectivity configurations." }, "$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 active configurations. It contains a list of active configurations and a URL link to get the next set of results." + "description": "Result of the request to list active connectivity configurations. It contains a list of active connectivity configurations and a skiptoken to get the next set of results." }, - "ActiveConfigurationParameter": { + "ActiveSecurityAdminRulesListResult": { "properties": { - "regions": { + "value": { "type": "array", "items": { - "type": "string", - "description": "region Name." + "$ref": "#/definitions/ActiveBaseSecurityAdminRule" }, - "description": "List of regions." + "description": "Gets a page of active security admin rules." }, "$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": "Effective Virtual Networks Parameter." + "description": "Result of the request to list active security admin rules. It contains a list of active security admin rules and a skiptoken to get the next set of results." + }, + "ActiveSecurityUserRulesListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ActiveBaseSecurityUserRule" + }, + "description": "Gets a page of active security user rules." + }, + "$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 active security user rules. It contains a list of active security user rules and a skiptoken to get the next set of results." + }, + "ActiveBaseSecurityAdminRule": { + "properties": { + "id": { + "type": "string", + "description": "Resource ID." + }, + "commitTime": { + "type": "string", + "description": "Deployment time string.", + "format": "date-time" + }, + "region": { + "type": "string", + "description": "Deployment region." + }, + "configurationDisplayName": { + "type": "string", + "description": "A display name of the security admin configuration." + }, + "configurationDescription": { + "type": "string", + "description": "A description of the security admin 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": "./networkManagerEffectiveConfiguration.json#/definitions/ConfigurationGroup" + }, + "description": "Effective configuration groups." + }, + "kind": { + "type": "string", + "description": "Whether the rule is custom or default.", + "enum": [ + "Custom", + "Default" + ], + "x-ms-enum": { + "name": "EffectiveAdminRuleKind", + "modelAsString": true + } + } + }, + "required": [ + "kind" + ], + "discriminator": "kind", + "description": "Network base admin rule." + }, + "ActiveSecurityAdminRule": { + "properties": { + "properties": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/AdminPropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the security admin rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/ActiveBaseSecurityAdminRule" + } + ], + "description": "Network admin rule.", + "x-ms-discriminator-value": "Custom" + }, + "ActiveDefaultSecurityAdminRule": { + "properties": { + "properties": { + "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/DefaultAdminPropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the default security admin rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/ActiveBaseSecurityAdminRule" + } + ], + "description": "Network default admin rule.", + "x-ms-discriminator-value": "Default" + }, + "ActiveBaseSecurityUserRule": { + "properties": { + "id": { + "type": "string", + "description": "Resource ID." + }, + "commitTime": { + "type": "string", + "description": "Deployment time string.", + "format": "date-time" + }, + "region": { + "type": "string", + "description": "Deployment region." + }, + "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": "./networkManagerEffectiveConfiguration.json#/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." + }, + "ActiveSecurityUserRule": { + "properties": { + "properties": { + "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/UserRulePropertiesFormat", + "x-ms-client-flatten": true, + "description": "Indicates the properties of the security user rule" + } + }, + "allOf": [ + { + "$ref": "#/definitions/ActiveBaseSecurityUserRule" + } + ], + "description": "Network security user rule.", + "x-ms-discriminator-value": "Custom" + }, + "ActiveDefaultSecurityUserRule": { + "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/ActiveBaseSecurityUserRule" + } + ], + "description": "Network security default user rule.", + "x-ms-discriminator-value": "Default" } }, "parameters": { 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 7a41f849d907..08b80a624c52 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 @@ -34,7 +34,7 @@ } }, "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/listNetworkManagerEffectiveConfigurations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/listNetworkManagerEffectiveConnectivityConfigurations": { "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -60,15 +60,15 @@ ], "post": { "tags": [ - "NetworkManagerEffectiveConfiguration" + "NetworkManagerEffectiveConnectivityConfiguration" ], - "operationId": "EffectiveConfigurations_List", - "description": "List all configurations in a virtual network.", + "operationId": "EffectiveConnectivityConfigurations_List", + "description": "List all effective connectivity configurations applied on a virtual network.", "responses": { "200": { "description": "OK - Returns information about the configurations.", "schema": { - "$ref": "#/definitions/NetworkManagerEffectiveConfigurationListResult" + "$ref": "#/definitions/NetworkManagerEffectiveConnectivityConfigurationListResult" } }, "default": { @@ -79,13 +79,64 @@ } }, "x-ms-examples": { - "List effective configuration": { - "$ref": "./examples/NetworkManagerEffectiveConfigurationsList.json" + "List effective connectivity configuration": { + "$ref": "./examples/NetworkManagerEffectiveConnectivityConfigurationsList.json" } } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/listNetworkManagerEffectiveConfigurations": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/listNetworkManagerEffectiveSecurityAdminRules": { + "parameters": [ + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/VirtualNetworkNameParameter" + }, + { + "$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": [ + "NetworkManagerEffectiveSecurityAdminRules" + ], + "operationId": "NetworkManagerEffectiveSecurityAdminRules_List", + "description": "List all effective security admin rules applied on a virtual network.", + "responses": { + "200": { + "description": "OK - Returns information about the configurations.", + "schema": { + "$ref": "#/definitions/NetworkManagerEffectiveSecurityAdminRulesListResult" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "./network.json#/definitions/CloudError" + } + } + }, + "x-ms-examples": { + "List effective security admin rules": { + "$ref": "./examples/NetworkManagerEffectiveSecurityAdminRulesList.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/listNetworkManagerEffectiveSecurityUserRules": { "parameters": [ { "$ref": "./network.json#/parameters/SubscriptionIdParameter" @@ -118,15 +169,15 @@ ], "post": { "tags": [ - "NetworkManagerEffectiveConfiguration" + "NetworkManagerEffectiveSecurityUserRules" ], - "operationId": "EffectiveConfigurations_ListBySubnet", - "description": "List all configurations in a subnet.", + "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/NetworkManagerEffectiveConfigurationListResult" + "$ref": "#/definitions/NetworkManagerEffectiveSecurityUserRulesListResult" } }, "default": { @@ -137,45 +188,72 @@ } }, "x-ms-examples": { - "List effective configuration in a subnet": { - "$ref": "./examples/NetworkManagerEffectiveConfigurationsListBySubnet.json" + "List effective security user rules applied on a subnet": { + "$ref": "./examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json" } } } } }, "definitions": { - "EffectiveConfiguration": { + "NetworkManagerEffectiveConnectivityConfigurationListResult": { "properties": { - "configurationType": { - "type": "string", - "$ref": "./networkManager.json#/definitions/ConfigurationType", - "description": "Commit Type." - }, - "connectivityConfiguration": { - "type": "object", - "properties": { - "id": { - "type": "string", - "description": "Resource ID." - }, - "properties": { - "x-ms-client-flatten": true, - "$ref": "./networkManagerConnectivityConfiguration.json#/definitions/ConnectivityConfigurationProperties", - "description": "Properties of a network manager connectivity configuration" - } + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/EffectiveConnectivityConfiguration" }, - "description": "The network manager connectivity configuration resource" + "description": "Gets a page of NetworkManagerEffectiveConnectivityConfiguration" }, - "securityAdminRule": { - "type": "object", - "$ref": "#/definitions/AdminBaseRule", - "description": "Security Admin Rule." + "$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 networkManagerEffectiveConnectivityConfiguration. It contains a list of groups and a skiptoken to get the next set of results." + }, + "NetworkManagerEffectiveSecurityAdminRulesListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/EffectiveBaseSecurityAdminRule" + }, + "description": "Gets a page of NetworkManagerEffectiveSecurityAdminRules" + }, + "$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 networkManagerEffectiveSecurityAdminRules. It contains a list of groups and a skiptoken to get the next set of results." + }, + "NetworkManagerEffectiveSecurityUserRulesListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/EffectiveBaseSecurityUserRule" + }, + "description": "Gets a page of NetworkManagerEffectiveSecurityUserRules" }, - "securityUserRule": { - "type": "object", - "$ref": "#/definitions/UserBaseRule", - "description": "Security User Rule." + "$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": { + "properties": { + "id": { + "type": "string", + "description": "Resource ID." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "./networkManagerConnectivityConfiguration.json#/definitions/ConnectivityConfigurationProperties", + "description": "Properties of a network manager connectivity configuration" }, "configurationGroups": { "type": "array", @@ -185,12 +263,9 @@ "description": "Effective configuration groups." } }, - "required": [ - "configurationType" - ], - "description": "The network manager effective configuration" + "description": "The network manager effective connectivity configuration" }, - "AdminBaseRule": { + "EffectiveBaseSecurityAdminRule": { "properties": { "id": { "type": "string", @@ -219,9 +294,16 @@ }, "description": "Groups for rule collection" }, + "ruleGroups": { + "type": "array", + "items": { + "$ref": "#/definitions/ConfigurationGroup" + }, + "description": "Effective configuration groups." + }, "kind": { "type": "string", - "description": "Whether the rule collection is custom or default.", + "description": "Whether the rule is custom or default.", "enum": [ "Custom", "Default" @@ -238,7 +320,7 @@ "discriminator": "kind", "description": "Network base admin rule." }, - "EffectiveAdminRule": { + "EffectiveSecurityAdminRule": { "properties": { "properties": { "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/AdminPropertiesFormat", @@ -248,13 +330,13 @@ }, "allOf": [ { - "$ref": "#/definitions/AdminBaseRule" + "$ref": "#/definitions/EffectiveBaseSecurityAdminRule" } ], "description": "Network admin rule.", "x-ms-discriminator-value": "Custom" }, - "EffectiveDefaultAdminRule": { + "EffectiveDefaultSecurityAdminRule": { "properties": { "properties": { "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/DefaultAdminPropertiesFormat", @@ -264,13 +346,13 @@ }, "allOf": [ { - "$ref": "#/definitions/AdminBaseRule" + "$ref": "#/definitions/EffectiveBaseSecurityAdminRule" } ], "description": "Network default admin rule.", "x-ms-discriminator-value": "Default" }, - "UserBaseRule": { + "EffectiveBaseSecurityUserRule": { "properties": { "id": { "type": "string", @@ -299,9 +381,16 @@ }, "description": "Groups for rule collection" }, + "ruleGroups": { + "type": "array", + "items": { + "$ref": "#/definitions/ConfigurationGroup" + }, + "description": "Effective configuration groups." + }, "kind": { "type": "string", - "description": "Whether the rule collection is custom or default.", + "description": "Whether the rule is custom or default.", "enum": [ "Custom", "Default" @@ -318,7 +407,7 @@ "discriminator": "kind", "description": "Network base rule." }, - "EffectiveUserRule": { + "EffectiveSecurityUserRule": { "properties": { "properties": { "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/UserRulePropertiesFormat", @@ -328,13 +417,13 @@ }, "allOf": [ { - "$ref": "#/definitions/UserBaseRule" + "$ref": "#/definitions/EffectiveBaseSecurityUserRule" } ], "description": "Network security user rule.", "x-ms-discriminator-value": "Custom" }, - "EffectiveDefaultUserRule": { + "EffectiveDefaultSecurityUserRule": { "properties": { "properties": { "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/DefaultUserRulePropertiesFormat", @@ -344,7 +433,7 @@ }, "allOf": [ { - "$ref": "#/definitions/UserBaseRule" + "$ref": "#/definitions/EffectiveBaseSecurityUserRule" } ], "description": "Network security default user rule.", @@ -363,22 +452,6 @@ } }, "description": "The network configuration group resource" - }, - "NetworkManagerEffectiveConfigurationListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/EffectiveConfiguration" - }, - "description": "Gets a page of NetworkManagerEffectiveConfiguration" - }, - "$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 networkManagerEffectiveConfiguration. It contains a list of groups and a URL link to get the next set of results." } }, "parameters": { From b8b5ffb98f52a89186871a0424a00ed0be904b00 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Tue, 3 Aug 2021 11:55:30 -0700 Subject: [PATCH 12/23] Fix lintdiff --- .../networkManagerActiveConfiguration.json | 13 ++++++++++++- .../networkManagerEffectiveConfiguration.json | 11 +++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) 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 3234a607d720..fa2c41f4d7a2 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 @@ -207,6 +207,7 @@ "description": "Effective Virtual Networks Parameter." }, "ActiveConnectivityConfiguration": { + "type": "object", "properties": { "commitTime": { "type": "string", @@ -222,9 +223,11 @@ { "$ref": "./networkManagerEffectiveConfiguration.json#/definitions/EffectiveConnectivityConfiguration" } - ] + ], + "description": "Active connectivity configuration." }, "ActiveConnectivityConfigurationsListResult": { + "type": "object", "properties": { "value": { "type": "array", @@ -241,6 +244,7 @@ "description": "Result of the request to list active connectivity configurations. It contains a list of active connectivity configurations and a skiptoken to get the next set of results." }, "ActiveSecurityAdminRulesListResult": { + "type": "object", "properties": { "value": { "type": "array", @@ -257,6 +261,7 @@ "description": "Result of the request to list active security admin rules. It contains a list of active security admin rules and a skiptoken to get the next set of results." }, "ActiveSecurityUserRulesListResult": { + "type": "object", "properties": { "value": { "type": "array", @@ -273,6 +278,7 @@ "description": "Result of the request to list active security user rules. It contains a list of active security user rules and a skiptoken to get the next set of results." }, "ActiveBaseSecurityAdminRule": { + "type": "object", "properties": { "id": { "type": "string", @@ -337,6 +343,7 @@ "description": "Network base admin rule." }, "ActiveSecurityAdminRule": { + "type": "object", "properties": { "properties": { "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/AdminPropertiesFormat", @@ -353,6 +360,7 @@ "x-ms-discriminator-value": "Custom" }, "ActiveDefaultSecurityAdminRule": { + "type": "object", "properties": { "properties": { "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/DefaultAdminPropertiesFormat", @@ -369,6 +377,7 @@ "x-ms-discriminator-value": "Default" }, "ActiveBaseSecurityUserRule": { + "type": "object", "properties": { "id": { "type": "string", @@ -433,6 +442,7 @@ "description": "Network base rule." }, "ActiveSecurityUserRule": { + "type": "object", "properties": { "properties": { "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/UserRulePropertiesFormat", @@ -449,6 +459,7 @@ "x-ms-discriminator-value": "Custom" }, "ActiveDefaultSecurityUserRule": { + "type": "object", "properties": { "properties": { "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/DefaultUserRulePropertiesFormat", 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 08b80a624c52..ccfae67be11d 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 @@ -197,6 +197,7 @@ }, "definitions": { "NetworkManagerEffectiveConnectivityConfigurationListResult": { + "type": "object", "properties": { "value": { "type": "array", @@ -213,6 +214,7 @@ "description": "Result of the request to list networkManagerEffectiveConnectivityConfiguration. It contains a list of groups and a skiptoken to get the next set of results." }, "NetworkManagerEffectiveSecurityAdminRulesListResult": { + "type": "object", "properties": { "value": { "type": "array", @@ -229,6 +231,7 @@ "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", @@ -245,6 +248,7 @@ "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": { "id": { "type": "string", @@ -266,6 +270,7 @@ "description": "The network manager effective connectivity configuration" }, "EffectiveBaseSecurityAdminRule": { + "type": "object", "properties": { "id": { "type": "string", @@ -321,6 +326,7 @@ "description": "Network base admin rule." }, "EffectiveSecurityAdminRule": { + "type": "object", "properties": { "properties": { "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/AdminPropertiesFormat", @@ -337,6 +343,7 @@ "x-ms-discriminator-value": "Custom" }, "EffectiveDefaultSecurityAdminRule": { + "type": "object", "properties": { "properties": { "$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/DefaultAdminPropertiesFormat", @@ -353,6 +360,7 @@ "x-ms-discriminator-value": "Default" }, "EffectiveBaseSecurityUserRule": { + "type": "object", "properties": { "id": { "type": "string", @@ -408,6 +416,7 @@ "description": "Network base rule." }, "EffectiveSecurityUserRule": { + "type": "object", "properties": { "properties": { "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/UserRulePropertiesFormat", @@ -424,6 +433,7 @@ "x-ms-discriminator-value": "Custom" }, "EffectiveDefaultSecurityUserRule": { + "type": "object", "properties": { "properties": { "$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/DefaultUserRulePropertiesFormat", @@ -440,6 +450,7 @@ "x-ms-discriminator-value": "Default" }, "ConfigurationGroup": { + "type": "object", "properties": { "id": { "type": "string", From a5e579068ae6fca8edc9f584d7faabd240f234f6 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Wed, 4 Aug 2021 18:23:42 -0700 Subject: [PATCH 13/23] fix as commnets --- ...rkManagerActiveConnectivityConfigurationsList.json} | 2 +- .../NetworkManagerActiveSecurityAdminRulesList.json | 2 +- .../NetworkManagerActiveSecurityUserRulesList.json | 2 +- ...RulesList.json => NetworkManagerAdminRuleList.json} | 0 .../examples/NetworkManagerCommitPost.json | 10 +++++----- .../examples/NetworkManagerPatch.json | 2 +- ...rRulesList.json => NetworkManagerUserRuleList.json} | 0 .../networkManagerActiveConfiguration.json | 2 +- .../networkManagerSecurityAdminConfiguration.json | 2 +- .../networkManagerSecurityUserConfiguration.json | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/{NetworkManagerActiveConnectivityConfigurationList.json => NetworkManagerActiveConnectivityConfigurationsList.json} (96%) rename specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/{NetworkManagerAdminRulesList.json => NetworkManagerAdminRuleList.json} (100%) rename specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/{NetworkManagerUserRulesList.json => NetworkManagerUserRuleList.json} (100%) diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json similarity index 96% rename from specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationList.json rename to specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json index a3af95d42ada..d6dd61dc6f48 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationList.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConnectivityConfigurationsList.json @@ -1,5 +1,5 @@ { - "title": "Get Azure Virtual Network Manager Active Configuration", + "title": "Get Azure Virtual Network Manager Active Connectivity Configuration", "parameters": { "api-version": "2021-02-01-preview", "subscriptionId": "subscriptionA", 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 dbb546f9504a..49d3635ff736 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 @@ -1,5 +1,5 @@ { - "title": "Get Azure Virtual Network Manager Active Configuration", + "title": "Get Azure Virtual Network Manager Active Security Admin Rules", "parameters": { "api-version": "2021-02-01-preview", "subscriptionId": "subscriptionA", 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 f288885b13bc..9396eb74d235 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 @@ -1,5 +1,5 @@ { - "title": "Get Azure Virtual Network Manager Active Configuration", + "title": "Get Azure Virtual Network Manager Active Security User Rules", "parameters": { "api-version": "2021-02-01-preview", "subscriptionId": "subscriptionA", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleList.json similarity index 100% rename from specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRulesList.json rename to specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleList.json diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json index acc7dbf80845..c079fa9aa503 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerCommitPost.json @@ -7,12 +7,12 @@ "networkManagerName": "testNetworkManager", "parameters": { "targetLocations": [ - "usest" + "useast" ], "configurationIds": [ - "/subscriptions/subscriptionC/resourceGroups/resoureGroupSample/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/SampleSecurityConfig" + "/subscriptions/subscriptionC/resourceGroups/resoureGroupSample/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/SampleSecurityAdminConfig" ], - "commitType": "AdminSecurity" + "commitType": "SecurityAdmin" } }, "responses": { @@ -20,10 +20,10 @@ "body": { "commitId": "testCommitId", "targetLocations": [ - "usest" + "useast" ], "configurationIds": [ - "/subscriptions/subscriptionC/resourceGroups/resoureGroupSample/providers/Microsoft.Network/networkManagers/testNetworkManager/securityConfigurations/SampleSecurityConfig" + "/subscriptions/subscriptionC/resourceGroups/resoureGroupSample/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/SampleSecurityAdminConfig" ], "commitType": "SecurityAdmin" } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json index ad71ddf0332e..dad5b232af9d 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerPatch.json @@ -18,7 +18,7 @@ "name": "testNetworkManager", "id": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager", "type": "Microsoft.Network/networkManager", - "etag": "sadf-asdf-asdf-asdf", + "etag": "W/\"00000000-0000-0000-0000-000000000000\"", "location": "westus", "tags": { "tag1": "value1", diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleList.json similarity index 100% rename from specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRulesList.json rename to specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerUserRuleList.json 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 fa2c41f4d7a2..e1e2f6d687c9 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 @@ -80,7 +80,7 @@ }, "x-ms-examples": { "List Active Connectivity Configurations": { - "$ref": "./examples/NetworkManagerActiveConnectivityConfigurationList.json" + "$ref": "./examples/NetworkManagerActiveConnectivityConfigurationsList.json" } } } diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json index 866078791d18..cf7706d09e19 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json @@ -418,7 +418,7 @@ }, "x-ms-examples": { "List security admin rules": { - "$ref": "./examples/NetworkManagerAdminRulesList.json" + "$ref": "./examples/NetworkManagerAdminRuleList.json" } }, "x-ms-pageable": { diff --git a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json index c951a3ff65ac..b155cbd891c6 100644 --- a/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json +++ b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json @@ -418,7 +418,7 @@ }, "x-ms-examples": { "List security user rules": { - "$ref": "./examples/NetworkManagerUserRulesList.json" + "$ref": "./examples/NetworkManagerUserRuleList.json" } }, "x-ms-pageable": { From 4cfe186ffa3094b7ddda8aa180d55248c1a859e4 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Mon, 16 Aug 2021 17:46:26 -0700 Subject: [PATCH 14/23] small change and update default package id --- .../networkManagerActiveConfiguration.json | 6 +++--- specification/network/resource-manager/readme.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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/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 ``` From e6efa8bf9e80e5354b53aa218df963be8993de6d Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Wed, 18 Aug 2021 15:09:24 -0700 Subject: [PATCH 15/23] remove subnet level api --- ...ffectiveSecurityUserRulesListBySubnet.json | 77 -------- .../networkManagerEffectiveConfiguration.json | 165 ------------------ 2 files changed, 242 deletions(-) delete mode 100644 specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json 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/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": { From b245908ce808d5ed30699b1785bc25516e172601 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Fri, 27 Aug 2021 18:45:08 -0700 Subject: [PATCH 16/23] remove $ fro $skiptoken --- ...etworkManagerActiveConnectivityConfigurationsList.json | 4 ++-- .../NetworkManagerActiveSecurityAdminRulesList.json | 4 ++-- .../NetworkManagerActiveSecurityUserRulesList.json | 4 ++-- .../examples/NetworkManagerDeploymentStatusList.json | 4 ++-- ...orkManagerEffectiveConnectivityConfigurationsList.json | 4 ++-- .../NetworkManagerEffectiveSecurityAdminRulesList.json | 4 ++-- .../NetworkManagerEffectiveVirtualNetworksList.json | 4 ++-- ...nagerEffectiveVirtualNetworksListByNetworkManager.json | 4 ++-- .../preview/2021-02-01-preview/networkManager.json | 8 ++++---- .../networkManagerActiveConfiguration.json | 8 ++++---- .../networkManagerEffectiveConfiguration.json | 4 ++-- .../preview/2021-02-01-preview/networkManagerGroup.json | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) 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..e0b2947176bd 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": { @@ -56,7 +56,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..c8c3b0557307 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": { @@ -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..de54594500c2 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": { @@ -74,7 +74,7 @@ ] } ], - "$skipToken": "FakeSkipTokenCode" + "skipToken": "FakeSkipTokenCode" } } } 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..ed21c823b168 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": { @@ -51,7 +51,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..d501e7393d7a 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": { @@ -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/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/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..6d2df086069d 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 @@ -369,7 +369,7 @@ }, "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 +385,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" } From ba4dc03043968e28e5e113c152dfa13135825516 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Mon, 30 Aug 2021 18:24:27 -0700 Subject: [PATCH 17/23] Change hub and groupids --- ...rActiveConnectivityConfigurationsList.json | 9 +++++-- ...rkManagerActiveSecurityAdminRulesList.json | 2 +- ...orkManagerActiveSecurityUserRulesList.json | 2 +- ...rkManagerConnectivityConfigurationGet.json | 7 ++++- ...kManagerConnectivityConfigurationList.json | 7 ++++- ...rkManagerConnectivityConfigurationPut.json | 21 ++++++++++++--- ...fectiveConnectivityConfigurationsList.json | 9 +++++-- ...anagerEffectiveSecurityAdminRulesList.json | 2 +- .../examples/NetworkManagerGroupGet.json | 3 +-- .../examples/NetworkManagerGroupList.json | 2 +- .../examples/NetworkManagerGroupPut.json | 9 +++---- ...tworkManagerConnectivityConfiguration.json | 26 ++++++++++++++++--- .../networkManagerGroup.json | 8 ++---- 13 files changed, 77 insertions(+), 30 deletions(-) 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 e0b2947176bd..b02ceab195df 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 @@ -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": "VirtualNetwork" + } + ], "isGlobal": "True", "deleteExistingPeering": "True", "appliesToGroups": [ @@ -46,7 +51,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": "", 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 c8c3b0557307..3951b6bdb154 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 @@ -67,7 +67,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": "", 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 de54594500c2..d35711bff1ff 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 @@ -64,7 +64,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": "", 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..50af9de37f40 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,7 +25,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": "VirtualNetwork" + } + ], "isGlobal": "True", "deleteExistingPeering": "True", "appliesToGroups": [ 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..b2d1b4ab82c1 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,7 +26,12 @@ "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": "VirtualNetwork" + } + ], "deleteExistingPeering": "True", "isGlobal": "True", "appliesToGroups": [ 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..0942dfb1d306 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,7 +11,12 @@ "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": "VirtualNetwork" + } + ], "deleteExistingPeering": "True", "isGlobal": "True", "appliesToGroups": [ @@ -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": "VirtualNetwork" + } + ], "deleteExistingPeering": "True", "isGlobal": "True", "appliesToGroups": [ @@ -75,7 +85,12 @@ "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": "VirtualNetwork" + } + ], "deleteExistingPeering": "True", "isGlobal": "True", "appliesToGroups": [ 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 ed21c823b168..3c6a8bfe353e 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 @@ -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": "VirtualNetwork" + } + ], "isGlobal": "True", "deleteExistingPeering": "True", "appliesToGroups": [ @@ -41,7 +46,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": "", 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 d501e7393d7a..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 @@ -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": "", 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/networkManagerConnectivityConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json index 39348f651e58..3a9ddd3dc149 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/hubItem" + }, + "description": "List of hubItems" }, "isGlobal": { "type": "string", @@ -305,6 +308,23 @@ ], "description": "Properties of network manager connectivity configuration" }, + "hubItem": { + "type": "object", + "properties": { + "resourceId": { + "type": "string", + "description": "Resource Id." + }, + "resourceType": { + "type": "string", + "enum": [ + "VirtualNetwork" + ], + "description": "Resource Type." + } + }, + "description": "Hub Item." + }, "connectivityGroupItem": { "type": "object", "properties": { 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 6d2df086069d..8e514e4e20d0 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 @@ -356,13 +356,9 @@ "groupMembersItem": { "type": "object", "properties": { - "vnetId": { + "resourceId": { "type": "string", - "description": "Vnet Id." - }, - "subnetId": { - "type": "string", - "description": "Subnet Id." + "description": "Resource Id." } }, "description": "GroupMembers Item." From 0ae4ed933605331845afc90aa572e0e3f78d133d Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:39:27 -0700 Subject: [PATCH 18/23] fix bug --- .../networkManagerConnectivityConfiguration.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 3a9ddd3dc149..0eabd5f1a1dd 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 @@ -262,7 +262,7 @@ "hubs": { "type": "array", "items": { - "$ref": "#/definitions/hubItem" + "$ref": "#/definitions/Hub" }, "description": "List of hubItems" }, @@ -308,7 +308,7 @@ ], "description": "Properties of network manager connectivity configuration" }, - "hubItem": { + "Hub": { "type": "object", "properties": { "resourceId": { @@ -318,6 +318,7 @@ "resourceType": { "type": "string", "enum": [ + "Invalid", "VirtualNetwork" ], "description": "Resource Type." From 920657558978f8f733f844cdf8c74d175ecfe5d3 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Mon, 30 Aug 2021 20:33:30 -0700 Subject: [PATCH 19/23] fix prettier --- ...erActiveConnectivityConfigurationsList.json | 4 ++-- ...orkManagerConnectivityConfigurationGet.json | 4 ++-- ...rkManagerConnectivityConfigurationList.json | 4 ++-- ...orkManagerConnectivityConfigurationPut.json | 18 +++++++++--------- ...ffectiveConnectivityConfigurationsList.json | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) 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 b02ceab195df..81b8c768bee7 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 @@ -26,8 +26,8 @@ "connectivityTopology": "HubAndSpoke", "hubs": [ { - "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "resourceType": "VirtualNetwork" + "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "resourceType": "VirtualNetwork" } ], "isGlobal": "True", 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 50af9de37f40..8a30cc6c7d73 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 @@ -27,8 +27,8 @@ "connectivityTopology": "HubAndSpoke", "hubs": [ { - "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "resourceType": "VirtualNetwork" + "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "resourceType": "VirtualNetwork" } ], "isGlobal": "True", 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 b2d1b4ab82c1..1db439c904b2 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 @@ -28,8 +28,8 @@ "connectivityTopology": "HubAndSpoke", "hubs": [ { - "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "resourceType": "VirtualNetwork" + "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "resourceType": "VirtualNetwork" } ], "deleteExistingPeering": "True", 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 0942dfb1d306..3584b27bafad 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 @@ -12,11 +12,11 @@ "description": "Sample Configuration", "connectivityTopology": "HubAndSpoke", "hubs": [ - { - "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "resourceType": "VirtualNetwork" - } - ], + { + "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "resourceType": "VirtualNetwork" + } + ], "deleteExistingPeering": "True", "isGlobal": "True", "appliesToGroups": [ @@ -50,8 +50,8 @@ "connectivityTopology": "HubAndSpoke", "hubs": [ { - "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "resourceType": "VirtualNetwork" + "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "resourceType": "VirtualNetwork" } ], "deleteExistingPeering": "True", @@ -87,8 +87,8 @@ "connectivityTopology": "HubAndSpoke", "hubs": [ { - "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "resourceType": "VirtualNetwork" + "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", + "resourceType": "VirtualNetwork" } ], "deleteExistingPeering": "True", 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 3c6a8bfe353e..3dce86da9589 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 @@ -21,8 +21,8 @@ "connectivityTopology": "HubAndSpoke", "hubs": [ { - "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "resourceType": "VirtualNetwork" + "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", + "resourceType": "VirtualNetwork" } ], "isGlobal": "True", From 022b631da568e4ebc59a305189e7f925af6abf6e Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Tue, 31 Aug 2021 10:53:50 -0700 Subject: [PATCH 20/23] Fix as comments --- ...orkManagerActiveConnectivityConfigurationsList.json | 4 ++-- .../NetworkManagerActiveSecurityAdminRulesList.json | 2 +- .../NetworkManagerActiveSecurityUserRulesList.json | 2 +- .../examples/NetworkManagerAdminRuleCollectionGet.json | 2 +- .../NetworkManagerAdminRuleCollectionList.json | 2 +- .../examples/NetworkManagerAdminRuleCollectionPut.json | 2 +- .../NetworkManagerConnectivityConfigurationGet.json | 4 ++-- .../NetworkManagerConnectivityConfigurationList.json | 4 ++-- .../NetworkManagerConnectivityConfigurationPut.json | 10 +++++----- .../examples/NetworkManagerDefaultUserRulePut.json | 4 ++-- ...ManagerEffectiveConnectivityConfigurationsList.json | 4 ++-- .../NetworkManagerSecurityAdminConfigurationGet.json | 4 ++-- .../NetworkManagerSecurityAdminConfigurationList.json | 6 +++--- .../NetworkManagerSecurityAdminConfigurationPut.json | 8 ++++---- .../NetworkManagerSecurityUserConfigurationGet.json | 4 ++-- .../NetworkManagerSecurityUserConfigurationList.json | 6 +++--- .../examples/NetworkManagerUserRuleCollectionGet.json | 2 +- .../examples/NetworkManagerUserRuleCollectionList.json | 2 +- .../examples/NetworkManagerUserRuleList.json | 2 +- .../networkManagerConnectivityConfiguration.json | 2 +- .../2021-02-01-preview/networkManagerGroup.json | 4 ++-- 21 files changed, 40 insertions(+), 40 deletions(-) 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 81b8c768bee7..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 @@ -27,7 +27,7 @@ "hubs": [ { "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "resourceType": "VirtualNetwork" + "resourceType": "Microsoft.Network/virtualNetworks" } ], "isGlobal": "True", @@ -48,7 +48,7 @@ "properties": { "displayName": "My Network Group", "description": "A group for all test Virtual Networks", - "memberType": "VirtualNetwork", + "memberType": "Microsoft.Network/virtualNetworks", "groupMembers": [ { "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" 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 3951b6bdb154..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 @@ -64,7 +64,7 @@ "properties": { "displayName": "My Network Group", "description": "A group for all test Virtual Networks", - "memberType": "VirtualNetwork", + "memberType": "Microsoft.Network/virtualNetworks", "groupMembers": [ { "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" 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 d35711bff1ff..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 @@ -61,7 +61,7 @@ "properties": { "displayName": "My Network Group", "description": "A group for all test Virtual Networks", - "memberType": "VirtualNetwork", + "memberType": "Microsoft.Network/virtualNetworks", "groupMembers": [ { "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" 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 8a30cc6c7d73..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 @@ -28,14 +28,14 @@ "hubs": [ { "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "resourceType": "VirtualNetwork" + "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 1db439c904b2..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 @@ -29,14 +29,14 @@ "hubs": [ { "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "resourceType": "VirtualNetwork" + "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 3584b27bafad..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 @@ -14,14 +14,14 @@ "hubs": [ { "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "resourceType": "VirtualNetwork" + "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" @@ -51,7 +51,7 @@ "hubs": [ { "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "resourceType": "VirtualNetwork" + "resourceType": "Microsoft.Network/virtualNetworks" } ], "deleteExistingPeering": "True", @@ -88,14 +88,14 @@ "hubs": [ { "resourceId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myTestConnectivityConfig", - "resourceType": "VirtualNetwork" + "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/NetworkManagerEffectiveConnectivityConfigurationsList.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveConnectivityConfigurationsList.json index 3dce86da9589..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 @@ -22,7 +22,7 @@ "hubs": [ { "resourceId": "/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet", - "resourceType": "VirtualNetwork" + "resourceType": "Microsoft.Network/virtualNetworks" } ], "isGlobal": "True", @@ -43,7 +43,7 @@ "properties": { "displayName": "My Network Group", "description": "A group for all test Virtual Networks", - "memberType": "VirtualNetwork", + "memberType": "Microsoft.Network/virtualNetworks", "groupMembers": [ { "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1" 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/networkManagerConnectivityConfiguration.json b/specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json index 0eabd5f1a1dd..3689e5a36d2a 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 @@ -319,7 +319,7 @@ "type": "string", "enum": [ "Invalid", - "VirtualNetwork" + "Microsoft.Network/virtualNetworks" ], "description": "Resource Type." } 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 8e514e4e20d0..5527ac5fb758 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 @@ -326,8 +326,8 @@ "type": "string", "description": "Group member type.", "enum": [ - "VirtualNetwork", - "Subnet" + "Microsoft.Network/virtualNetworks", + "Microsoft.Network/virtualNetworks/subnets" ], "x-ms-enum": { "name": "MemberType", From 20269e1dcc04cda7b37086d94d2016777babe499 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Tue, 31 Aug 2021 11:29:48 -0700 Subject: [PATCH 21/23] Fix type --- .../networkManagerConnectivityConfiguration.json | 4 ---- .../2021-02-01-preview/networkManagerGroup.json | 10 +--------- 2 files changed, 1 insertion(+), 13 deletions(-) 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 3689e5a36d2a..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 @@ -317,10 +317,6 @@ }, "resourceType": { "type": "string", - "enum": [ - "Invalid", - "Microsoft.Network/virtualNetworks" - ], "description": "Resource Type." } }, 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 5527ac5fb758..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": [ - "Microsoft.Network/virtualNetworks", - "Microsoft.Network/virtualNetworks/subnets" - ], - "x-ms-enum": { - "name": "MemberType", - "modelAsString": true - } + "description": "Group member type." }, "groupMembers": { "type": "array", From 8e86069007d2073cc777f0099e22fe5c647706d5 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Mon, 20 Sep 2021 15:21:16 -0700 Subject: [PATCH 22/23] update the api version --- .../network/resource-manager/readme.md | 98 +++++++++---------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index 494a5e55514a..2aafea56a165 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -211,32 +211,7 @@ These settings apply only when `--tag=2021-02-preview` is specified on the comma ``` yaml $(tag) == 'package-2021-02-preview' input-file: - - Microsoft.Network/stable/2020-11-01/applicationGateway.json - - Microsoft.Network/stable/2020-11-01/applicationSecurityGroup.json - - Microsoft.Network/stable/2020-11-01/availableDelegations.json - - Microsoft.Network/stable/2020-11-01/availableServiceAliases.json - - Microsoft.Network/stable/2020-11-01/azureFirewall.json - - Microsoft.Network/stable/2020-11-01/azureFirewallFqdnTag.json - - Microsoft.Network/stable/2020-11-01/azureWebCategory.json - - Microsoft.Network/stable/2020-11-01/bastionHost.json - - Microsoft.Network/stable/2020-11-01/checkDnsAvailability.json - - Microsoft.Network/stable/2020-11-01/cloudServiceNetworkInterface.json - - Microsoft.Network/stable/2020-11-01/cloudServicePublicIpAddress.json - - Microsoft.Network/stable/2020-11-01/customIpPrefix.json - - Microsoft.Network/stable/2020-11-01/ddosCustomPolicy.json - - Microsoft.Network/stable/2020-11-01/ddosProtectionPlan.json - - Microsoft.Network/stable/2020-11-01/dscpConfiguration.json - - Microsoft.Network/stable/2020-11-01/endpointService.json - - Microsoft.Network/stable/2020-11-01/expressRouteCircuit.json - - Microsoft.Network/stable/2020-11-01/expressRouteCrossConnection.json - - Microsoft.Network/stable/2020-11-01/expressRoutePort.json - - Microsoft.Network/stable/2020-11-01/firewallPolicy.json - - Microsoft.Network/stable/2020-11-01/ipAllocation.json - - Microsoft.Network/stable/2020-11-01/ipGroups.json - - Microsoft.Network/stable/2020-11-01/loadBalancer.json - - Microsoft.Network/stable/2020-11-01/natGateway.json - Microsoft.Network/preview/2021-02-01-preview/network.json - - Microsoft.Network/stable/2020-11-01/networkInterface.json - Microsoft.Network/preview/2021-02-01-preview/networkManager.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json @@ -245,30 +220,55 @@ input-file: - Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json - Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json - Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json - - Microsoft.Network/stable/2020-11-01/networkProfile.json - - Microsoft.Network/stable/2020-11-01/networkSecurityGroup.json - - Microsoft.Network/stable/2020-11-01/networkVirtualAppliance.json - - Microsoft.Network/stable/2020-11-01/networkWatcher.json - - Microsoft.Network/stable/2020-11-01/operation.json - - Microsoft.Network/stable/2020-11-01/privateEndpoint.json - - Microsoft.Network/stable/2020-11-01/privateLinkService.json - - Microsoft.Network/stable/2020-11-01/publicIpAddress.json - - Microsoft.Network/stable/2020-11-01/publicIpPrefix.json - - Microsoft.Network/stable/2020-11-01/routeFilter.json - - Microsoft.Network/stable/2020-11-01/routeTable.json - - Microsoft.Network/stable/2020-11-01/securityPartnerProvider.json - - Microsoft.Network/stable/2020-11-01/serviceCommunity.json - - Microsoft.Network/stable/2020-11-01/serviceEndpointPolicy.json - - Microsoft.Network/stable/2020-11-01/serviceTags.json - - Microsoft.Network/stable/2020-11-01/usage.json - - Microsoft.Network/stable/2020-11-01/virtualNetwork.json - - Microsoft.Network/stable/2020-11-01/virtualNetworkGateway.json - - Microsoft.Network/stable/2020-11-01/virtualNetworkTap.json - - Microsoft.Network/stable/2020-11-01/virtualRouter.json - - Microsoft.Network/stable/2020-11-01/virtualWan.json - - Microsoft.Network/stable/2020-11-01/vmssNetworkInterface.json - - Microsoft.Network/stable/2020-11-01/vmssPublicIpAddress.json - - Microsoft.Network/stable/2020-11-01/webapplicationfirewall.json + - Microsoft.Network/stable/2021-03-01/applicationGateway.json + - Microsoft.Network/stable/2021-03-01/applicationSecurityGroup.json + - Microsoft.Network/stable/2021-03-01/availableDelegations.json + - Microsoft.Network/stable/2021-03-01/availableServiceAliases.json + - Microsoft.Network/stable/2021-03-01/azureFirewall.json + - Microsoft.Network/stable/2021-03-01/azureFirewallFqdnTag.json + - Microsoft.Network/stable/2021-03-01/azureWebCategory.json + - Microsoft.Network/stable/2021-03-01/bastionHost.json + - Microsoft.Network/stable/2021-03-01/checkDnsAvailability.json + - Microsoft.Network/stable/2021-03-01/cloudServiceNetworkInterface.json + - Microsoft.Network/stable/2021-03-01/cloudServicePublicIpAddress.json + - Microsoft.Network/stable/2021-03-01/customIpPrefix.json + - Microsoft.Network/stable/2021-03-01/ddosCustomPolicy.json + - Microsoft.Network/stable/2021-03-01/ddosProtectionPlan.json + - Microsoft.Network/stable/2021-03-01/dscpConfiguration.json + - Microsoft.Network/stable/2021-03-01/endpointService.json + - Microsoft.Network/stable/2021-03-01/expressRouteCircuit.json + - Microsoft.Network/stable/2021-03-01/expressRouteCrossConnection.json + - Microsoft.Network/stable/2021-03-01/expressRoutePort.json + - Microsoft.Network/stable/2021-03-01/firewallPolicy.json + - Microsoft.Network/stable/2021-03-01/ipAllocation.json + - Microsoft.Network/stable/2021-03-01/ipGroups.json + - Microsoft.Network/stable/2021-03-01/loadBalancer.json + - Microsoft.Network/stable/2021-03-01/natGateway.json + - Microsoft.Network/stable/2021-03-01/networkInterface.json + - Microsoft.Network/stable/2021-03-01/networkProfile.json + - Microsoft.Network/stable/2021-03-01/networkSecurityGroup.json + - Microsoft.Network/stable/2021-03-01/networkVirtualAppliance.json + - Microsoft.Network/stable/2021-03-01/networkWatcher.json + - Microsoft.Network/stable/2021-03-01/operation.json + - Microsoft.Network/stable/2021-03-01/privateEndpoint.json + - Microsoft.Network/stable/2021-03-01/privateLinkService.json + - Microsoft.Network/stable/2021-03-01/publicIpAddress.json + - Microsoft.Network/stable/2021-03-01/publicIpPrefix.json + - Microsoft.Network/stable/2021-03-01/routeFilter.json + - Microsoft.Network/stable/2021-03-01/routeTable.json + - Microsoft.Network/stable/2021-03-01/securityPartnerProvider.json + - Microsoft.Network/stable/2021-03-01/serviceCommunity.json + - Microsoft.Network/stable/2021-03-01/serviceEndpointPolicy.json + - Microsoft.Network/stable/2021-03-01/serviceTags.json + - Microsoft.Network/stable/2021-03-01/usage.json + - Microsoft.Network/stable/2021-03-01/virtualNetwork.json + - Microsoft.Network/stable/2021-03-01/virtualNetworkGateway.json + - Microsoft.Network/stable/2021-03-01/virtualNetworkTap.json + - Microsoft.Network/stable/2021-03-01/virtualRouter.json + - Microsoft.Network/stable/2021-03-01/virtualWan.json + - Microsoft.Network/stable/2021-03-01/vmssNetworkInterface.json + - Microsoft.Network/stable/2021-03-01/vmssPublicIpAddress.json + - Microsoft.Network/stable/2021-03-01/webapplicationfirewall.json ``` ### Tag: package-2021-03-preview From 38290561211eac4382adfd161cc677ce3caf01a2 Mon Sep 17 00:00:00 2001 From: yanfa317 <53584318+yanfa317@users.noreply.github.com> Date: Tue, 21 Sep 2021 20:37:38 -0700 Subject: [PATCH 23/23] revert default tag --- specification/network/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index 2aafea56a165..16b6c98ec2c3 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-preview +tag: package-2021-03 ``` ### Tag: package-2021-03