Skip to content

Commit bf2d3e7

Browse files
committed
Added exception handling
1 parent d67c3c3 commit bf2d3e7

File tree

1 file changed

+22
-14
lines changed
  • src/azure-cli/azure/cli/command_modules/vm

1 file changed

+22
-14
lines changed

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

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -766,26 +766,34 @@ def create_snapshot(cmd, resource_group_name, snapshot_name, location=None, size
766766

767767
if disk_encryption_set is not None and not is_valid_resource_id(disk_encryption_set):
768768
from .aaz.latest.disk_encryption_set import Show as DiskEncryptionSetShow
769-
disk_encryption_set = DiskEncryptionSetShow(cli_ctx=cmd.cli_ctx)(command_args={
770-
'resource_group': resource_group_name,
771-
'disk_encryption_set_name': disk_encryption_set
772-
})
769+
from azure.core.exceptions import HttpResponseError
770+
try:
771+
disk_encryption_set = DiskEncryptionSetShow(cli_ctx=cmd.cli_ctx)(command_args={
772+
'resource_group': resource_group_name,
773+
'disk_encryption_set_name': disk_encryption_set
774+
})
773775

774-
if disk_encryption_set:
775-
disk_encryption_set = disk_encryption_set['id']
776-
else:
776+
if disk_encryption_set:
777+
disk_encryption_set = disk_encryption_set['id']
778+
else:
779+
disk_encryption_set = None
780+
except HttpResponseError:
777781
disk_encryption_set = None
778782

779783
if disk_access is not None and not is_valid_resource_id(disk_access):
780784
from .aaz.latest.disk_access import Show as DiskAccessShow
781-
disk_access = DiskAccessShow(cli_ctx=cmd.cli_ctx)(command_args={
782-
'resource_group': resource_group_name,
783-
'disk_access_name': disk_access
784-
})
785+
from azure.core.exceptions import HttpResponseError
786+
try:
787+
disk_access = DiskAccessShow(cli_ctx=cmd.cli_ctx)(command_args={
788+
'resource_group': resource_group_name,
789+
'disk_access_name': disk_access
790+
})
785791

786-
if disk_access:
787-
disk_access = disk_access['id']
788-
else:
792+
if disk_access:
793+
disk_access = disk_access['id']
794+
else:
795+
disk_access = None
796+
except HttpResponseError:
789797
disk_access = None
790798

791799
if disk_encryption_set is not None and encryption_type is None:

0 commit comments

Comments
 (0)