From 8bca649dd01b44b32bb732fc7e2464b1a9502967 Mon Sep 17 00:00:00 2001 From: Yunge Zhu Date: Tue, 21 Jan 2020 14:55:12 +0800 Subject: [PATCH 1/2] fix none check --- src/azure-cli/azure/cli/command_modules/vm/custom.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/vm/custom.py b/src/azure-cli/azure/cli/command_modules/vm/custom.py index eb6742d331e..2f7be7e6897 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/custom.py +++ b/src/azure-cli/azure/cli/command_modules/vm/custom.py @@ -1879,7 +1879,9 @@ def add_vm_secret(cmd, resource_group_name, vm_name, keyvault, certificate, cert def list_vm_secrets(cmd, resource_group_name, vm_name): vm = get_vm(cmd, resource_group_name, vm_name) - return vm.os_profile.secrets + if vm.os_profile: + return vm.os_profile.secrets + return None def remove_vm_secret(cmd, resource_group_name, vm_name, keyvault, certificate=None): @@ -2815,8 +2817,9 @@ def list_vmss_extensions(cmd, resource_group_name, vmss_name): client = _compute_client_factory(cmd.cli_ctx) vmss = client.virtual_machine_scale_sets.get(resource_group_name, vmss_name) # pylint: disable=no-member - return None if not vmss.virtual_machine_profile.extension_profile \ - else vmss.virtual_machine_profile.extension_profile.extensions + if vmss.virtual_machine_profile and vmss.virtual_machine_profile.extension_profile: + return vmss.virtual_machine_profile.extension_profile.extensions + return None def set_vmss_extension(cmd, resource_group_name, vmss_name, extension_name, publisher, version=None, From 456787d78299cdb0d9ec16c030943b2d1017bfc3 Mon Sep 17 00:00:00 2001 From: Catherine Zhu Date: Mon, 2 Mar 2020 20:38:52 +0800 Subject: [PATCH 2/2] resolve comments --- src/azure-cli/azure/cli/command_modules/vm/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/vm/custom.py b/src/azure-cli/azure/cli/command_modules/vm/custom.py index 2f7be7e6897..68e28eb45e6 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/custom.py +++ b/src/azure-cli/azure/cli/command_modules/vm/custom.py @@ -1881,7 +1881,7 @@ def list_vm_secrets(cmd, resource_group_name, vm_name): vm = get_vm(cmd, resource_group_name, vm_name) if vm.os_profile: return vm.os_profile.secrets - return None + return [] def remove_vm_secret(cmd, resource_group_name, vm_name, keyvault, certificate=None):