diff --git a/src/command_modules/azure-cli-network/HISTORY.rst b/src/command_modules/azure-cli-network/HISTORY.rst index 21641017f5d..af3263cdf6d 100644 --- a/src/command_modules/azure-cli-network/HISTORY.rst +++ b/src/command_modules/azure-cli-network/HISTORY.rst @@ -5,6 +5,7 @@ Release History 2.2.10 ++++++ +* `dns zone update`: Finished issue where using "" to clear resolution and registration VNets didn't work. * `application-gateway waf-config set`: Added `--exclusion` argument to support WAF exclusions. 2.2.9 diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py index dae5446b450..93b8a824ccf 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_validators.py @@ -60,8 +60,8 @@ def _validate_vnet_name_or_id(cmd, namespace): names_or_ids = getattr(namespace, dest) ids = [] - if names_or_ids == [""] or not names_or_ids: - names_or_ids = [] + if names_or_ids == [''] or not names_or_ids: + return for val in names_or_ids: if not is_valid_resource_id(val): diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py index 2e761c258cd..916ae8a89c7 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/custom.py @@ -6,11 +6,11 @@ from collections import Counter, OrderedDict -from knack.log import get_logger - from msrestazure.azure_exceptions import CloudError from msrestazure.tools import parse_resource_id, is_valid_resource_id, resource_id +from knack.log import get_logger + from azure.mgmt.trafficmanager.models import MonitorProtocol, ProfileStatus # pylint: disable=no-self-use,no-member,too-many-lines,unused-argument @@ -967,7 +967,6 @@ def update_dns_zone(instance, tags=None, zone_type=None, resolution_vnets=None, instance.registration_virtual_networks = None elif registration_vnets: instance.registration_virtual_networks = registration_vnets - return instance