Add New Data Model RuleCollection to NetworkManager (#13827)

* Add New Data Model RuleCollection to NetworkManager * fix typo * test * test * Fix discriminator * fix type * Fix discriminator * Fix type * fix type * Fix type * Fix discriminator * Fix discriminator * fix type * fix type * Fix bug * Fix type * Fix format * Fix name * Fix name * fix spell * fix description * Fix spell * change to kind * fix lint * fix lint * fix lint * fix lint * fix lint * fix lint * Fix post body * Fix as comments * fix bug * fix bug * fix bug * fix bug * fix bug * fix bug * change rule kind * Fix as comments * Fix as comments * update lastest version * Update type * Update Skiptoken * Fix discription * Fix NG * Fix NG * add more example
Azure · Apr 29, 2021 · 2fb4058 · 2fb4058
1 parent 14cf80e
commit 2fb4058
Show file tree

Hide file tree

Showing 56 changed files with 3,037 additions and 1,012 deletions.
diff --git a/...ft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json b/...ft.Network/preview/2021-02-01-preview/examples/NetworkManagerActiveConfigurationList.json
@@ -4,62 +4,201 @@
     "api-version": "2021-02-01-preview",
     "subscriptionId": "subscriptionA",
     "resourceGroupName": "myResourceGroup",
-    "networkManagerName": "testNetworkManager"
+    "networkManagerName": "testNetworkManager",
+    "parameters": {
+      "regions": [
+        "westus"
+      ],
+      "$skipToken": "fakeSkipTokenCode"
+    }
   },
   "responses": {
     "200": {
       "body": {
         "value": [
           {
-            "configType": "Connectivity",
-            "connectivityConfiguration": {
-              "name": "myTestConnectivityConfig",
+            "region": "westus",
+            "commitTime": "2020-07-10T18:03:22.2578238+05:30",
+            "committedConfiguration": {
+              "kind": "ConnectivityConfiguration",
               "id": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/connectivityConfigurations/myTestConnectivityConfig",
-              "type": "Microsoft.Network/networkManagers/connectivityConfigurations",
               "properties": {
                 "displayName": "myTestConnectivityConfig",
                 "description": "Sample Configuration",
-                "connectivityTopology": "HubAndSpokeTopology",
+                "connectivityTopology": "HubAndSpoke",
                 "hubId": "subscriptions/subscriptionB/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myHubVnet",
-                "deleteExistingPeering": true,
-                "isGlobal": true,
+                "deleteExistingPeering": "True",
+                "isGlobal": "True",
                 "appliesToGroups": [
                   {
                     "networkGroupId": "subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/groups/group1",
-                    "useHubGateway": true,
-                    "groupConnectivity": "Transitive",
-                    "isGlobal": false
+                    "useHubGateway": "True",
+                    "groupConnectivity": "None",
+                    "isGlobal": "True"
                   }
                 ],
                 "provisioningState": "Succeeded"
-              }
-            },
-            "securityAdminRule": null,
-            "securityUserRule": null,
-            "configurationGroups": [
-              {
-                "name": "group1",
-                "id": "/subscriptions/subscriptionA/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/group1",
-                "type": "Microsoft.Network/networkManagers/networkGroups",
-                "properties": {
-                  "displayName": "My Network Group",
-                  "description": "A group for all test Virtual Networks",
-                  "memberType": "VirtualNetwork",
-                  "groupMembers": [
-                    {
-                      "resourceId": "/subscriptions/subscriptionC/resourceGroup/rg1/providers/Microsoft.Network/virtualnetwork/vnet1"
+              },
+              "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",
+              "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"
                     }
-                  ],
-                  "conditionalMembership": "",
-                  "provisioningState": "Succeeded"
+                  }
+                ],
+                "appliesToGroups": [
+                  {
+                    "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"
+                  }
                 }
-              }
-            ],
+              ]
+            }
+          },
+          {
             "region": "westus",
-            "commitTime": "2020-07-10T18:03:22.2578238+05:30"
+            "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",
+              "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"
+                    }
+                  }
+                ],
+                "appliesToGroups": [
+                  {
+                    "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"
+                  }
+                }
+              ]
+            }
           }
         ],
-        "nextLink": "{baseurl}/subscriptions/subscriptionA/resourceGroups/myResourceGroup/providers/Microsoft.Network/networkManagers/testNetworkManager/activeConfigurations?api-version=22021-02-01-preview&$skipToken=10"
+        "$skipToken": "nextFakeSkipToken"
       }
     }
   }

diff --git a/....Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionDelete.json b/....Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionDelete.json
@@ -0,0 +1,14 @@
+{
+  "parameters": {
+    "api-version": "2021-02-01-preview",
+    "subscriptionId": "subId",
+    "resourceGroupName": "rg1",
+    "networkManagerName": "testNetworkManager",
+    "configurationName": "myTestSecurityConfig",
+    "ruleCollectionName": "testRuleCollection"
+  },
+  "responses": {
+    "200": {},
+    "204": {}
+  }
+}
diff --git a/...oft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json b/...oft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionGet.json
@@ -0,0 +1,37 @@
+{
+  "parameters": {
+    "api-version": "2021-02-01-preview",
+    "subscriptionId": "subId",
+    "resourceGroupName": "rg1",
+    "networkManagerName": "testNetworkManager",
+    "ruleCollectionName": "testRuleCollection",
+    "configurationName": "myTestSecurityConfig"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections/testRuleCollection",
+        "name": "testRuleCollection",
+        "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections",
+        "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": {
+          "displayName": "testRuleCollection",
+          "description": "A sample rule collection",
+          "provisioningState": "Succeeded",
+          "appliesToGroups": [
+            {
+              "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/...ft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json b/...ft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleCollectionList.json
@@ -0,0 +1,41 @@
+{
+  "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",
+            "name": "testRuleCollection",
+            "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/RuleCollections",
+            "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": {
+              "displayName": "testRuleCollection",
+              "description": "A sample rule collection",
+              "provisioningState": "Succeeded",
+              "appliesToGroups": [
+                {
+                  "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
+                }
+              ]
+            }
+          }
+        ],
+        "nextLink": "{baseurl}/subscriptions/subId/resourceGroup/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/securityAdminConfigurations/myTestSecurityConfig/ruleCollections?api-version=2021-02-01-preview&$skipToken=10"
+      }
+    }
+  }
+}
diff --git a/...tworkManagerSecurityConfigurationPut.json → ...NetworkManagerAdminRuleCollectionPut.json b/...tworkManagerSecurityConfigurationPut.json → ...NetworkManagerAdminRuleCollectionPut.json
@@ -5,11 +5,10 @@
     "resourceGroupName": "rg1",
     "configurationName": "myTestSecurityConfig",
     "networkManagerName": "testNetworkManager",
-    "securityConfiguration": {
+    "ruleCollectionName": "testRuleCollection",
+    "ruleCollection": {
       "properties": {
         "description": "A sample policy",
-        "securityType": "UserPolicy",
-        "deleteExistingNSGs": true,
         "appliesToGroups": [
           {
             "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
@@ -21,9 +20,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/ruleCollections/testRuleCollection",
         "name": "myTestSecurityConfig",
-        "type": "Microsoft.Network/networkManagers/securityConfigurations",
+        "type": "Microsoft.Network/networkManagers/securityAdminConfigurations/ruleCollections",
         "systemData": {
           "createdBy": "b69a9388-9488-4534-b470-7ec6d41beef5",
           "createdByType": "User",
@@ -36,8 +35,6 @@
           "displayName": "myTestSecurityConfig",
           "description": "A sample policy",
           "provisioningState": "Succeeded",
-          "securityType": "UserPolicy",
-          "deleteExistingNSGs": true,
           "appliesToGroups": [
             {
               "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"
@@ -63,8 +60,6 @@
           "displayName": "myTestSecurityConfig",
           "description": "A sample policy",
           "provisioningState": "Succeeded",
-          "securityType": "UserPolicy",
-          "deleteExistingNSGs": true,
           "appliesToGroups": [
             {
               "networkGroupId": "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testNetworkManager/networkGroups/testGroup"

diff --git a/.../Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleDelete.json b/.../Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerAdminRuleDelete.json
@@ -5,6 +5,7 @@
     "resourceGroupName": "rg1",
     "configurationName": "myTestSecurityConfig",
     "networkManagerName": "testNetworkManager",
+    "ruleCollectionName": "testRuleCollection",
     "ruleName": "SampleAdminRule"
   },
   "responses": {