[Network Manager] Fix multi issues on network-manager

src/network-manager/azext_network_manager/_help.py

@@ -369,7 +369,7 @@
         text: |-
                az network manager security-user-config create --configuration-name "myTestSecurityConfig" \
 --network-manager-name "testNetworkManager" --resource-group "rg1" --description "A sample policy" \
---delete-existing-ns-gs true --security-type "UserPolicy"
+--delete-existing-ns-gs true
 """
 
 helps['network manager security-user-config update'] = """
@@ -421,7 +421,7 @@
         text: |-
                az network manager security-admin-config create --configuration-name "myTestSecurityConfig" \
 --network-manager-name "testNetworkManager" --resource-group "rg1" --description "A sample policy" \
---delete-existing-ns-gs true --security-type "AdminPolicy"
+--delete-existing-ns-gs true
 """
 
 helps['network manager security-admin-config update'] = """
@@ -452,7 +452,7 @@
         text: |-
                az network manager security-admin-config rule-collection create --configuration-name "myTestSecurityConfig" --network-manager-name "testNetworkManager"  -g "rg1" \
 --rule-collection-name "myTestCollection" --description "A sample description" --display-name "ASampleCollection" \
---applies-to-groups  network-group-id="sub_id/resourceGroups/rgid/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup"
+--applies-to-groups  network-group-id="/subscriptions/sub_id/resourceGroups/rgid/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup"
 """
 
 helps['network manager security-admin-config rule-collection list'] = """
@@ -603,7 +603,7 @@
         text: |-
                az network manager security-user-config rule-collection create --configuration-name "myTestSecurityConfig" --network-manager-name "testNetworkManager"  -g "rg1" \
 --rule-collection-name myTestCollection --description "A sample description" --display-name "ASampleCollection" \
---applies-to-groups  network-group-id=sub_id/resourceGroups/rgid/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup
+--applies-to-groups  network-group-id=/subscriptions/sub_id/resourceGroups/rgid/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup
 """
 
 helps['network manager security-user-config rule-collection list'] = """

src/network-manager/azext_network_manager/_params.py

@@ -154,7 +154,7 @@ def load_arguments(self, _):
         c.argument('skip_token', type=str, help='SkipToken is only used if a previous operation returned a partial '
                    'result. If a previous response contains a nextLink element, the value of the nextLink element will '
                    'include a skipToken parameter that specifies a starting point to use for subsequent calls.')
-        c.argument('region', type=str, help='Location name')
+        c.argument('regions', type=str, nargs='+', help='Location names')
 
     with self.argument_context('network manager connect-config list') as c:
         c.argument('resource_group_name', resource_group_name_type)

src/network-manager/azext_network_manager/custom.py

@@ -99,7 +99,7 @@ def network_manager_commit_post(cmd,
                                 client,
                                 resource_group_name,
                                 network_manager_name,
-                                target_locations=None,
+                                target_locations,
                                 configuration_ids=None,
                                 commit_type=None):
     client = cf_networkmanagercommit(cmd.cli_ctx)
@@ -167,11 +167,11 @@ def network_manager_active_config_list(cmd,
                                        resource_group_name,
                                        network_manager_name,
                                        skip_token=None,
-                                       region=None):
+                                       regions=None):
     client = cf_activeconnectivityconfiguration(cmd.cli_ctx)
     parameters = {}
     parameters['skip_token'] = skip_token
-    parameters['region'] = region
+    parameters['regions'] = regions
     return client.list(resource_group_name=resource_group_name,
                        network_manager_name=network_manager_name,
                        parameters=parameters)
@@ -429,12 +429,10 @@ def network_manager_security_user_config_create(client,
                                                 configuration_name,
                                                 display_name=None,
                                                 description=None,
-                                                security_type=None,
                                                 delete_existing_ns_gs=None):
     security_configuration = {}
     security_configuration['display_name'] = display_name
     security_configuration['description'] = description
-    security_configuration['security_type'] = security_type
     security_configuration['delete_existing_ns_gs'] = delete_existing_ns_gs
     return client.create_or_update(resource_group_name=resource_group_name,
                                    network_manager_name=network_manager_name,
@@ -496,12 +494,10 @@ def network_manager_security_admin_config_create(client,
                                                  configuration_name,
                                                  display_name=None,
                                                  description=None,
-                                                 security_type=None,
                                                  delete_existing_ns_gs=None):
     security_configuration = {}
     security_configuration['display_name'] = display_name
     security_configuration['description'] = description
-    security_configuration['security_type'] = security_type
     security_configuration['delete_existing_ns_gs'] = delete_existing_ns_gs
     return client.create_or_update(resource_group_name=resource_group_name,
                                    network_manager_name=network_manager_name,
@@ -515,14 +511,11 @@ def network_manager_security_admin_config_update(instance,
                                                  configuration_name,
                                                  display_name=None,
                                                  description=None,
-                                                 security_type=None,
                                                  delete_existing_ns_gs=None):
     if display_name is not None:
         instance.display_name = display_name
     if description is not None:
         instance.description = description
-    if security_type is not None:
-        instance.security_type = security_type
     if delete_existing_ns_gs is not None:
         instance.delete_existing_ns_gs = delete_existing_ns_gs
     return instance

src/network-manager/azext_network_manager/tests/latest/recordings/test_network_manager_list_queries.yaml

@@ -27,7 +27,7 @@ interactions:
   response:
     body:
       string: '{"name":"TestNetworkManager","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_list_queries000001/providers/Microsoft.Network/networkManagers/TestNetworkManager","location":"eastus2euap","type":"Microsoft.Network/networkManagers","tags":{},"etag":"","properties":{"displayName":"TestNetworkManager","description":"My
-        Test Network Manager","networkManagerScopes":{"managementGroups":[],"subscriptions":["/subscriptions/00000000-0000-0000-0000-000000000000"]},"provisioningState":"Succeeded","networkManagerScopeAccesses":["SecurityAdmin","Connectivity"],"resourceGuid":"8a78a66b-adc5-418b-b546-24e9de8d9fd2"},"systemData":{"createdBy":"v-kaisun@microsoft.com","createdByType":"User","createdAt":"2021-11-02T08:59:10.8978081Z","lastModifiedBy":"v-kaisun@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2021-11-02T08:59:10.8978081Z"}}'
+        Test Network Manager","networkManagerScopes":{"managementGroups":[],"subscriptions":["/subscriptions/00000000-0000-0000-0000-000000000000"]},"provisioningState":"Succeeded","networkManagerScopeAccesses":["SecurityAdmin","Connectivity"],"resourceGuid":"66947698-fce5-4b19-a5c3-020c12ffb383"},"systemData":{"createdBy":"v-kaisun@microsoft.com","createdByType":"User","createdAt":"2021-11-23T09:31:19.7844891Z","lastModifiedBy":"v-kaisun@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2021-11-23T09:31:19.7844891Z"}}'
     headers:
       cache-control:
       - no-cache
@@ -36,7 +36,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 02 Nov 2021 08:59:15 GMT
+      - Tue, 23 Nov 2021 09:31:34 GMT
       expires:
       - '-1'
       pragma:
@@ -52,7 +52,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-ms-ratelimit-remaining-subscription-writes:
-      - '1198'
+      - '1199'
     status:
       code: 200
       message: OK
@@ -84,7 +84,7 @@ interactions:
   response:
     body:
       string: '{"name":"TestNetworkGroup","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_list_queries000001/providers/Microsoft.Network/networkManagers/TestNetworkManager/networkGroups/TestNetworkGroup","type":"Microsoft.Network/networkManagers/networkGroups","etag":"","properties":{"displayName":"ASampleGroup","description":"A
-        sample policy","groupMembers":[{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_list_queries000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"conditionalMembership":"","provisioningState":"Succeeded","resourceGuid":"73729d64-1486-4c08-920f-9ac723cf6027"},"systemData":{"createdBy":"v-kaisun@microsoft.com","createdByType":"User","createdAt":"2021-11-02T08:59:18.3222537Z","lastModifiedBy":"v-kaisun@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2021-11-02T08:59:18.3222537Z"}}'
+        sample policy","groupMembers":[{"resourceId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_network_manager_list_queries000001/providers/Microsoft.Network/virtualnetworks/clitest.vn000002"}],"conditionalMembership":"","provisioningState":"Succeeded","resourceGuid":"e431d73e-eca0-41db-a801-fec1974e46a5"},"systemData":{"createdBy":"v-kaisun@microsoft.com","createdByType":"User","createdAt":"2021-11-23T09:31:35.8326688Z","lastModifiedBy":"v-kaisun@microsoft.com","lastModifiedByType":"User","lastModifiedAt":"2021-11-23T09:31:35.8326688Z"}}'
     headers:
       cache-control:
       - no-cache
@@ -93,7 +93,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 02 Nov 2021 08:59:19 GMT
+      - Tue, 23 Nov 2021 09:31:38 GMT
       expires:
       - '-1'
       pragma:
@@ -109,7 +109,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-ms-ratelimit-remaining-subscription-writes:
-      - '1197'
+      - '1199'
     status:
       code: 200
       message: OK
@@ -145,7 +145,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 02 Nov 2021 08:59:23 GMT
+      - Tue, 23 Nov 2021 09:31:39 GMT
       expires:
       - '-1'
       pragma:
@@ -197,7 +197,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 02 Nov 2021 08:59:29 GMT
+      - Tue, 23 Nov 2021 09:31:43 GMT
       expires:
       - '-1'
       pragma:
@@ -213,7 +213,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-ms-ratelimit-remaining-subscription-writes:
-      - '1199'
+      - '1198'
     status:
       code: 200
       message: OK
@@ -249,7 +249,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 02 Nov 2021 08:59:35 GMT
+      - Tue, 23 Nov 2021 09:31:46 GMT
       expires:
       - '-1'
       pragma:
@@ -270,22 +270,22 @@ interactions:
       code: 200
       message: OK
 - request:
-    body: '{}'
+    body: '{"regions": ["eastus", "westus"]}'
     headers:
       Accept:
       - application/json
       Accept-Encoding:
       - gzip, deflate
       CommandName:
-      - network manager list-active-config
+      - network manager list-active-connectivity-config
       Connection:
       - keep-alive
       Content-Length:
-      - '2'
+      - '33'
       Content-Type:
       - application/json
       ParameterSetName:
-      - --network-manager-name --resource-group
+      - --network-manager-name --resource-group --regions
       User-Agent:
       - AZURECLI/2.30.0 azsdk-python-mgmt-network/1.0.0b1 Python/3.8.3 (Windows-10-10.0.18362-SP0)
     method: POST
@@ -301,7 +301,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 02 Nov 2021 08:59:41 GMT
+      - Tue, 23 Nov 2021 09:31:50 GMT
       expires:
       - '-1'
       pragma:
@@ -329,7 +329,7 @@ interactions:
       Accept-Encoding:
       - gzip, deflate
       CommandName:
-      - network manager list-effective-config
+      - network manager list-effective-connectivity-config
       Connection:
       - keep-alive
       Content-Length:
@@ -353,7 +353,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 02 Nov 2021 08:59:44 GMT
+      - Tue, 23 Nov 2021 09:31:54 GMT
       expires:
       - '-1'
       pragma:
@@ -369,7 +369,7 @@ interactions:
       x-content-type-options:
       - nosniff
       x-ms-ratelimit-remaining-subscription-writes:
-      - '1198'
+      - '1199'
     status:
       code: 200
       message: OK
@@ -405,7 +405,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 02 Nov 2021 08:59:48 GMT
+      - Tue, 23 Nov 2021 09:31:58 GMT
       expires:
       - '-1'
       pragma:
@@ -457,7 +457,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Tue, 02 Nov 2021 08:59:52 GMT
+      - Tue, 23 Nov 2021 09:32:02 GMT
       expires:
       - '-1'
       pragma:

src/network-manager/azext_network_manager/tests/latest/test_network_scenario.py

@@ -100,7 +100,7 @@ def test_network_manager_security_user_config_crud(self, resource_group):
                  '--resource-group {rg}')
 
         self.cmd('network manager security-user-config create --configuration-name {name} --network-manager-name {manager_name} -g {rg} '
-                 '--description {description} --delete-existing-ns-gs true --security-type "UserPolicy" --display-name MyTestConfig')
+                 '--description {description} --delete-existing-ns-gs true --display-name MyTestConfig')
 
         self.cmd('network manager security-user-config update --configuration-name {name} --network-manager-name {manager_name} -g {rg} '
                  '--description "test_description"')
@@ -126,7 +126,7 @@ def test_network_manager_security_admin_config_crud(self, resource_group):
                  '--resource-group {rg}')
 
         self.cmd('network manager security-admin-config create --configuration-name {name} --network-manager-name {manager_name} -g {rg} '
-                 '--description {description} --delete-existing-ns-gs true --security-type "AdminPolicy" --display-name MyTestConfig')
+                 '--description {description} --delete-existing-ns-gs true --display-name MyTestConfig')
 
         self.cmd('network manager security-admin-config update --configuration-name {name} --network-manager-name {manager_name} -g {rg} '
                  '--description "test_description"')
@@ -171,7 +171,7 @@ def test_network_manager_admin_rule_crud(self, virtual_network, resource_group):
                  '--group-members resource-id="{sub}/resourceGroups/{rg}/providers/Microsoft.Network/virtualnetworks/{virtual_network}" ')
 
         self.cmd('network manager security-admin-config create --configuration-name {config_name} --network-manager-name {manager_name} -g {rg} '
-                 '--description {description} --delete-existing-ns-gs true --security-type "AdminPolicy" --display-name MyTestConfig')
+                 '--description {description} --delete-existing-ns-gs true --display-name MyTestConfig')
 
         self.cmd('network manager security-admin-config rule-collection create --configuration-name {config_name} --network-manager-name {manager_name} -g {rg} '
                  '--rule-collection-name {collection_name} --description {description} --display-name ASampleCollection '
@@ -213,7 +213,7 @@ def test_network_manager_admin_rule_collection_crud(self, virtual_network, resou
                  '--group-members resource-id="{sub}/resourceGroups/{rg}/providers/Microsoft.Network/virtualnetworks/{virtual_network}" ')
 
         self.cmd('network manager security-admin-config create --configuration-name {config_name} --network-manager-name {manager_name} -g {rg} '
-                 '--description {description} --delete-existing-ns-gs true --security-type "AdminPolicy" --display-name MyTestConfig')
+                 '--description {description} --delete-existing-ns-gs true --display-name MyTestConfig')
 
         self.cmd('network manager security-admin-config rule-collection create --configuration-name {config_name} --network-manager-name {manager_name} -g {rg} '
                  '--rule-collection-name {collection_name} --description {description} --display-name ASampleCollection '
@@ -257,7 +257,7 @@ def test_network_manager_user_rule_crud(self, virtual_network, resource_group):
                  '--group-members resource-id="{sub}/resourceGroups/{rg}/providers/Microsoft.Network/virtualnetworks/{virtual_network}" ')
 
         self.cmd('network manager security-user-config create --configuration-name {config_name} --network-manager-name {manager_name} -g {rg} '
-                 '--description {description} --delete-existing-ns-gs true --security-type "UserPolicy" --display-name MyTestConfig')
+                 '--description {description} --delete-existing-ns-gs true --display-name MyTestConfig')
 
         self.cmd('network manager security-user-config rule-collection create --configuration-name {config_name} --network-manager-name {manager_name} -g {rg} '
                  '--rule-collection-name {collection_name} --description {description} --display-name ASampleCollection '
@@ -297,7 +297,7 @@ def test_network_manager_user_rule_collection_crud(self, virtual_network, resour
                  '--group-members resource-id="{sub}/resourceGroups/{rg}/providers/Microsoft.Network/virtualnetworks/{virtual_network}" ')
 
         self.cmd('network manager security-user-config create --configuration-name {config_name} --network-manager-name {manager_name} -g {rg} '
-                 '--description {description} --delete-existing-ns-gs true --security-type "UserPolicy" --display-name MyTestConfig')
+                 '--description {description} --delete-existing-ns-gs true --display-name MyTestConfig')
 
         self.cmd('network manager security-user-config rule-collection create --configuration-name {config_name} --network-manager-name {manager_name} -g {rg} '
                  '--rule-collection-name {collection_name} --description {description} --display-name ASampleCollection '
@@ -370,9 +370,8 @@ def test_network_manager_list_queries(self, virtual_network, resource_group):
 
         self.cmd('network manager list-deploy-status --network-manager-name {manager_name} --deployment-types "Connectivity" --regions "eastus2euap" --resource-group {rg}')
         self.cmd('network manager group list-effect-vnet --network-group-name {group_name} --network-manager-name {manager_name} --resource-group {rg}')
-        # Internal Server Error
         self.cmd('network manager list-effect-vnet --network-manager-name {manager_name} --resource-group {rg}')
-        self.cmd('network manager list-active-connectivity-config --network-manager-name {manager_name} --resource-group {rg}')
+        self.cmd('network manager list-active-connectivity-config --network-manager-name {manager_name} --resource-group {rg} --regions eastus westus')
         self.cmd('network manager list-effective-connectivity-config --virtual-network-name {virtual_network} -g {rg}')
         self.cmd('network manager list-effective-security-admin-rule --virtual-network-name {virtual_network} -g {rg}')
         self.cmd('network manager list-active-security-admin-rule --network-manager-name {manager_name} -g {rg} --regions eastus2euap')