diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/image_builder_client.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/image_builder_client.py index e37f721ab45e..307838e6392f 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/image_builder_client.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/image_builder_client.py @@ -80,7 +80,7 @@ def __init__( super(ImageBuilderClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - self.api_version = '2019-02-01-preview' + self.api_version = '2019-05-01-preview' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/__init__.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/__init__.py index bca636e5d480..b44235892b63 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/__init__.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/__init__.py @@ -15,13 +15,17 @@ from .image_template_distributor_py3 import ImageTemplateDistributor from .provisioning_error_py3 import ProvisioningError from .image_template_last_run_status_py3 import ImageTemplateLastRunStatus + from .image_template_identity_user_assigned_identities_value_py3 import ImageTemplateIdentityUserAssignedIdentitiesValue + from .image_template_identity_py3 import ImageTemplateIdentity from .image_template_py3 import ImageTemplate from .image_template_iso_source_py3 import ImageTemplateIsoSource from .image_template_platform_image_source_py3 import ImageTemplatePlatformImageSource from .image_template_managed_image_source_py3 import ImageTemplateManagedImageSource + from .image_template_shared_image_version_source_py3 import ImageTemplateSharedImageVersionSource from .image_template_shell_customizer_py3 import ImageTemplateShellCustomizer from .image_template_restart_customizer_py3 import ImageTemplateRestartCustomizer from .image_template_power_shell_customizer_py3 import ImageTemplatePowerShellCustomizer + from .image_template_file_customizer_py3 import ImageTemplateFileCustomizer from .image_template_managed_image_distributor_py3 import ImageTemplateManagedImageDistributor from .image_template_shared_image_distributor_py3 import ImageTemplateSharedImageDistributor from .image_template_vhd_distributor_py3 import ImageTemplateVhdDistributor @@ -40,13 +44,17 @@ from .image_template_distributor import ImageTemplateDistributor from .provisioning_error import ProvisioningError from .image_template_last_run_status import ImageTemplateLastRunStatus + from .image_template_identity_user_assigned_identities_value import ImageTemplateIdentityUserAssignedIdentitiesValue + from .image_template_identity import ImageTemplateIdentity from .image_template import ImageTemplate from .image_template_iso_source import ImageTemplateIsoSource from .image_template_platform_image_source import ImageTemplatePlatformImageSource from .image_template_managed_image_source import ImageTemplateManagedImageSource + from .image_template_shared_image_version_source import ImageTemplateSharedImageVersionSource from .image_template_shell_customizer import ImageTemplateShellCustomizer from .image_template_restart_customizer import ImageTemplateRestartCustomizer from .image_template_power_shell_customizer import ImageTemplatePowerShellCustomizer + from .image_template_file_customizer import ImageTemplateFileCustomizer from .image_template_managed_image_distributor import ImageTemplateManagedImageDistributor from .image_template_shared_image_distributor import ImageTemplateSharedImageDistributor from .image_template_vhd_distributor import ImageTemplateVhdDistributor @@ -62,6 +70,9 @@ from .image_template_paged import ImageTemplatePaged from .run_output_paged import RunOutputPaged from .operation_paged import OperationPaged +from .image_builder_client_enums import ( + ResourceIdentityType, +) __all__ = [ 'ImageTemplateSource', @@ -69,13 +80,17 @@ 'ImageTemplateDistributor', 'ProvisioningError', 'ImageTemplateLastRunStatus', + 'ImageTemplateIdentityUserAssignedIdentitiesValue', + 'ImageTemplateIdentity', 'ImageTemplate', 'ImageTemplateIsoSource', 'ImageTemplatePlatformImageSource', 'ImageTemplateManagedImageSource', + 'ImageTemplateSharedImageVersionSource', 'ImageTemplateShellCustomizer', 'ImageTemplateRestartCustomizer', 'ImageTemplatePowerShellCustomizer', + 'ImageTemplateFileCustomizer', 'ImageTemplateManagedImageDistributor', 'ImageTemplateSharedImageDistributor', 'ImageTemplateVhdDistributor', @@ -91,4 +106,5 @@ 'ImageTemplatePaged', 'RunOutputPaged', 'OperationPaged', + 'ResourceIdentityType', ] diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_builder_client_enums.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_builder_client_enums.py new file mode 100644 index 000000000000..aef91b6b5a8d --- /dev/null +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_builder_client_enums.py @@ -0,0 +1,18 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from enum import Enum + + +class ResourceIdentityType(str, Enum): + + user_assigned = "UserAssigned" + none = "None" diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template.py index 84b94ca5b7b8..ddd76b0ac33e 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template.py @@ -42,7 +42,7 @@ class ImageTemplate(Resource): :type distribute: list[~azure.mgmt.imagebuilder.models.ImageTemplateDistributor] :ivar provisioning_state: Provisioning state of the resource. Possible - values include: 'Creating', 'Succeeded', 'Failed', 'Deleting' + values include: 'Creating', 'Updating', 'Succeeded', 'Failed', 'Deleting' :vartype provisioning_state: str or ~azure.mgmt.imagebuilder.models.enum :ivar provisioning_error: Provisioning error, if any :vartype provisioning_error: @@ -51,6 +51,11 @@ class ImageTemplate(Resource): last executed. :vartype last_run_status: ~azure.mgmt.imagebuilder.models.ImageTemplateLastRunStatus + :param build_timeout_in_minutes: Maximum duration to wait while building + the image template. Default is 60 minutes. + :type build_timeout_in_minutes: int + :param identity: The identity of the image template, if configured. + :type identity: ~azure.mgmt.imagebuilder.models.ImageTemplateIdentity """ _validation = { @@ -77,6 +82,8 @@ class ImageTemplate(Resource): 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'provisioning_error': {'key': 'properties.provisioningError', 'type': 'ProvisioningError'}, 'last_run_status': {'key': 'properties.lastRunStatus', 'type': 'ImageTemplateLastRunStatus'}, + 'build_timeout_in_minutes': {'key': 'properties.buildTimeoutInMinutes', 'type': 'int'}, + 'identity': {'key': 'identity', 'type': 'ImageTemplateIdentity'}, } def __init__(self, **kwargs): @@ -87,3 +94,5 @@ def __init__(self, **kwargs): self.provisioning_state = None self.provisioning_error = None self.last_run_status = None + self.build_timeout_in_minutes = kwargs.get('build_timeout_in_minutes', None) + self.identity = kwargs.get('identity', None) diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_customizer.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_customizer.py index fceaf88ab196..42e7896e8f61 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_customizer.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_customizer.py @@ -17,7 +17,8 @@ class ImageTemplateCustomizer(Model): You probably want to use the sub-classes and not this class directly. Known sub-classes are: ImageTemplateShellCustomizer, - ImageTemplateRestartCustomizer, ImageTemplatePowerShellCustomizer + ImageTemplateRestartCustomizer, ImageTemplatePowerShellCustomizer, + ImageTemplateFileCustomizer All required parameters must be populated in order to send to Azure. @@ -38,7 +39,7 @@ class ImageTemplateCustomizer(Model): } _subtype_map = { - 'type': {'Shell': 'ImageTemplateShellCustomizer', 'WindowsRestart': 'ImageTemplateRestartCustomizer', 'PowerShell': 'ImageTemplatePowerShellCustomizer'} + 'type': {'Shell': 'ImageTemplateShellCustomizer', 'WindowsRestart': 'ImageTemplateRestartCustomizer', 'PowerShell': 'ImageTemplatePowerShellCustomizer', 'File': 'ImageTemplateFileCustomizer'} } def __init__(self, **kwargs): diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_customizer_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_customizer_py3.py index 2caa991a5e68..ee075d9afea9 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_customizer_py3.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_customizer_py3.py @@ -17,7 +17,8 @@ class ImageTemplateCustomizer(Model): You probably want to use the sub-classes and not this class directly. Known sub-classes are: ImageTemplateShellCustomizer, - ImageTemplateRestartCustomizer, ImageTemplatePowerShellCustomizer + ImageTemplateRestartCustomizer, ImageTemplatePowerShellCustomizer, + ImageTemplateFileCustomizer All required parameters must be populated in order to send to Azure. @@ -38,7 +39,7 @@ class ImageTemplateCustomizer(Model): } _subtype_map = { - 'type': {'Shell': 'ImageTemplateShellCustomizer', 'WindowsRestart': 'ImageTemplateRestartCustomizer', 'PowerShell': 'ImageTemplatePowerShellCustomizer'} + 'type': {'Shell': 'ImageTemplateShellCustomizer', 'WindowsRestart': 'ImageTemplateRestartCustomizer', 'PowerShell': 'ImageTemplatePowerShellCustomizer', 'File': 'ImageTemplateFileCustomizer'} } def __init__(self, *, name: str=None, **kwargs) -> None: diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_file_customizer.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_file_customizer.py new file mode 100644 index 000000000000..ee4361ba9782 --- /dev/null +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_file_customizer.py @@ -0,0 +1,49 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .image_template_customizer import ImageTemplateCustomizer + + +class ImageTemplateFileCustomizer(ImageTemplateCustomizer): + """Uploads files to VMs (Linux, Windows). Corresponds to Packer file + provisioner. + + All required parameters must be populated in order to send to Azure. + + :param name: Friendly Name to provide context on what this customization + step does + :type name: str + :param type: Required. Constant filled by server. + :type type: str + :param source_uri: The URI of the file to be uploaded for customizing the + VM. It can be a github link, SAS URI for Azure Storage, etc + :type source_uri: str + :param destination: The absolute path (with existing directory structure) + where the file will be uploaded to in the VM + :type destination: str + """ + + _validation = { + 'type': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'source_uri': {'key': 'sourceUri', 'type': 'str'}, + 'destination': {'key': 'destination', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ImageTemplateFileCustomizer, self).__init__(**kwargs) + self.source_uri = kwargs.get('source_uri', None) + self.destination = kwargs.get('destination', None) + self.type = 'File' diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_file_customizer_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_file_customizer_py3.py new file mode 100644 index 000000000000..dcebc7a1f2ff --- /dev/null +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_file_customizer_py3.py @@ -0,0 +1,49 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .image_template_customizer_py3 import ImageTemplateCustomizer + + +class ImageTemplateFileCustomizer(ImageTemplateCustomizer): + """Uploads files to VMs (Linux, Windows). Corresponds to Packer file + provisioner. + + All required parameters must be populated in order to send to Azure. + + :param name: Friendly Name to provide context on what this customization + step does + :type name: str + :param type: Required. Constant filled by server. + :type type: str + :param source_uri: The URI of the file to be uploaded for customizing the + VM. It can be a github link, SAS URI for Azure Storage, etc + :type source_uri: str + :param destination: The absolute path (with existing directory structure) + where the file will be uploaded to in the VM + :type destination: str + """ + + _validation = { + 'type': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'source_uri': {'key': 'sourceUri', 'type': 'str'}, + 'destination': {'key': 'destination', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, source_uri: str=None, destination: str=None, **kwargs) -> None: + super(ImageTemplateFileCustomizer, self).__init__(name=name, **kwargs) + self.source_uri = source_uri + self.destination = destination + self.type = 'File' diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity.py new file mode 100644 index 000000000000..c062dd37993d --- /dev/null +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ImageTemplateIdentity(Model): + """Identity for the image template. + + :param type: The type of identity used for the image template. The type + 'None' will remove any identities from the image template. Possible values + include: 'UserAssigned', 'None' + :type type: str or ~azure.mgmt.imagebuilder.models.ResourceIdentityType + :param user_assigned_identities: The list of user identities associated + with the image template. The user identity dictionary key references will + be ARM resource ids in the form: + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + :type user_assigned_identities: dict[str, + ~azure.mgmt.imagebuilder.models.ImageTemplateIdentityUserAssignedIdentitiesValue] + """ + + _attribute_map = { + 'type': {'key': 'type', 'type': 'ResourceIdentityType'}, + 'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{ImageTemplateIdentityUserAssignedIdentitiesValue}'}, + } + + def __init__(self, **kwargs): + super(ImageTemplateIdentity, self).__init__(**kwargs) + self.type = kwargs.get('type', None) + self.user_assigned_identities = kwargs.get('user_assigned_identities', None) diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity_py3.py new file mode 100644 index 000000000000..79b308d7cb24 --- /dev/null +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity_py3.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ImageTemplateIdentity(Model): + """Identity for the image template. + + :param type: The type of identity used for the image template. The type + 'None' will remove any identities from the image template. Possible values + include: 'UserAssigned', 'None' + :type type: str or ~azure.mgmt.imagebuilder.models.ResourceIdentityType + :param user_assigned_identities: The list of user identities associated + with the image template. The user identity dictionary key references will + be ARM resource ids in the form: + '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + :type user_assigned_identities: dict[str, + ~azure.mgmt.imagebuilder.models.ImageTemplateIdentityUserAssignedIdentitiesValue] + """ + + _attribute_map = { + 'type': {'key': 'type', 'type': 'ResourceIdentityType'}, + 'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{ImageTemplateIdentityUserAssignedIdentitiesValue}'}, + } + + def __init__(self, *, type=None, user_assigned_identities=None, **kwargs) -> None: + super(ImageTemplateIdentity, self).__init__(**kwargs) + self.type = type + self.user_assigned_identities = user_assigned_identities diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity_user_assigned_identities_value.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity_user_assigned_identities_value.py new file mode 100644 index 000000000000..018a2492a54a --- /dev/null +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity_user_assigned_identities_value.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ImageTemplateIdentityUserAssignedIdentitiesValue(Model): + """ImageTemplateIdentityUserAssignedIdentitiesValue. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar principal_id: The principal id of user assigned identity. + :vartype principal_id: str + :ivar client_id: The client id of user assigned identity. + :vartype client_id: str + """ + + _validation = { + 'principal_id': {'readonly': True}, + 'client_id': {'readonly': True}, + } + + _attribute_map = { + 'principal_id': {'key': 'principalId', 'type': 'str'}, + 'client_id': {'key': 'clientId', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ImageTemplateIdentityUserAssignedIdentitiesValue, self).__init__(**kwargs) + self.principal_id = None + self.client_id = None diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity_user_assigned_identities_value_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity_user_assigned_identities_value_py3.py new file mode 100644 index 000000000000..906373e8c49d --- /dev/null +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_identity_user_assigned_identities_value_py3.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ImageTemplateIdentityUserAssignedIdentitiesValue(Model): + """ImageTemplateIdentityUserAssignedIdentitiesValue. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar principal_id: The principal id of user assigned identity. + :vartype principal_id: str + :ivar client_id: The client id of user assigned identity. + :vartype client_id: str + """ + + _validation = { + 'principal_id': {'readonly': True}, + 'client_id': {'readonly': True}, + } + + _attribute_map = { + 'principal_id': {'key': 'principalId', 'type': 'str'}, + 'client_id': {'key': 'clientId', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(ImageTemplateIdentityUserAssignedIdentitiesValue, self).__init__(**kwargs) + self.principal_id = None + self.client_id = None diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_iso_source.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_iso_source.py index 7ec45be07123..66ef6def91bb 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_iso_source.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_iso_source.py @@ -36,7 +36,7 @@ class ImageTemplateIsoSource(ImageTemplateSource): _attribute_map = { 'type': {'key': 'type', 'type': 'str'}, - 'source_uri': {'key': 'sourceURI', 'type': 'str'}, + 'source_uri': {'key': 'sourceUri', 'type': 'str'}, 'sha256_checksum': {'key': 'sha256Checksum', 'type': 'str'}, } diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_iso_source_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_iso_source_py3.py index dd5221aef8cd..174dea8fb688 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_iso_source_py3.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_iso_source_py3.py @@ -36,7 +36,7 @@ class ImageTemplateIsoSource(ImageTemplateSource): _attribute_map = { 'type': {'key': 'type', 'type': 'str'}, - 'source_uri': {'key': 'sourceURI', 'type': 'str'}, + 'source_uri': {'key': 'sourceUri', 'type': 'str'}, 'sha256_checksum': {'key': 'sha256Checksum', 'type': 'str'}, } diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_power_shell_customizer.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_power_shell_customizer.py index b1cbe1fe95db..03403ab95e82 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_power_shell_customizer.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_power_shell_customizer.py @@ -14,7 +14,7 @@ class ImageTemplatePowerShellCustomizer(ImageTemplateCustomizer): """Runs the specified PowerShell on the VM (Windows). Corresponds to Packer - powershell provisioner. Exactly one of 'script' or 'inline' can be + powershell provisioner. Exactly one of 'scriptUri' or 'inline' can be specified. All required parameters must be populated in order to send to Azure. @@ -24,9 +24,9 @@ class ImageTemplatePowerShellCustomizer(ImageTemplateCustomizer): :type name: str :param type: Required. Constant filled by server. :type type: str - :param script: The PowerShell script to be run for customizing. It can be - a github link, SAS URI for Azure Storage, etc - :type script: str + :param script_uri: URI of the PowerShell script to be run for customizing. + It can be a github link, SAS URI for Azure Storage, etc + :type script_uri: str :param inline: Array of PowerShell commands to execute :type inline: list[str] :param valid_exit_codes: Valid exit codes for the PowerShell script. @@ -41,14 +41,14 @@ class ImageTemplatePowerShellCustomizer(ImageTemplateCustomizer): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'script': {'key': 'script', 'type': 'str'}, + 'script_uri': {'key': 'scriptUri', 'type': 'str'}, 'inline': {'key': 'inline', 'type': '[str]'}, 'valid_exit_codes': {'key': 'validExitCodes', 'type': '[int]'}, } def __init__(self, **kwargs): super(ImageTemplatePowerShellCustomizer, self).__init__(**kwargs) - self.script = kwargs.get('script', None) + self.script_uri = kwargs.get('script_uri', None) self.inline = kwargs.get('inline', None) self.valid_exit_codes = kwargs.get('valid_exit_codes', None) self.type = 'PowerShell' diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_power_shell_customizer_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_power_shell_customizer_py3.py index 3d06cc06a8d4..65f0b071bd0b 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_power_shell_customizer_py3.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_power_shell_customizer_py3.py @@ -14,7 +14,7 @@ class ImageTemplatePowerShellCustomizer(ImageTemplateCustomizer): """Runs the specified PowerShell on the VM (Windows). Corresponds to Packer - powershell provisioner. Exactly one of 'script' or 'inline' can be + powershell provisioner. Exactly one of 'scriptUri' or 'inline' can be specified. All required parameters must be populated in order to send to Azure. @@ -24,9 +24,9 @@ class ImageTemplatePowerShellCustomizer(ImageTemplateCustomizer): :type name: str :param type: Required. Constant filled by server. :type type: str - :param script: The PowerShell script to be run for customizing. It can be - a github link, SAS URI for Azure Storage, etc - :type script: str + :param script_uri: URI of the PowerShell script to be run for customizing. + It can be a github link, SAS URI for Azure Storage, etc + :type script_uri: str :param inline: Array of PowerShell commands to execute :type inline: list[str] :param valid_exit_codes: Valid exit codes for the PowerShell script. @@ -41,14 +41,14 @@ class ImageTemplatePowerShellCustomizer(ImageTemplateCustomizer): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'script': {'key': 'script', 'type': 'str'}, + 'script_uri': {'key': 'scriptUri', 'type': 'str'}, 'inline': {'key': 'inline', 'type': '[str]'}, 'valid_exit_codes': {'key': 'validExitCodes', 'type': '[int]'}, } - def __init__(self, *, name: str=None, script: str=None, inline=None, valid_exit_codes=None, **kwargs) -> None: + def __init__(self, *, name: str=None, script_uri: str=None, inline=None, valid_exit_codes=None, **kwargs) -> None: super(ImageTemplatePowerShellCustomizer, self).__init__(name=name, **kwargs) - self.script = script + self.script_uri = script_uri self.inline = inline self.valid_exit_codes = valid_exit_codes self.type = 'PowerShell' diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_py3.py index 0ebd7480e8c3..6168cf4ed053 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_py3.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_py3.py @@ -42,7 +42,7 @@ class ImageTemplate(Resource): :type distribute: list[~azure.mgmt.imagebuilder.models.ImageTemplateDistributor] :ivar provisioning_state: Provisioning state of the resource. Possible - values include: 'Creating', 'Succeeded', 'Failed', 'Deleting' + values include: 'Creating', 'Updating', 'Succeeded', 'Failed', 'Deleting' :vartype provisioning_state: str or ~azure.mgmt.imagebuilder.models.enum :ivar provisioning_error: Provisioning error, if any :vartype provisioning_error: @@ -51,6 +51,11 @@ class ImageTemplate(Resource): last executed. :vartype last_run_status: ~azure.mgmt.imagebuilder.models.ImageTemplateLastRunStatus + :param build_timeout_in_minutes: Maximum duration to wait while building + the image template. Default is 60 minutes. + :type build_timeout_in_minutes: int + :param identity: The identity of the image template, if configured. + :type identity: ~azure.mgmt.imagebuilder.models.ImageTemplateIdentity """ _validation = { @@ -77,9 +82,11 @@ class ImageTemplate(Resource): 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'provisioning_error': {'key': 'properties.provisioningError', 'type': 'ProvisioningError'}, 'last_run_status': {'key': 'properties.lastRunStatus', 'type': 'ImageTemplateLastRunStatus'}, + 'build_timeout_in_minutes': {'key': 'properties.buildTimeoutInMinutes', 'type': 'int'}, + 'identity': {'key': 'identity', 'type': 'ImageTemplateIdentity'}, } - def __init__(self, *, location: str, source, distribute, tags=None, customize=None, **kwargs) -> None: + def __init__(self, *, location: str, source, distribute, tags=None, customize=None, build_timeout_in_minutes: int=None, identity=None, **kwargs) -> None: super(ImageTemplate, self).__init__(location=location, tags=tags, **kwargs) self.source = source self.customize = customize @@ -87,3 +94,5 @@ def __init__(self, *, location: str, source, distribute, tags=None, customize=No self.provisioning_state = None self.provisioning_error = None self.last_run_status = None + self.build_timeout_in_minutes = build_timeout_in_minutes + self.identity = identity diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shared_image_version_source.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shared_image_version_source.py new file mode 100644 index 000000000000..ed01f8219499 --- /dev/null +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shared_image_version_source.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .image_template_source import ImageTemplateSource + + +class ImageTemplateSharedImageVersionSource(ImageTemplateSource): + """Describes an image source that is an image version in a shared image + gallery. + + All required parameters must be populated in order to send to Azure. + + :param type: Required. Constant filled by server. + :type type: str + :param image_version_id: Required. ARM resource id of the image version in + the shared image gallery + :type image_version_id: str + """ + + _validation = { + 'type': {'required': True}, + 'image_version_id': {'required': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + 'image_version_id': {'key': 'imageVersionId', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ImageTemplateSharedImageVersionSource, self).__init__(**kwargs) + self.image_version_id = kwargs.get('image_version_id', None) + self.type = 'SharedImageVersion' diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shared_image_version_source_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shared_image_version_source_py3.py new file mode 100644 index 000000000000..a9d536e81348 --- /dev/null +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shared_image_version_source_py3.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .image_template_source_py3 import ImageTemplateSource + + +class ImageTemplateSharedImageVersionSource(ImageTemplateSource): + """Describes an image source that is an image version in a shared image + gallery. + + All required parameters must be populated in order to send to Azure. + + :param type: Required. Constant filled by server. + :type type: str + :param image_version_id: Required. ARM resource id of the image version in + the shared image gallery + :type image_version_id: str + """ + + _validation = { + 'type': {'required': True}, + 'image_version_id': {'required': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + 'image_version_id': {'key': 'imageVersionId', 'type': 'str'}, + } + + def __init__(self, *, image_version_id: str, **kwargs) -> None: + super(ImageTemplateSharedImageVersionSource, self).__init__(**kwargs) + self.image_version_id = image_version_id + self.type = 'SharedImageVersion' diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shell_customizer.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shell_customizer.py index 6691a668579b..fdf6a7abc573 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shell_customizer.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shell_customizer.py @@ -14,7 +14,7 @@ class ImageTemplateShellCustomizer(ImageTemplateCustomizer): """Runs a shell script during the customization phase (Linux). Corresponds to - Packer shell provisioner. Exactly one of 'script' or 'inline' can be + Packer shell provisioner. Exactly one of 'scriptUri' or 'inline' can be specified. All required parameters must be populated in order to send to Azure. @@ -24,9 +24,9 @@ class ImageTemplateShellCustomizer(ImageTemplateCustomizer): :type name: str :param type: Required. Constant filled by server. :type type: str - :param script: The shell script to be run for customizing. It can be a - github link, SAS URI for Azure Storage, etc - :type script: str + :param script_uri: URI of the shell script to be run for customizing. It + can be a github link, SAS URI for Azure Storage, etc + :type script_uri: str :param inline: Array of shell commands to execute :type inline: list[str] """ @@ -38,12 +38,12 @@ class ImageTemplateShellCustomizer(ImageTemplateCustomizer): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'script': {'key': 'script', 'type': 'str'}, + 'script_uri': {'key': 'scriptUri', 'type': 'str'}, 'inline': {'key': 'inline', 'type': '[str]'}, } def __init__(self, **kwargs): super(ImageTemplateShellCustomizer, self).__init__(**kwargs) - self.script = kwargs.get('script', None) + self.script_uri = kwargs.get('script_uri', None) self.inline = kwargs.get('inline', None) self.type = 'Shell' diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shell_customizer_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shell_customizer_py3.py index 43b571794473..f19ef8a2f609 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shell_customizer_py3.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_shell_customizer_py3.py @@ -14,7 +14,7 @@ class ImageTemplateShellCustomizer(ImageTemplateCustomizer): """Runs a shell script during the customization phase (Linux). Corresponds to - Packer shell provisioner. Exactly one of 'script' or 'inline' can be + Packer shell provisioner. Exactly one of 'scriptUri' or 'inline' can be specified. All required parameters must be populated in order to send to Azure. @@ -24,9 +24,9 @@ class ImageTemplateShellCustomizer(ImageTemplateCustomizer): :type name: str :param type: Required. Constant filled by server. :type type: str - :param script: The shell script to be run for customizing. It can be a - github link, SAS URI for Azure Storage, etc - :type script: str + :param script_uri: URI of the shell script to be run for customizing. It + can be a github link, SAS URI for Azure Storage, etc + :type script_uri: str :param inline: Array of shell commands to execute :type inline: list[str] """ @@ -38,12 +38,12 @@ class ImageTemplateShellCustomizer(ImageTemplateCustomizer): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'script': {'key': 'script', 'type': 'str'}, + 'script_uri': {'key': 'scriptUri', 'type': 'str'}, 'inline': {'key': 'inline', 'type': '[str]'}, } - def __init__(self, *, name: str=None, script: str=None, inline=None, **kwargs) -> None: + def __init__(self, *, name: str=None, script_uri: str=None, inline=None, **kwargs) -> None: super(ImageTemplateShellCustomizer, self).__init__(name=name, **kwargs) - self.script = script + self.script_uri = script_uri self.inline = inline self.type = 'Shell' diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_source.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_source.py index f5e47b95272a..8a2442877d96 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_source.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_source.py @@ -17,7 +17,7 @@ class ImageTemplateSource(Model): You probably want to use the sub-classes and not this class directly. Known sub-classes are: ImageTemplateIsoSource, ImageTemplatePlatformImageSource, - ImageTemplateManagedImageSource + ImageTemplateManagedImageSource, ImageTemplateSharedImageVersionSource All required parameters must be populated in order to send to Azure. @@ -34,7 +34,7 @@ class ImageTemplateSource(Model): } _subtype_map = { - 'type': {'ISO': 'ImageTemplateIsoSource', 'PlatformImage': 'ImageTemplatePlatformImageSource', 'ManagedImage': 'ImageTemplateManagedImageSource'} + 'type': {'ISO': 'ImageTemplateIsoSource', 'PlatformImage': 'ImageTemplatePlatformImageSource', 'ManagedImage': 'ImageTemplateManagedImageSource', 'SharedImageVersion': 'ImageTemplateSharedImageVersionSource'} } def __init__(self, **kwargs): diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_source_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_source_py3.py index f9d556710ccb..65dd23cca393 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_source_py3.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_source_py3.py @@ -17,7 +17,7 @@ class ImageTemplateSource(Model): You probably want to use the sub-classes and not this class directly. Known sub-classes are: ImageTemplateIsoSource, ImageTemplatePlatformImageSource, - ImageTemplateManagedImageSource + ImageTemplateManagedImageSource, ImageTemplateSharedImageVersionSource All required parameters must be populated in order to send to Azure. @@ -34,7 +34,7 @@ class ImageTemplateSource(Model): } _subtype_map = { - 'type': {'ISO': 'ImageTemplateIsoSource', 'PlatformImage': 'ImageTemplatePlatformImageSource', 'ManagedImage': 'ImageTemplateManagedImageSource'} + 'type': {'ISO': 'ImageTemplateIsoSource', 'PlatformImage': 'ImageTemplatePlatformImageSource', 'ManagedImage': 'ImageTemplateManagedImageSource', 'SharedImageVersion': 'ImageTemplateSharedImageVersionSource'} } def __init__(self, **kwargs) -> None: diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_update_parameters.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_update_parameters.py index 3a9e22237a3f..cc25bf25a753 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_update_parameters.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_update_parameters.py @@ -15,14 +15,18 @@ class ImageTemplateUpdateParameters(Model): """Parameters for updating an image template. + :param identity: The identity of the image template, if configured. + :type identity: ~azure.mgmt.imagebuilder.models.ImageTemplateIdentity :param tags: The user-specified tags associated with the image template. :type tags: dict[str, str] """ _attribute_map = { + 'identity': {'key': 'identity', 'type': 'ImageTemplateIdentity'}, 'tags': {'key': 'tags', 'type': '{str}'}, } def __init__(self, **kwargs): super(ImageTemplateUpdateParameters, self).__init__(**kwargs) + self.identity = kwargs.get('identity', None) self.tags = kwargs.get('tags', None) diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_update_parameters_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_update_parameters_py3.py index 9de169075568..37a8859d7bf3 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_update_parameters_py3.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/image_template_update_parameters_py3.py @@ -15,14 +15,18 @@ class ImageTemplateUpdateParameters(Model): """Parameters for updating an image template. + :param identity: The identity of the image template, if configured. + :type identity: ~azure.mgmt.imagebuilder.models.ImageTemplateIdentity :param tags: The user-specified tags associated with the image template. :type tags: dict[str, str] """ _attribute_map = { + 'identity': {'key': 'identity', 'type': 'ImageTemplateIdentity'}, 'tags': {'key': 'tags', 'type': '{str}'}, } - def __init__(self, *, tags=None, **kwargs) -> None: + def __init__(self, *, identity=None, tags=None, **kwargs) -> None: super(ImageTemplateUpdateParameters, self).__init__(**kwargs) + self.identity = identity self.tags = tags diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/provisioning_error.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/provisioning_error.py index 8896952275ae..a60e75487daa 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/provisioning_error.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/provisioning_error.py @@ -17,9 +17,9 @@ class ProvisioningError(Model): :param provisioning_error_code: Error code of the provisioning failure. Possible values include: 'BadSourceType', 'BadPIRSource', 'BadISOSource', - 'BadManagedImageSource', 'BadCustomizerType', 'UnsupportedCustomizerType', - 'NoCustomizerScript', 'BadDistributeType', 'BadSharedImageDistribute', - 'ServerError', 'Other' + 'BadManagedImageSource', 'BadSharedImageVersionSource', + 'BadCustomizerType', 'UnsupportedCustomizerType', 'NoCustomizerScript', + 'BadDistributeType', 'BadSharedImageDistribute', 'ServerError', 'Other' :type provisioning_error_code: str or ~azure.mgmt.imagebuilder.models.enum :param message: Verbose error message about the provisioning failure :type message: str diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/provisioning_error_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/provisioning_error_py3.py index e11e0b032d64..99dc2a93291f 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/provisioning_error_py3.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/provisioning_error_py3.py @@ -17,9 +17,9 @@ class ProvisioningError(Model): :param provisioning_error_code: Error code of the provisioning failure. Possible values include: 'BadSourceType', 'BadPIRSource', 'BadISOSource', - 'BadManagedImageSource', 'BadCustomizerType', 'UnsupportedCustomizerType', - 'NoCustomizerScript', 'BadDistributeType', 'BadSharedImageDistribute', - 'ServerError', 'Other' + 'BadManagedImageSource', 'BadSharedImageVersionSource', + 'BadCustomizerType', 'UnsupportedCustomizerType', 'NoCustomizerScript', + 'BadDistributeType', 'BadSharedImageDistribute', 'ServerError', 'Other' :type provisioning_error_code: str or ~azure.mgmt.imagebuilder.models.enum :param message: Verbose error message about the provisioning failure :type message: str diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/run_output.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/run_output.py index 7231c5d8c04a..6e2ca49c58c5 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/run_output.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/run_output.py @@ -31,7 +31,7 @@ class RunOutput(SubResource): :param artifact_uri: The location URI of the artifact. :type artifact_uri: str :ivar provisioning_state: Provisioning state of the resource. Possible - values include: 'Creating', 'Succeeded', 'Failed', 'Deleting' + values include: 'Creating', 'Updating', 'Succeeded', 'Failed', 'Deleting' :vartype provisioning_state: str or ~azure.mgmt.imagebuilder.models.enum """ diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/run_output_py3.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/run_output_py3.py index fb757c77f8eb..c9f1f16c04b6 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/run_output_py3.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/run_output_py3.py @@ -31,7 +31,7 @@ class RunOutput(SubResource): :param artifact_uri: The location URI of the artifact. :type artifact_uri: str :ivar provisioning_state: Provisioning state of the resource. Possible - values include: 'Creating', 'Succeeded', 'Failed', 'Deleting' + values include: 'Creating', 'Updating', 'Succeeded', 'Failed', 'Deleting' :vartype provisioning_state: str or ~azure.mgmt.imagebuilder.models.enum """ diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/operations.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/operations.py index 8d4e3c85810c..03423782dc42 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/operations.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/operations.py @@ -22,7 +22,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2019-02-01-preview". + :ivar api_version: Client Api Version. Constant value: "2019-05-01-preview". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-02-01-preview" + self.api_version = "2019-05-01-preview" self.config = config diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/virtual_machine_image_templates_operations.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/virtual_machine_image_templates_operations.py index c02049c88774..03ce517ce451 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/virtual_machine_image_templates_operations.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/virtual_machine_image_templates_operations.py @@ -24,7 +24,7 @@ class VirtualMachineImageTemplatesOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2019-02-01-preview". + :ivar api_version: Client Api Version. Constant value: "2019-05-01-preview". """ models = models @@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-02-01-preview" + self.api_version = "2019-05-01-preview" self.config = config @@ -271,29 +271,10 @@ def get_long_running_output(response): return LROPoller(self._client, raw_result, get_long_running_output, polling_method) create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.VirtualMachineImages/imageTemplates/{imageTemplateName}'} - def update( - self, resource_group_name, image_template_name, tags=None, custom_headers=None, raw=False, **operation_config): - """Update the tags for this Virtual Machine Image Template. - :param resource_group_name: The name of the resource group. - :type resource_group_name: str - :param image_template_name: The name of the image Template - :type image_template_name: str - :param tags: The user-specified tags associated with the image - template. - :type tags: dict[str, str] - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: ImageTemplate or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.imagebuilder.models.ImageTemplate or - ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ApiErrorException` - """ - parameters = models.ImageTemplateUpdateParameters(tags=tags) + def _update_initial( + self, resource_group_name, image_template_name, identity=None, tags=None, custom_headers=None, raw=False, **operation_config): + parameters = models.ImageTemplateUpdateParameters(identity=identity, tags=tags) # Construct URL url = self.update.metadata['url'] @@ -326,7 +307,7 @@ def update( request = self._client.patch(url, query_parameters, header_parameters, body_content) response = self._client.send(request, stream=False, **operation_config) - if response.status_code not in [200]: + if response.status_code not in [200, 202]: raise models.ApiErrorException(self._deserialize, response) deserialized = None @@ -339,6 +320,60 @@ def update( return client_raw_response return deserialized + + def update( + self, resource_group_name, image_template_name, identity=None, tags=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Update the tags for this Virtual Machine Image Template. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param image_template_name: The name of the image Template + :type image_template_name: str + :param identity: The identity of the image template, if configured. + :type identity: ~azure.mgmt.imagebuilder.models.ImageTemplateIdentity + :param tags: The user-specified tags associated with the image + template. + :type tags: dict[str, str] + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns ImageTemplate or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.imagebuilder.models.ImageTemplate] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.imagebuilder.models.ImageTemplate]] + :raises: + :class:`ApiErrorException` + """ + raw_result = self._update_initial( + resource_group_name=resource_group_name, + image_template_name=image_template_name, + identity=identity, + tags=tags, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('ImageTemplate', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.VirtualMachineImages/imageTemplates/{imageTemplateName}'} def get( diff --git a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/version.py b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/version.py index e0ec669828cb..9bd1dfac7ecb 100644 --- a/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/version.py +++ b/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.1.0" +VERSION = "0.2.0"