{VM} Clean up Network SDK dependencies (#25805)

Author: kairu-ms

src/azure-cli/azure/cli/command_modules/network/tests/hybrid_2018_03_01/recordings/test_network_nic_convenience_commands.yaml

@@ -12,24 +12,6 @@ def _compute_client_factory(cli_ctx, **kwargs):
                                    aux_subscriptions=kwargs.get('aux_subscriptions'))
 
 
-def cf_ni(cli_ctx, _):
-    from azure.cli.core.profiles import ResourceType
-    from azure.cli.core.commands.client_factory import get_mgmt_service_client
-    # TODO: Remove hard coded api-version once
-    # https://github.com/Azure/azure-rest-api-specs/issues/570
-    # is fixed.
-    ni = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_NETWORK).network_interfaces
-    ni.api_version = '2016-03-30'
-    return ni
-
-
-def cf_public_ip_addresses(cli_ctx):
-    from azure.cli.core.profiles import ResourceType
-    from azure.cli.core.commands.client_factory import get_mgmt_service_client
-    public_ip_ops = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_NETWORK).public_ip_addresses
-    return public_ip_ops
-
-
 def cf_avail_set(cli_ctx, _):
     return _compute_client_factory(cli_ctx).availability_sets
 

src/azure-cli/azure/cli/command_modules/vm/_client_factory.py

@@ -728,15 +728,16 @@ def load_arguments(self, _):
                    help='Specify it to create new virtual machines to upgrade the scale set, rather than updating the existing virtual machines.')
 
     with self.argument_context('vmss create', arg_group='Network Balancer') as c:
-        LoadBalancerSkuName = self.get_models('LoadBalancerSkuName', resource_type=ResourceType.MGMT_NETWORK)
         c.argument('application_gateway', help='Name to use when creating a new application gateway (default) or referencing an existing one. Can also reference an existing application gateway by ID or specify "" for none.', options_list=['--app-gateway'])
         c.argument('app_gateway_capacity', help='The number of instances to use when creating a new application gateway.')
         c.argument('app_gateway_sku', help='SKU when creating a new application gateway.')
         c.argument('app_gateway_subnet_address_prefix', help='The subnet IP address prefix to use when creating a new application gateway in CIDR format.')
         c.argument('backend_pool_name', help='Name to use for the backend pool when creating a new load balancer or application gateway.')
         c.argument('backend_port', help='When creating a new load balancer, backend port to open with NAT rules (Defaults to 22 on Linux and 3389 on Windows). When creating an application gateway, the backend port to use for the backend HTTP settings.', type=int)
         c.argument('load_balancer', help='Name to use when creating a new load balancer (default) or referencing an existing one. Can also reference an existing load balancer by ID or specify "" for none.', options_list=['--load-balancer', '--lb'])
-        c.argument('load_balancer_sku', resource_type=ResourceType.MGMT_NETWORK, min_api='2017-08-01', options_list=['--lb-sku'], arg_type=get_enum_type(LoadBalancerSkuName),
+        c.argument('load_balancer_sku', resource_type=ResourceType.MGMT_NETWORK, min_api='2017-08-01', max_api='2021-02-01', options_list=['--lb-sku'], arg_type=get_enum_type(['Basic', 'Standard']),
+                   help="Sku of the Load Balancer to create. Default to 'Standard' when single placement group is turned off; otherwise, default to 'Basic'. The public IP is supported to be created on edge zone only when it is 'Standard'")
+        c.argument('load_balancer_sku', resource_type=ResourceType.MGMT_NETWORK, min_api='2021-02-01', options_list=['--lb-sku'], arg_type=get_enum_type(['Basic', 'Standard', 'Gateway']),
                    help="Sku of the Load Balancer to create. Default to 'Standard' when single placement group is turned off; otherwise, default to 'Basic'. The public IP is supported to be created on edge zone only when it is 'Standard'")
         c.argument('nat_pool_name', help='Name to use for the NAT pool when creating a new load balancer.', options_list=['--lb-nat-pool-name', '--nat-pool-name'], deprecate_info=c.deprecate(target='--nat-pool-name', redirect='--nat-rule-name', hide=True))
         c.argument('nat_rule_name', help='Name to use for the NAT rule v2 when creating a new load balancer. (NAT rule V2 is used to replace NAT pool)', options_list=['--lb-nat-rule-name', '--nat-rule-name'])
@@ -1051,9 +1052,8 @@ def load_arguments(self, _):
             c.argument('public_ip_address_allocation', help=None, default=None, arg_type=get_enum_type(['dynamic', 'static']))
             c.argument('public_ip_address_dns_name', help='Globally unique DNS name for a newly created public IP.')
             if self.supported_api_version(min_api='2017-08-01', resource_type=ResourceType.MGMT_NETWORK):
-                PublicIPAddressSkuName = self.get_models('PublicIPAddressSkuName', resource_type=ResourceType.MGMT_NETWORK)
                 c.argument('public_ip_sku', help='Public IP SKU. It is set to Basic by default. The public IP is supported to be created on edge zone only when it is \'Standard\'',
-                           default=None, arg_type=get_enum_type(PublicIPAddressSkuName))
+                           default=None, arg_type=get_enum_type(['Basic', 'Standard']))
             c.argument('nic_delete_option', nargs='+', min_api='2021-03-01',
                        help='Specify what happens to the network interface when the VM is deleted. Use a singular '
                        'value to apply on all resources, or use <Name>=<Value> to configure '

src/azure-cli/azure/cli/command_modules/vm/_params.py

@@ -160,7 +160,7 @@ def build_nic_resource(_, name, location, tags, vm_name, subnet_id, private_ip_a
 
     api_version = '2015-06-15'
     if application_security_groups:
-        asg_ids = [{'id': x.id} for x in application_security_groups]
+        asg_ids = [{'id': x['id']} for x in application_security_groups]
         nic_properties['ipConfigurations'][0]['properties']['applicationSecurityGroups'] = asg_ids
         api_version = '2017-09-01'
 
@@ -983,7 +983,7 @@ def build_vmss_resource(cmd, name, computer_name_prefix, location, tags, overpro
 
     if application_security_groups and cmd.supported_api_version(min_api='2018-06-01',
                                                                  operation_group='virtual_machine_scale_sets'):
-        ip_config_properties['applicationSecurityGroups'] = [{'id': x.id} for x in application_security_groups]
+        ip_config_properties['applicationSecurityGroups'] = [{'id': x['id']} for x in application_security_groups]
 
     if ip_config_properties:
         ip_configuration = {

src/azure-cli/azure/cli/command_modules/vm/_template_builder.py

@@ -20,22 +20,22 @@
 from azure.cli.core.commands.validators import (
     get_default_location_from_resource_group, validate_file_or_dict, validate_parameter_set, validate_tags)
 from azure.cli.core.util import (hash_string, DISALLOWED_USER_NAMES, get_default_admin_username)
-from azure.cli.command_modules.vm._vm_utils import (check_existence, get_storage_blob_uri, list_sku_info)
+from azure.cli.command_modules.vm._vm_utils import (check_existence, get_storage_blob_uri, list_sku_info,
+                                                    import_aaz_by_profile)
 from azure.cli.command_modules.vm._template_builder import StorageProfile
 from azure.cli.core import keys
 from azure.core.exceptions import ResourceNotFoundError
 
 from ._client_factory import _compute_client_factory
 from ._actions import _get_latest_image_version
+
+
 logger = get_logger(__name__)
 
 
 def validate_asg_names_or_ids(cmd, namespace):
     from msrestazure.tools import resource_id, is_valid_resource_id
-    from azure.cli.core.profiles import ResourceType
     from azure.cli.core.commands.client_factory import get_subscription_id
-    ApplicationSecurityGroup = cmd.get_models('ApplicationSecurityGroup',
-                                              resource_type=ResourceType.MGMT_NETWORK)
 
     resource_group = namespace.resource_group_name
     subscription_id = get_subscription_id(cmd.cli_ctx)
@@ -53,7 +53,7 @@ def validate_asg_names_or_ids(cmd, namespace):
                 namespace='Microsoft.Network', type='applicationSecurityGroups',
                 name=val
             )
-        ids.append(ApplicationSecurityGroup(id=val))
+        ids.append({'id': val})
     setattr(namespace, 'application_security_groups', ids)
 
 
@@ -734,28 +734,31 @@ def _validate_vm_vmss_create_vnet(cmd, namespace, for_scale_set=False):
         logger.debug('no subnet specified. Attempting to find an existing Vnet and subnet...')
 
         # if nothing specified, try to find an existing vnet and subnet in the target resource group
-        client = get_network_client(cmd.cli_ctx).virtual_networks
+        VnetList = import_aaz_by_profile(cmd.cli_ctx.cloud.profile, "network.vnet").List
 
-        # find VNET in target resource group that matches the VM's location with a matching subnet
-        for vnet_match in (v for v in client.list(rg) if v.location == location and v.subnets):
+        vnet_list = VnetList(cli_ctx=cmd.cli_ctx)(command_args={
+            "resource_group": rg
+        })
 
+        # find VNET in target resource group that matches the VM's location with a matching subnet
+        for vnet_match in (v for v in vnet_list if bool(v['location'] == location and v['subnets'])):
             # 1 - find a suitable existing vnet/subnet
             result = None
             if not for_scale_set:
-                result = next((s for s in vnet_match.subnets if s.name.lower() != 'gatewaysubnet'), None)
+                result = next((s for s in vnet_match['subnets'] if s['name'].lower() != 'gatewaysubnet'), None)
             else:
                 def _check_subnet(s):
-                    if s.name.lower() == 'gatewaysubnet':
+                    if s['name'].lower() == 'gatewaysubnet':
                         return False
-                    subnet_mask = s.address_prefix.split('/')[-1]
+                    subnet_mask = s['addressPrefix'].split('/')[-1]
                     return _subnet_capacity_check(subnet_mask, namespace.instance_count,
                                                   not namespace.disable_overprovision)
 
-                result = next((s for s in vnet_match.subnets if _check_subnet(s)), None)
+                result = next((s for s in vnet_match['subnets'] if _check_subnet(s)), None)
             if not result:
                 continue
-            namespace.subnet = result.name
-            namespace.vnet_name = vnet_match.name
+            namespace.subnet = result['name']
+            namespace.vnet_name = vnet_match['name']
             namespace.vnet_type = 'existing'
             logger.debug("existing vnet '%s' and subnet '%s' found", namespace.vnet_name, namespace.subnet)
             return
@@ -981,18 +984,15 @@ def _validate_vm_vmss_create_public_ip(cmd, namespace):
         namespace.public_ip_address_type = 'new'
         logger.debug('new public IP address will be created')
 
-    from azure.cli.core.profiles import ResourceType
-    PublicIPAddressSkuName, IPAllocationMethod = cmd.get_models('PublicIPAddressSkuName', 'IPAllocationMethod',
-                                                                resource_type=ResourceType.MGMT_NETWORK)
     # Use standard public IP address automatically when using zones.
     if hasattr(namespace, 'zone') and namespace.zone is not None:
-        namespace.public_ip_sku = PublicIPAddressSkuName.standard.value
+        namespace.public_ip_sku = 'Standard'
 
     # Public-IP SKU is only exposed for VM. VMSS has no such needs so far
     if getattr(namespace, 'public_ip_sku', None):
-        if namespace.public_ip_sku == PublicIPAddressSkuName.standard.value:
+        if namespace.public_ip_sku == 'Standard':
             if not namespace.public_ip_address_allocation:
-                namespace.public_ip_address_allocation = IPAllocationMethod.static.value
+                namespace.public_ip_address_allocation = 'Static'
 
 
 def _validate_vmss_create_public_ip(cmd, namespace):
@@ -1505,12 +1505,19 @@ def process_vm_update_namespace(cmd, namespace):
 # region VMSS Create Validators
 def _get_default_address_pool(cli_ctx, resource_group, balancer_name, balancer_type):
     option_name = '--backend-pool-name'
-    client = getattr(get_network_client(cli_ctx), balancer_type, None)
-    if not client:
+
+    if balancer_type == 'application_gateways':
+        client = import_aaz_by_profile(cli_ctx.cloud.profile, "network.application_gateway")
+    elif balancer_type == 'load_balancers':
+        client = import_aaz_by_profile(cli_ctx.cloud.profile, "network.lb")
+    else:
         raise CLIError('unrecognized balancer type: {}'.format(balancer_type))
 
-    balancer = client.get(resource_group, balancer_name)
-    values = [x.name for x in balancer.backend_address_pools]
+    balancer = client.Show(cli_ctx=cli_ctx)(command_args={
+        'name': balancer_name,
+        'resource_group': resource_group
+    })
+    values = [x['name'] for x in balancer['backendAddressPools']]
     if len(values) > 1:
         raise CLIError("Multiple possible values found for '{0}': {1}\nSpecify '{0}' "
                        "explicitly.".format(option_name, ', '.join(values)))
@@ -1555,12 +1562,15 @@ def _validate_vmss_create_load_balancer_or_app_gateway(cmd, namespace):
     if balancer_type == 'applicationGateway':
 
         if namespace.application_gateway:
-            client = get_network_client(cmd.cli_ctx).application_gateways
+            client = import_aaz_by_profile(cmd.cli_ctx.cloud.profile, "network.application_gateway")
             try:
                 rg = parse_resource_id(namespace.application_gateway).get(
                     'resource_group', namespace.resource_group_name)
                 ag_name = parse_resource_id(namespace.application_gateway)['name']
-                client.get(rg, ag_name)
+                client.Show(cli_ctx=cmd.cli_ctx)(command_args={
+                    'name': ag_name,
+                    'resource_group': rg
+                })
                 namespace.app_gateway_type = 'existing'
                 namespace.backend_pool_name = namespace.backend_pool_name or \
                     _get_default_address_pool(cmd.cli_ctx, rg, ag_name, 'application_gateways')
@@ -1603,11 +1613,11 @@ def _validate_vmss_create_load_balancer_or_app_gateway(cmd, namespace):
                 namespace.backend_pool_name = namespace.backend_pool_name or \
                     _get_default_address_pool(cmd.cli_ctx, rg, lb_name, 'load_balancers')
                 if not namespace.nat_pool_name:
-                    if len(lb.inbound_nat_pools) > 1:
+                    if len(lb['inboundNatPools']) > 1:
                         raise CLIError("Multiple possible values found for '{0}': {1}\nSpecify '{0}' explicitly.".format(  # pylint: disable=line-too-long
-                            '--nat-pool-name', ', '.join([n.name for n in lb.inbound_nat_pools])))
-                    if lb.inbound_nat_pools:
-                        namespace.nat_pool_name = lb.inbound_nat_pools[0].name
+                            '--nat-pool-name', ', '.join([n['name'] for n in lb['inboundNatPools']])))
+                    if lb['inboundNatPools']:
+                        namespace.nat_pool_name = lb['inboundNatPools'][0]['name']
                 logger.debug("using specified existing load balancer '%s'", namespace.load_balancer)
             else:
                 namespace.load_balancer_type = 'new'
@@ -1620,11 +1630,10 @@ def _validate_vmss_create_load_balancer_or_app_gateway(cmd, namespace):
             logger.debug('new load balancer will be created')
 
         if namespace.load_balancer_type == 'new' and namespace.single_placement_group is False and std_lb_is_available:
-            LBSkuName = cmd.get_models('LoadBalancerSkuName', resource_type=ResourceType.MGMT_NETWORK)
             if namespace.load_balancer_sku is None:
-                namespace.load_balancer_sku = LBSkuName.standard.value
+                namespace.load_balancer_sku = 'Standard'
                 logger.debug("use Standard sku as single placement group is turned off")
-            elif namespace.load_balancer_sku == LBSkuName.basic.value:
+            elif namespace.load_balancer_sku == 'Basic':
                 if namespace.zones:
                     err = "'Standard' load balancer is required for zonal scale-sets"
                 elif namespace.instance_count > 100:
@@ -1635,17 +1644,14 @@ def _validate_vmss_create_load_balancer_or_app_gateway(cmd, namespace):
                 raise CLIError('usage error:{}'.format(err))
 
 
-def get_network_client(cli_ctx):
-    from azure.cli.core.profiles import ResourceType
-    from azure.cli.core.commands.client_factory import get_mgmt_service_client
-    return get_mgmt_service_client(cli_ctx, ResourceType.MGMT_NETWORK)
-
-
 def get_network_lb(cli_ctx, resource_group_name, lb_name):
     from azure.core.exceptions import HttpResponseError
-    network_client = get_network_client(cli_ctx)
+    LBShow = import_aaz_by_profile(cli_ctx.cloud.profile, "network.lb").Show
     try:
-        return network_client.load_balancers.get(resource_group_name, lb_name)
+        return LBShow(cli_ctx=cli_ctx)({
+            "name": lb_name,
+            "resource_group": resource_group_name
+        })
     except HttpResponseError:
         return None
 

src/azure-cli/azure/cli/command_modules/vm/_validators.py

@@ -6,6 +6,7 @@
 import json
 import os
 import re
+import importlib
 
 from azure.cli.core.commands.arm import ArmTemplateBuilder
 
@@ -584,3 +585,8 @@ def display_region_recommendation(cmd, namespace):
                        identified_region)
         from azure.cli.core import telemetry
         telemetry.set_region_identified(namespace.location, identified_region)
+
+
+def import_aaz_by_profile(profile, module_name):
+    profile_module_name = profile.lower().replace('-', '_')
+    return importlib.import_module(f"azure.cli.command_modules.vm.aaz.{profile_module_name}.{module_name}")

src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py

@@ -0,0 +1,20 @@
+# --------------------------------------------------------------------------------------------
+# 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 *
+
+
+class __CMDGroup(AAZCommandGroup):
+    """Manage Azure Network resources.
+    """
+    pass
+
+
+__all__ = ["__CMDGroup"]

src/azure-cli/azure/cli/command_modules/vm/aaz/2018_03_01_hybrid/network/__cmd_group.py

@@ -0,0 +1,11 @@
+# --------------------------------------------------------------------------------------------
+# 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 .__cmd_group import *

src/azure-cli/azure/cli/command_modules/vm/aaz/2018_03_01_hybrid/network/__init__.py

@@ -0,0 +1,22 @@
+# --------------------------------------------------------------------------------------------
+# 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 *
+
+
+class __CMDGroup(AAZCommandGroup):
+    """Manage application-level routing and load balancing services.
+
+    To learn more about Application Gateway, visit https://learn.microsoft.com/en-us/azure/application-gateway/quick-create-cli.
+    """
+    pass
+
+
+__all__ = ["__CMDGroup"]

src/azure-cli/azure/cli/command_modules/vm/aaz/2018_03_01_hybrid/network/application_gateway/__cmd_group.py

@@ -0,0 +1,12 @@
+# --------------------------------------------------------------------------------------------
+# 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 .__cmd_group import *
+from ._show import *