-
Notifications
You must be signed in to change notification settings - Fork 3.4k
{Compute} az image create: Migrate command to aaz-based implementation
#32884
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
william051200
wants to merge
7
commits into
Azure:dev
Choose a base branch
from
william051200:image-migration
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
89eb9c9
Migrate code
william051200 2df9f37
Update code
william051200 5c94035
Update test recordings
william051200 467b41a
Remove unused import
william051200 c888cb0
Update test recording
william051200 fa22547
Merge remote-tracking branch 'origin/dev' into image-migration
william051200 adab031
Update code
william051200 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2161,27 +2161,33 @@ def process_image_create_namespace(cmd, namespace): | |
| 'virtualMachines', 'Microsoft.Compute') | ||
| res = parse_resource_id(res_id) | ||
| if res['type'] == 'virtualMachines': | ||
| compute_client = _compute_client_factory(cmd.cli_ctx, subscription_id=res['subscription']) | ||
| vm_info = compute_client.virtual_machines.get(res['resource_group'], res['name']) | ||
| from .operations.vm import VMShow | ||
| command_args = { | ||
| 'subscription': res['subscription'], | ||
| 'resource_group': res['resource_group'], | ||
| 'vm_name': res['name'] | ||
| } | ||
| vm_info = VMShow(cli_ctx=cmd.cli_ctx)(command_args=command_args) | ||
| source_from_vm = True | ||
| except ResourceNotFoundError: | ||
| pass | ||
|
|
||
| if source_from_vm: | ||
| # pylint: disable=no-member | ||
| namespace.os_type = vm_info.storage_profile.os_disk.os_type | ||
| namespace.os_type = vm_info.get('storageProfile', {}).get('osDisk', {}).get('osType') | ||
| namespace.source_virtual_machine = res_id | ||
| if namespace.data_disk_sources: | ||
| raise CLIError("'--data-disk-sources' is not allowed when capturing " | ||
| "images from virtual machines") | ||
| else: | ||
| namespace.os_blob_uri, namespace.os_disk, namespace.os_snapshot, _, _ = _figure_out_storage_source(cmd.cli_ctx, namespace.resource_group_name, namespace.source) # pylint: disable=line-too-long | ||
| namespace.os_blob_uri, namespace.os_disk, namespace.os_snapshot, _, _ = \ | ||
| _figure_out_storage_source_by_aaz(cmd.cli_ctx, namespace.resource_group_name, namespace.source) | ||
| namespace.data_blob_uris = [] | ||
| namespace.data_disks = [] | ||
| namespace.data_snapshots = [] | ||
| if namespace.data_disk_sources: | ||
| for data_disk_source in namespace.data_disk_sources: | ||
| source_blob_uri, source_disk, source_snapshot, _, _ = _figure_out_storage_source( | ||
| source_blob_uri, source_disk, source_snapshot, _, _ = _figure_out_storage_source_by_aaz( | ||
| cmd.cli_ctx, namespace.resource_group_name, data_disk_source) | ||
| if source_blob_uri: | ||
| namespace.data_blob_uris.append(source_blob_uri) | ||
|
|
@@ -2218,6 +2224,30 @@ def _figure_out_storage_source(cli_ctx, resource_group_name, source): | |
| return (source_blob_uri, source_disk, source_snapshot, source_restore_point, source_info) | ||
|
|
||
|
|
||
| def _figure_out_storage_source_by_aaz(cli_ctx, resource_group_name, source): | ||
| source_blob_uri = None | ||
| source_disk = None | ||
| source_snapshot = None | ||
| source_info = None | ||
| source_restore_point = None | ||
| if urlparse(source).scheme: # a uri? | ||
| source_blob_uri = source | ||
| elif '/disks/' in source.lower(): | ||
| source_disk = source | ||
| elif '/snapshots/' in source.lower(): | ||
| source_snapshot = source | ||
| elif '/restorepoints/' in source.lower(): | ||
| source_restore_point = source | ||
| else: | ||
| source_info, is_snapshot = _get_disk_or_snapshot_info_by_aaz(cli_ctx, resource_group_name, source) | ||
| if is_snapshot: | ||
| source_snapshot = source_info.get('id') | ||
| else: | ||
| source_disk = source_info.get('id') | ||
|
|
||
| return (source_blob_uri, source_disk, source_snapshot, source_restore_point, source_info) | ||
|
Comment on lines
+2227
to
+2248
|
||
|
|
||
|
|
||
| def _get_disk_or_snapshot_info(cli_ctx, resource_group_name, source): | ||
| compute_client = _compute_client_factory(cli_ctx) | ||
| is_snapshot = True | ||
|
|
@@ -2231,6 +2261,28 @@ def _get_disk_or_snapshot_info(cli_ctx, resource_group_name, source): | |
| return info, is_snapshot | ||
|
|
||
|
|
||
| def _get_disk_or_snapshot_info_by_aaz(cli_ctx, resource_group_name, source): | ||
| from .aaz.latest.snapshot import Show as SnapshotShow | ||
| from .aaz.latest.disk import Show as DiskShow | ||
| is_snapshot = True | ||
|
|
||
| try: | ||
| command_args = { | ||
| 'resource_group': resource_group_name, | ||
| 'snapshot_name': source | ||
| } | ||
| info = SnapshotShow(cli_ctx=cli_ctx)(command_args=command_args) | ||
| except ResourceNotFoundError: | ||
| command_args = { | ||
| 'resource_group': resource_group_name, | ||
| 'disk_name': source | ||
| } | ||
| is_snapshot = False | ||
| info = DiskShow(cli_ctx=cli_ctx)(command_args=command_args) | ||
|
|
||
| return info, is_snapshot | ||
|
|
||
|
|
||
| def process_disk_encryption_namespace(cmd, namespace): | ||
| namespace.disk_encryption_keyvault = _get_resource_id(cmd.cli_ctx, namespace.disk_encryption_keyvault, | ||
| namespace.resource_group_name, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -811,6 +811,12 @@ class VMGuestPatchClassificationLinux(Enum): | |||||
| SECURITY = 'Security' | ||||||
|
|
||||||
|
|
||||||
| class CachingTypes(Enum): | ||||||
|
||||||
| class CachingTypes(Enum): | |
| class DiskCachingTypes(Enum): |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well done!