{NetworkManager}Add new commands (#4413)

* {NetworkManager}Add new commands

Add new commands 'az network manager connection', 'az network manager connection management-group', 'az network manager scope connection', 'az network manager group static-members'

* Update _help.py

* Update _params.py

Bump up azure-mamt-network SDK to 2021_05_01_preview and Update  params and commands.

* Update

* Update

* Update

* Update

* Update

* Update

* update tests for new api version 2021-05-01-preview for network-manager extension

* Update

* Update

* Update custom.py

* Update

* Update

Co-authored-by: Jared Gorthy <jaredgorthy@microsoft.com>

src/network-manager/HISTORY.rst

@@ -3,6 +3,16 @@
 Release History
 ===============
 
+0.4.0
++++++
+* Add new cmd `az network manager connection`
+* Add new cmd `az network manager connection management-group`
+* Add new cmd `az network manager scope connection`
+* Add new cmd `az network manager group static-member`
+* `az network manager group delete`: add parameter `force`
+* `az network manager security-admin-config delete`: add parameter `force` and add parameter `recursive`
+* Bump up azure-mgmt-network SDK to 2021_05_01_preview
+
 0.3.0
 +++++
 * `az network manager list-active-connectivity-config`: rename parameter `region` to `regions`

src/network-manager/azext_network_manager/_client_factory.py

@@ -15,14 +15,6 @@ def cf_network_cl(cli_ctx, *_):
     return get_mgmt_service_client(cli_ctx, NetworkManagementClient)
 
 
-def cf_activeconnectivityconfiguration(cli_ctx, *_):
-    return cf_network_cl(cli_ctx).active_connectivity_configurations
-
-
-def cf_activesecurityadminrule(cli_ctx, *_):
-    return cf_network_cl(cli_ctx).active_security_admin_rules
-
-
 def cf_activesecurityuserrule(cli_ctx, *_):
     return cf_network_cl(cli_ctx).active_security_user_rules
 
@@ -39,14 +31,18 @@ def cf_connectivityconfiguration(cli_ctx, *_):
     return cf_network_cl(cli_ctx).connectivity_configurations
 
 
-def cf_effectiveconnectivityconfiguration(cli_ctx, *_):
-    return cf_network_cl(cli_ctx).effective_connectivity_configurations
+def cf_listeffectivevirtualnetwork(cli_ctx, *_):
+    return cf_network_cl(cli_ctx).list_effective_virtual_networks
 
 
 def cf_effectivevirtualnetwork(cli_ctx, *_):
     return cf_network_cl(cli_ctx).effective_virtual_networks
 
 
+def cf_networkmanagementclient(cli_ctx, *_):
+    return cf_network_cl(cli_ctx)
+
+
 def cf_networkgroup(cli_ctx, *_):
     return cf_network_cl(cli_ctx).network_groups
 
@@ -59,10 +55,6 @@ def cf_networkmanagerdeploymentstatus(cli_ctx, *_):
     return cf_network_cl(cli_ctx).network_manager_deployment_status
 
 
-def cf_effectivesecurityadminrule(cli_ctx, *_):
-    return cf_network_cl(cli_ctx).network_manager_effective_security_admin_rules
-
-
 def cf_networkmanager(cli_ctx, *_):
     return cf_network_cl(cli_ctx).network_managers
 
@@ -81,3 +73,19 @@ def cf_userrulecollection(cli_ctx, *_):
 
 def cf_userrule(cli_ctx, *_):
     return cf_network_cl(cli_ctx).user_rules
+
+
+def cf_scopeconnection(cli_ctx, *_):
+    return cf_network_cl(cli_ctx).scope_connections
+
+
+def cf_staticmembers(cli_ctx, *_):
+    return cf_network_cl(cli_ctx).static_members
+
+
+def cf_subscriptionconnection(cli_ctx, *_):
+    return cf_network_cl(cli_ctx).subscription_network_manager_connections
+
+
+def cf_managementgroupconnection(cli_ctx, *_):
+    return cf_network_cl(cli_ctx).management_group_network_manager_connections

src/network-manager/azext_network_manager/_help.py

@@ -322,7 +322,7 @@
       - name: Delete Azure Virtual Network Manager Group
         text: |-
                az network manager group delete --name "TestNetworkGroup" --network-manager-name "testNetworkManager" \
---resource-group "rg1"
+--resource-group "rg1" --force
 """
 
 helps['network manager group list-effect-vnet'] = """
@@ -436,7 +436,7 @@
       - name: Delete network manager security admin Configuration
         text: |-
                az network manager security-admin-config delete --configuration-name "myTestSecurityConfig" \
---network-manager-name "testNetworkManager" --resource-group "rg1"
+--network-manager-name "testNetworkManager" --resource-group "rg1" --force
 """
 
 helps['network manager security-admin-config rule-collection'] = """
@@ -740,3 +740,227 @@
                az network manager security-user-config rule-collection rule delete --configuration-name "myTestSecurityConfig" --network-manager-name \
 "testNetworkManager" --resource-group "rg1" --rule-collection-name "myTestCollection" --rule-name "SampleUserRule"
 """
+
+helps['network manager connection subscription'] = """
+    type: group
+    short-summary: Manage subscription-group connection with network
+"""
+
+helps['network manager connection subscription list'] = """
+    type: command
+    short-summary: "List all network manager connections created by this subscription."
+    examples:
+      - name: List network manager connections in a network manager
+        text: |-
+               az network manager connection subscription list
+"""
+
+helps['network manager connection subscription show'] = """
+    type: command
+    short-summary: "Get a specified connection created by this subscription."
+    examples:
+      - name: Get network manager connection
+        text: |-
+               az network manager connection subscription show --connection-name "testNetworkManagerConnection"
+"""
+
+helps['network manager connection subscription create'] = """
+    type: command
+    short-summary: "Create a connection from this subscription to a cross tenant network manager."
+    examples:
+      - name: Create network manager connection
+        text: |-
+               az network manager connection subscription create --connection-name "testNetworkManagerConnection" \
+--description "A sample policy" --network-manager-id /subscriptions/00000000-0000-0000-0000-000000000000\
+/resourceGroups/rg1/providers/Microsoft.Network/networkManagers/testManagerName
+"""
+
+helps['network manager connection subscription update'] = """
+    type: command
+    short-summary: "Update a connection from this subscription to a cross tenant network manager."
+    examples:
+      - name: Update network manager connection
+        text: |-
+               az network manager connection subscription update --connection-name "testNetworkManagerConnection" \
+--description "A sample policy"
+"""
+
+helps['network manager connection subscription delete'] = """
+    type: command
+    short-summary: "Deletes a network manager connection."
+    examples:
+      - name: Delete network manager connection
+        text: |-
+               az network manager connection subscription delete --connection-name "testNetworkManagerConnection"
+"""
+
+helps['network manager connection'] = """
+    type: group
+    short-summary: Manage connection with network manager
+"""
+
+# helps['network manager connection management-group'] = """
+#     type: group
+#     short-summary: Manage management-group connection with network
+# """
+#
+# helps['network manager connection management-group list'] = """
+#     type: command
+#     short-summary: "List all network manager connections created by this management group."
+#     examples:
+#       - name: List management-group connections in a network manager
+#         text: |-
+#                az network manager connection management-group list --management-group-id "testManagementGroupId" \
+# --resource-group "rg1"
+# """
+#
+# helps['network manager connection management-group show'] = """
+#     type: command
+#     short-summary: "Get a specified connection created by this management group."
+#     examples:
+#       - name: Get network manager connection management-group
+#         text: |-
+#                az network manager connection management-group show --management-group-id "testManagementGroupId" \
+# --connection-name "testNetworkManagerConnection" --resource-group "rg1"
+# """
+#
+# helps['network manager connection management-group create'] = """
+#     type: command
+#     short-summary: Create a connection to a cross tenant network manager"
+#     examples:
+#       - name: Create network manager connection management-group
+#         text: |-
+#                az network manager connection management-group create --management-group-id "testManagementGroupId" \
+# --connection-name "testNetworkManagerConnection" --resource-group "rg1" --network-manager "testNetworkManagerId" \
+# --description "A sample policy"
+# """
+#
+# helps['network manager connection management-group update'] = """
+#     type: command
+#     short-summary: "Update a connection to a cross tenant network manager"
+# """
+#
+# helps['network manager connection management-group delete'] = """
+#     type: command
+#     short-summary: "Delete specified pending connection created by this management group."
+#     examples:
+#       - name: Delete network manager connection management-group
+#         text: |-
+#                az network manager connection management-group delete --management-group-id "testManagementGroupId" \
+# --connection-name "testNetworkManagerConnection" --resource-group "rg1"
+# """
+
+helps['network manager scope-connection'] = """
+    type: group
+    short-summary: Manage scope connection with network
+"""
+
+helps['network manager scope-connection list'] = """
+    type: command
+    short-summary: "List all scope connections created by this network manager."
+    examples:
+      - name: List scope connections in a network manager
+        text: |-
+               az network manager scope-connection list --network-manager-name "testNetworkManager" --resource-group \
+"rg1"
+"""
+
+helps['network manager scope-connection show'] = """
+    type: command
+    short-summary: "Get specified scope connection created by this Network Manager."
+    examples:
+      - name: Get network manager scope-connection
+        text: |-
+               az network manager scope-connection show --name "TestScopeConnect" \
+--network-manager-name "testNetworkManager" --resource-group "rg1"
+"""
+
+helps['network manager scope-connection create'] = """
+    type: command
+    short-summary: "Creates scope connection from Network Manager."
+    examples:
+      - name: Create network manager scope-connection
+        text: |-
+               az network manager scope-connection create --name "TestScopeConnect" \
+--network-manager-name "testNetworkManager" --resource-group "rg1" --description "A sample policy" \
+--tenant-id 00000000-0000-0000-0000-000000000000 --resource-id /subscriptions/00000000-0000-0000-0000-000000000000
+"""
+
+helps['network manager scope-connection update'] = """
+    type: command
+    short-summary: "Update scope connection from Network Manager."
+    examples:
+      - name: Update network manager scope-connection
+        text: |-
+               az network manager scope-connection update --name "TestScopeConnect" \
+--network-manager-name "testNetworkManager" --resource-group "rg1" --description "A sample policy"
+"""
+
+helps['network manager scope-connection delete'] = """
+    type: command
+    short-summary: "Delete the pending scope connection created by this network manager."
+    examples:
+      - name: Delete network manager scope connection
+        text: |-
+               az network manager scope-connection delete --name "TestScopeConnect" \
+--network-manager-name "testNetworkManager" --resource-group "rg1"
+"""
+
+helps['network manager group static-member'] = """
+    type: group
+    short-summary: Manage static members with network
+"""
+
+helps['network manager group static-member list'] = """
+    type: command
+    short-summary: "Lists the specified static member."
+    examples:
+      - name: List static member in a network manager
+        text: |-
+               az network manager group static-member list --network-manager-name "testNetworkManager" \
+--resource-group "rg1" --network-group-name "testNetworkManagerGroup"
+"""
+
+helps['network manager group static-member show'] = """
+    type: command
+    short-summary: "Gets the specified static member."
+    examples:
+      - name: Get network manager group static-member
+        text: |-
+               az network manager group static-member show --network-group-name "testNetworkManagerGroup" \
+--network-manager-name "testNetworkManager" --resource-group "rg1" --static-member-name "testStaticMember"
+"""
+
+helps['network manager group static-member create'] = """
+    type: command
+    short-summary: "Creates a static member."
+    examples:
+      - name: Create network manager security admin Configuration
+        text: |-
+               az network manager group static-member create --network-group-name "testNetworkManagerGroup" \
+--network-manager-name "testNetworkManager" --resource-group "rg1" --static-member-name "testStaticMember" \
+--resource-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/ \
+Microsoft.Network/virtualnetworks/virtual_network"
+"""
+
+helps['network manager group static-member update'] = """
+    type: command
+    short-summary: "Update a static member."
+    examples:
+      - name: Update network manager security admin Configuration
+        text: |-
+               az network manager group static-member update --network-group-name "testNetworkManagerGroup" \
+--network-manager-name "testNetworkManager" --resource-group "rg1" --static-member-name "testStaticMember" \
+--resource-id="/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/ \
+Microsoft.Network/virtualnetworks/virtual_network"
+"""
+
+helps['network manager group static-member delete'] = """
+    type: command
+    short-summary: "Deletes a static member."
+    examples:
+      - name: Delete network manager group static-member
+        text: |-
+               az network manager group static-member delete --network-group-name "testNetworkManagerGroup" \
+--network-manager-name "testNetworkManager" --resource-group "rg1" --static-member-name "testStaticMember"
+"""