Skip to content

Commit 2d8cd0a

Browse files
william051200bebound
authored andcommitted
{Compute} az vm boot-diagnostics: Migrate command group to aaz-based implementation (#32766)
1 parent b9c3ac6 commit 2d8cd0a

File tree

4 files changed

+1390
-1389
lines changed

4 files changed

+1390
-1389
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ def load_command_table(self, _):
315315
self.command_table['vm availability-set update'] = AvailabilitySetUpdate(loader=self)
316316
self.command_table['vm availability-set convert'] = AvailabilitySetConvert(loader=self)
317317

318-
with self.command_group('vm boot-diagnostics', compute_vm_sdk) as g:
318+
with self.command_group('vm boot-diagnostics') as g:
319319
g.custom_command('disable', 'disable_boot_diagnostics')
320320
g.custom_command('enable', 'enable_boot_diagnostics')
321321
g.custom_command('get-boot-log', 'get_boot_log')

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,21 +2244,24 @@ def get_boot_log(cmd, resource_group_name, vm_name):
22442244
import sys
22452245
from azure.cli.core.profiles import get_sdk
22462246
from azure.core.exceptions import HttpResponseError
2247+
from .aaz.latest.vm.boot_diagnostics import GetBootLogUris as VmGetBootLogUris
22472248
BlobClient = get_sdk(cmd.cli_ctx, ResourceType.DATA_STORAGE_BLOB, '_blob_client#BlobClient')
2248-
client = _compute_client_factory(cmd.cli_ctx)
22492249

2250-
virtual_machine = client.virtual_machines.get(resource_group_name, vm_name, expand='instanceView')
2251-
# pylint: disable=no-member
2250+
virtual_machine = get_instance_view(cmd, resource_group_name, vm_name)
22522251

22532252
blob_uri = None
2254-
if virtual_machine.instance_view and virtual_machine.instance_view.boot_diagnostics:
2255-
blob_uri = virtual_machine.instance_view.boot_diagnostics.serial_console_log_blob_uri
2253+
if virtual_machine.get('instanceView', {}).get('bootDiagnostics'):
2254+
blob_uri = virtual_machine['instanceView']['bootDiagnostics'].get('serialConsoleLogBlobUri')
22562255

22572256
# Managed storage
22582257
if blob_uri is None:
22592258
try:
2260-
boot_diagnostics_data = client.virtual_machines.retrieve_boot_diagnostics_data(resource_group_name, vm_name)
2261-
blob_uri = boot_diagnostics_data.serial_console_log_blob_uri
2259+
command_args = {
2260+
'resource_group': resource_group_name,
2261+
'name': vm_name
2262+
}
2263+
boot_diagnostics_data = VmGetBootLogUris(cli_ctx=cmd.cli_ctx)(command_args=command_args)
2264+
blob_uri = boot_diagnostics_data.get('serialConsoleLogBlobUri')
22622265
except HttpResponseError:
22632266
pass
22642267
if blob_uri is None:

0 commit comments

Comments
 (0)