{virtual-network-tap} Migrate to AAZ Codegen (#8203)

* vnet tap codegen

* vtap-config codegen + custom

* remove unused

* update version

* fix style

* fix style

* update release note

Author: cxznmhdcxz

src/virtual-network-tap/HISTORY.rst

@@ -3,6 +3,12 @@
 Release History
 ===============
 
+1.0.0b2
++++++
+* Migrate to AAZ
+* Add confirmation prompt for network vnet tap delete
+* Add confirmation prompt for network nic vtap-config delete
+
 1.0.0b1
 +++++
 * Replace msrestazure with azure.core

src/virtual-network-tap/azext_vnettap/__init__.py

@@ -4,7 +4,6 @@
 # --------------------------------------------------------------------------------------------
 
 from azure.cli.core import AzCommandsLoader
-from azure.cli.core.profiles import register_resource_type
 
 import azext_vnettap._help  # pylint: disable=unused-import
 
@@ -13,17 +12,24 @@ class VirtualNetworkTapCommandsLoader(AzCommandsLoader):
 
     def __init__(self, cli_ctx=None):
         from azure.cli.core.commands import CliCommandType
-        from .profiles import CUSTOM_VNET_TAP
-        register_resource_type('latest', CUSTOM_VNET_TAP, '2018-08-01')
-
-        super(VirtualNetworkTapCommandsLoader, self).__init__(
-            cli_ctx=cli_ctx,
-            custom_command_type=CliCommandType(operations_tmpl='azext_vnettap.custom#{}'),
-            resource_type=CUSTOM_VNET_TAP
+        vtap_custom = CliCommandType(
+            operations_tmpl='azext_vnettap.custom#{}'
         )
+        super().__init__(cli_ctx=cli_ctx, custom_command_type=vtap_custom)
 
     def load_command_table(self, args):
         from .commands import load_command_table
+        from azure.cli.core.aaz import load_aaz_command_table
+        try:
+            from . import aaz
+        except ImportError:
+            aaz = None
+        if aaz:
+            load_aaz_command_table(
+                loader=self,
+                aaz_pkg_name=aaz.__name__,
+                args=args
+            )
         load_command_table(self, args)
         return self.command_table
 

src/virtual-network-tap/azext_vnettap/_client_factory.py

@@ -3,60 +3,4 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from knack.help_files import helps
-
-
-helps['network vnet tap'] = """
-    type: group
-    short-summary: Manage virtual network taps.
-"""
-
-helps['network vnet tap create'] = """
-    type: command
-    short-summary: Create a virtual network tap.
-"""
-
-helps['network vnet tap list'] = """
-    type: command
-    short-summary: List virtual network taps.
-"""
-
-helps['network vnet tap show'] = """
-    type: command
-    short-summary: Get the details of a virtual network tap.
-"""
-
-helps['network vnet tap update'] = """
-    type: command
-    short-summary: Update settings of a virtual network tap.
-"""
-
-helps['network vnet tap delete'] = """
-    type: command
-    short-summary: Delete a virtual network tap.
-"""
-
-helps['network nic vtap-config'] = """
-    type: group
-    short-summary: Manage virtual network tap configurations.
-"""
-
-helps['network nic vtap-config create'] = """
-    type: command
-    short-summary: Create a virtual network tap configuration.
-"""
-
-helps['network nic vtap-config delete'] = """
-    type: command
-    short-summary: Delete a virtual network tap configuration.
-"""
-
-helps['network nic vtap-config list'] = """
-    type: command
-    short-summary: List virtual network tap configurations.
-"""
-
-helps['network nic vtap-config show'] = """
-    type: command
-    short-summary: Get details of a virtual network tap configuration.
-"""
+from knack.help_files import helps  # pylint: disable=unused-import

src/virtual-network-tap/azext_vnettap/_help.py

@@ -3,35 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-# pylint: disable=line-too-long
-from knack.arguments import CLIArgumentType
 
-from azure.cli.core.commands.parameters import (
-    get_resource_name_completion_list, tags_type)
-from azure.cli.core.commands.validators import get_default_location_from_resource_group
-
-from ._validators import validate_vnet_tap
-
-
-# pylint: disable=too-many-locals, too-many-branches, too-many-statements
-def load_arguments(self, _):
-
-    tap_name_arg_type = CLIArgumentType(options_list='--tap-name', metavar='NAME', help='Name of the VNet TAP.', id_part='name', completer=get_resource_name_completion_list('Microsoft.Network/virtualNetworkTaps'))
-
-    with self.argument_context('network vnet tap') as c:
-        c.argument('tap_name', tap_name_arg_type, options_list=['--name', '-n'])
-        c.argument('tags', tags_type)
-        c.argument('location', validator=get_default_location_from_resource_group)
-
-    with self.argument_context('network vnet tap create', arg_group='Destination') as c:
-        c.argument('destination', help='ID of the ILB or NIC IP configuration to receive the tap.')
-        c.argument('port', help='The VXLAN port that will receive the tapped traffic.')
-
-    with self.argument_context('network nic vtap-config') as c:
-        c.argument('network_interface_name', options_list='--nic-name', help='Name of the network interface (NIC).', id_part='name')
-        c.argument('vnet_tap', help='Name or ID of the virtual network tap.', validator=validate_vnet_tap)
-        for dest in ['vtap_config_name', 'tap_configuration_name']:
-            c.argument(dest, options_list=['--name', '-n'], help='Name of the virtual network tap configuration.', id_part='child_name_1')
-
-    with self.argument_context('network nic vtap-config list') as c:
-        c.argument('network_interface_name', options_list='--nic-name', help='Name of the network interface (NIC).', id_part=None)
+def load_arguments(self, _):  # pylint: disable=unused-argument
+    pass

src/virtual-network-tap/azext_vnettap/_params.py

@@ -1,7 +1,6 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
+# --------------------------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
-from .v2018_08_01.models import *
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------

src/virtual-network-tap/azext_vnettap/_validators.py

@@ -1,8 +1,10 @@
 # --------------------------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
 # --------------------------------------------------------------------------------------------
 
-from azure.cli.core.profiles import CustomResourceType
+# pylint: skip-file
+# flake8: noqa
 
-CUSTOM_VNET_TAP = CustomResourceType('azext_vnettap.vendored_sdks', 'NetworkManagementClient')

…ap/azext_vnettap/vendored_sdks/models.py …etwork-tap/azext_vnettap/aaz/__init__.pysrc/virtual-network-tap/azext_vnettap/vendored_sdks/models.py renamed to src/virtual-network-tap/azext_vnettap/aaz/__init__.py src/virtual-network-tap/azext_vnettap/vendored_sdks/models.py renamed to src/virtual-network-tap/azext_vnettap/aaz/__init__.py

@@ -0,0 +1,23 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
+
+# pylint: skip-file
+# flake8: noqa
+
+from azure.cli.core.aaz import *
+
+
+@register_command_group(
+    "network",
+)
+class __CMDGroup(AAZCommandGroup):
+    """Manage Azure Network resources.
+    """
+    pass
+
+
+__all__ = ["__CMDGroup"]

…al-network-tap/azext_vnettap/profiles.py …tap/azext_vnettap/aaz/latest/__init__.pysrc/virtual-network-tap/azext_vnettap/profiles.py renamed to src/virtual-network-tap/azext_vnettap/aaz/latest/__init__.py src/virtual-network-tap/azext_vnettap/profiles.py renamed to src/virtual-network-tap/azext_vnettap/aaz/latest/__init__.py

@@ -1,8 +1,11 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
+# --------------------------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-# --------------------------------------------------------------------------
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
 
-VERSION = "2.2.0"
+# pylint: skip-file
+# flake8: noqa
+
+from .__cmd_group import *