diff --git a/src/azure-cli/azure/cli/command_modules/vm/_image_builder.py b/src/azure-cli/azure/cli/command_modules/vm/_image_builder.py index f4bf132f904..ffeee688463 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/_image_builder.py +++ b/src/azure-cli/azure/cli/command_modules/vm/_image_builder.py @@ -388,7 +388,7 @@ def create_image_template( # pylint: disable=too-many-locals, too-many-branches ImageTemplateShellCustomizer, ImageTemplatePowerShellCustomizer, ImageTemplateManagedImageDistributor, ImageTemplateSharedImageDistributor, ImageTemplateIdentity, - ImageTemplateIdentityUserAssignedIdentitiesValue, + ComponentsVrq145SchemasImagetemplateidentityPropertiesUserassignedidentitiesAdditionalproperties, # pylint: disable=line-too-long ImageTemplateVmProfile, VirtualNetworkConfig) if image_template is not None: @@ -422,7 +422,7 @@ def create_image_template( # pylint: disable=too-many-locals, too-many-branches content['tags'] = obj['tags'] if 'identity' in obj: content['identity'] = obj['identity'] - return client.virtual_machine_image_templates.create_or_update( + return client.virtual_machine_image_templates.begin_create_or_update( parameters=content, resource_group_name=resource_group_name, image_template_name=image_template_name) template_source, template_scripts, template_destinations = None, [], [] @@ -473,14 +473,15 @@ def create_image_template( # pylint: disable=too-many-locals, too-many-branches if not is_valid_resource_id(ide): ide = resource_id(subscription=subscription_id, resource_group=resource_group_name, namespace='Microsoft.ManagedIdentity', type='userAssignedIdentities', name=ide) - user_assigned_identities[ide] = ImageTemplateIdentityUserAssignedIdentitiesValue() + user_assigned_identities[ide] = ComponentsVrq145SchemasImagetemplateidentityPropertiesUserassignedidentitiesAdditionalproperties() # pylint: disable=line-too-long identity_body = ImageTemplateIdentity(type='UserAssigned', user_assigned_identities=user_assigned_identities) # VM profile vnet_config = None if vnet or subnet: if not is_valid_resource_id(subnet): - subnet = resource_id(subscription=client.config.subscription_id, resource_group=resource_group_name, + subscription_id = get_subscription_id(cmd.cli_ctx) + subnet = resource_id(subscription=subscription_id, resource_group=resource_group_name, namespace='Microsoft.Network', type='virtualNetworks', name=vnet, child_type_1='subnets', child_name_1=subnet) vnet_config = VirtualNetworkConfig(subnet_id=subnet) @@ -490,7 +491,7 @@ def create_image_template( # pylint: disable=too-many-locals, too-many-branches location=location, build_timeout_in_minutes=build_timeout, tags=(tags or {}), identity=identity_body, vm_profile=vm_profile) - return cached_put(cmd, client.virtual_machine_image_templates.create_or_update, parameters=image_template, + return cached_put(cmd, client.virtual_machine_image_templates.begin_create_or_update, parameters=image_template, resource_group_name=resource_group_name, image_template_name=image_template_name) @@ -547,7 +548,7 @@ def add_template_output(cmd, client, resource_group_name, image_template_name, g existing_image_template.distribute.append(distributor) - return cached_put(cmd, client.virtual_machine_image_templates.create_or_update, parameters=existing_image_template, + return cached_put(cmd, client.virtual_machine_image_templates.begin_create_or_update, parameters=existing_image_template, # pylint: disable=line-too-long resource_group_name=resource_group_name, image_template_name=image_template_name) @@ -571,7 +572,7 @@ def remove_template_output(cmd, client, resource_group_name, image_template_name existing_image_template.distribute = new_distribute - return cached_put(cmd, client.virtual_machine_image_templates.create_or_update, parameters=existing_image_template, + return cached_put(cmd, client.virtual_machine_image_templates.begin_create_or_update, parameters=existing_image_template, # pylint: disable=line-too-long resource_group_name=resource_group_name, image_template_name=image_template_name) @@ -586,7 +587,7 @@ def clear_template_output(cmd, client, resource_group_name, image_template_name) existing_image_template.distribute = [] - return cached_put(cmd, client.virtual_machine_image_templates.create_or_update, parameters=existing_image_template, + return cached_put(cmd, client.virtual_machine_image_templates.begin_create_or_update, parameters=existing_image_template, # pylint: disable=line-too-long resource_group_name=resource_group_name, image_template_name=image_template_name) @@ -635,7 +636,7 @@ def add_template_customizer(cmd, client, resource_group_name, image_template_nam existing_image_template.customize.append(new_customizer) - return cached_put(cmd, client.virtual_machine_image_templates.create_or_update, parameters=existing_image_template, + return cached_put(cmd, client.virtual_machine_image_templates.begin_create_or_update, parameters=existing_image_template, # pylint: disable=line-too-long resource_group_name=resource_group_name, image_template_name=image_template_name) @@ -659,7 +660,7 @@ def remove_template_customizer(cmd, client, resource_group_name, image_template_ existing_image_template.customize = new_customize - return cached_put(cmd, client.virtual_machine_image_templates.create_or_update, parameters=existing_image_template, + return cached_put(cmd, client.virtual_machine_image_templates.begin_create_or_update, parameters=existing_image_template, # pylint: disable=line-too-long resource_group_name=resource_group_name, image_template_name=image_template_name) @@ -675,7 +676,7 @@ def clear_template_customizer(cmd, client, resource_group_name, image_template_n existing_image_template.customize = [] - return cached_put(cmd, client.virtual_machine_image_templates.create_or_update, parameters=existing_image_template, + return cached_put(cmd, client.virtual_machine_image_templates.begin_create_or_update, parameters=existing_image_template, # pylint: disable=line-too-long resource_group_name=resource_group_name, image_template_name=image_template_name) # endregion diff --git a/src/azure-cli/azure/cli/command_modules/vm/commands.py b/src/azure-cli/azure/cli/command_modules/vm/commands.py index 85fe47de66d..a207733a447 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/commands.py +++ b/src/azure-cli/azure/cli/command_modules/vm/commands.py @@ -264,12 +264,12 @@ def load_command_table(self, _): g.custom_command('create', 'create_image_template', supports_no_wait=True, supports_local_cache=True, validator=process_image_template_create_namespace) g.custom_command('list', 'list_image_templates') g.show_command('show', 'get') - g.command('delete', 'delete') - g.generic_update_command('update', 'create_or_update', supports_local_cache=True) # todo Update fails for now as service does not support updates + g.command('delete', 'begin_delete') + g.generic_update_command('update', setter_name='begin_create_or_update', supports_local_cache=True) # todo Update fails for now as service does not support updates g.wait_command('wait') - g.command('run', 'run', supports_no_wait=True) + g.command('run', 'begin_run', supports_no_wait=True) g.custom_command('show-runs', 'show_build_output') - g.command('cancel', 'cancel') + g.command('cancel', 'begin_cancel') with self.command_group('image builder customizer', image_builder_image_templates_sdk, custom_command_type=image_builder_custom) as g: g.custom_command('add', 'add_template_customizer', supports_local_cache=True, validator=process_img_tmpl_customizer_add_namespace) diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_build_managed_image.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_build_managed_image.yaml index 29ca82f3491..5f0a5934fba 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_build_managed_image.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_build_managed_image.yaml @@ -463,7 +463,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -620,7 +620,7 @@ interactions: - python/3.8.9 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.27.2 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -686,7 +686,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01/run?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01/run?api-version=2021-10-01 response: body: string: '' @@ -1696,7 +1696,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01/runOutputs/img_1?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01/runOutputs/img_1?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"artifactId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.Compute/images/img_1\",\n @@ -2612,7 +2612,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"imageId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.Compute/images/img_1\",\n @@ -2768,7 +2768,7 @@ interactions: - python/3.8.9 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.27.2 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"imageId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_managed000001/providers/Microsoft.Compute/images/img_1\",\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_build_shared_image.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_build_shared_image.yaml index d505c7ca2f3..d3c8df2179c 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_build_shared_image.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_build_shared_image.yaml @@ -1012,7 +1012,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -1169,7 +1169,7 @@ interactions: - python/3.8.9 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.28.1 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -1235,7 +1235,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01/run?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01/run?api-version=2021-10-01 response: body: string: '' @@ -3109,7 +3109,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01/runOutputs/image1?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01/runOutputs/image1?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"artifactId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.Compute/galleries/ib_sig000003/images/image1/versions/0.24916.4472\",\n @@ -4087,7 +4087,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"imageVersionId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.Compute/galleries/ib_sig000003/images/image1/versions/0.24916.4472\",\n @@ -4243,7 +4243,7 @@ interactions: - python/3.8.9 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.28.1 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"imageVersionId\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_sig000001/providers/Microsoft.Compute/galleries/ib_sig000003/images/image1/versions/0.24916.4472\",\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_basic.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_basic.yaml index 9c75ce6f8d7..aa4c7459b30 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_basic.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_basic.yaml @@ -1236,7 +1236,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -1398,7 +1398,7 @@ interactions: - python/3.8.3 (Windows-10-10.0.18362-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.29.0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -1658,7 +1658,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -1818,7 +1818,7 @@ interactions: - python/3.8.3 (Windows-10-10.0.18362-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.29.0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template02?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_basic_sig.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_basic_sig.yaml index 9db889b0262..6f15d092716 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_basic_sig.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_basic_sig.yaml @@ -879,7 +879,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic_2000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic_2000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -1037,7 +1037,7 @@ interactions: - python/3.8.9 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.28.1 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic_2000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_basic_2000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_cancel.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_cancel.yaml index 2ecf45a12f8..54aafad1cc2 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_cancel.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_cancel.yaml @@ -460,7 +460,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -567,7 +567,7 @@ interactions: - python/3.8.1 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.27.0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -630,7 +630,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1/run?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1/run?api-version=2021-10-01 response: body: string: '' @@ -679,7 +679,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -745,7 +745,7 @@ interactions: accept-language: - en-US method: POST - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1/cancel?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1/cancel?api-version=2021-10-01 response: body: string: '' @@ -788,7 +788,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_cancel_000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template1?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_customizers.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_customizers.yaml index 241ac2581e2..91fd8dd046d 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_customizers.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_builder_customizers.yaml @@ -471,7 +471,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"WindowsServer\",\n @@ -646,7 +646,7 @@ interactions: - python/3.8.1 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.27.0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"WindowsServer\",\n @@ -730,7 +730,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"WindowsServer\",\n diff --git a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_template_outputs.yaml b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_template_outputs.yaml index 3b9eeddb739..bd19395b993 100644 --- a/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_template_outputs.yaml +++ b/src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_template_outputs.yaml @@ -898,7 +898,7 @@ interactions: accept-language: - en-US method: PUT - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -1057,7 +1057,7 @@ interactions: - python/3.8.1 (Windows-10-10.0.19041-SP0) msrest/0.6.21 msrest_azure/0.6.3 azure-mgmt-imagebuilder/0.4.0 Azure-SDK-For-Python AZURECLI/2.27.0 method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n @@ -1123,7 +1123,7 @@ interactions: accept-language: - en-US method: GET - uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2020-02-14 + uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/img_tmpl_customizers000001/providers/Microsoft.VirtualMachineImages/imageTemplates/template01?api-version=2021-10-01 response: body: string: "{\n \"properties\": {\n \"source\": {\n \"offer\": \"UbuntuServer\",\n diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index 4eb6ba111d6..4c4de8102ba 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -47,7 +47,7 @@ azure-mgmt-eventgrid==9.0.0 azure-mgmt-eventhub==9.1.0 azure-mgmt-extendedlocation==1.0.0b2 azure-mgmt-hdinsight==9.0.0 -azure-mgmt-imagebuilder==0.4.0 +azure-mgmt-imagebuilder==1.0.0 azure-mgmt-iotcentral==9.0.0 azure-mgmt-iothub==2.1.0 azure-mgmt-iothubprovisioningservices==0.3.0 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 3c4f4a38ea7..ccfde5eec6f 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -47,7 +47,7 @@ azure-mgmt-eventgrid==9.0.0 azure-mgmt-eventhub==9.1.0 azure-mgmt-extendedlocation==1.0.0b2 azure-mgmt-hdinsight==9.0.0 -azure-mgmt-imagebuilder==0.4.0 +azure-mgmt-imagebuilder==1.0.0 azure-mgmt-iotcentral==9.0.0 azure-mgmt-iothub==2.1.0 azure-mgmt-iothubprovisioningservices==0.3.0 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index 4e59498eced..779d6604b95 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -47,7 +47,7 @@ azure-mgmt-eventgrid==9.0.0 azure-mgmt-eventhub==9.1.0 azure-mgmt-extendedlocation==1.0.0b2 azure-mgmt-hdinsight==9.0.0 -azure-mgmt-imagebuilder==0.4.0 +azure-mgmt-imagebuilder==1.0.0 azure-mgmt-iotcentral==9.0.0 azure-mgmt-iothub==2.1.0 azure-mgmt-iothubprovisioningservices==0.3.0 diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py index 3f31cd3b6d4..d1c74b9f200 100644 --- a/src/azure-cli/setup.py +++ b/src/azure-cli/setup.py @@ -91,7 +91,7 @@ 'azure-mgmt-eventhub~=9.1.0', 'azure-mgmt-extendedlocation~=1.0.0b2', 'azure-mgmt-hdinsight~=9.0.0', - 'azure-mgmt-imagebuilder~=0.4.0', + 'azure-mgmt-imagebuilder~=1.0.0', 'azure-mgmt-iotcentral~=9.0.0', 'azure-mgmt-iothub==2.1.0', 'azure-mgmt-iothubprovisioningservices~=0.3.0',