Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ImageTemplate(Resource):
: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.
the image template. Omit or specify 0 to use the default (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
Expand All @@ -68,6 +68,7 @@ class ImageTemplate(Resource):
'provisioning_state': {'readonly': True},
'provisioning_error': {'readonly': True},
'last_run_status': {'readonly': True},
'build_timeout_in_minutes': {'maximum': 960, 'minimum': 0},
}

_attribute_map = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ImageTemplateDistributor(Model):
"""

_validation = {
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_]{1,64}$'},
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_.]{1,64}$'},
'type': {'required': True},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ImageTemplateDistributor(Model):
"""

_validation = {
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_]{1,64}$'},
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_.]{1,64}$'},
'type': {'required': True},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ class ImageTemplateFileCustomizer(ImageTemplateCustomizer):
: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
:param destination: The absolute path to a file (with nested directory
structures already created) where the file (from sourceUri) will be
uploaded to in the VM
:type destination: str
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ class ImageTemplateFileCustomizer(ImageTemplateCustomizer):
: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
:param destination: The absolute path to a file (with nested directory
structures already created) where the file (from sourceUri) will be
uploaded to in the VM
:type destination: str
"""

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ImageTemplateManagedImageDistributor(ImageTemplateDistributor):
"""

_validation = {
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_]{1,64}$'},
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_.]{1,64}$'},
'type': {'required': True},
'image_id': {'required': True},
'location': {'required': True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ImageTemplateManagedImageDistributor(ImageTemplateDistributor):
"""

_validation = {
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_]{1,64}$'},
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_.]{1,64}$'},
'type': {'required': True},
'image_id': {'required': True},
'location': {'required': True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ImageTemplate(Resource):
: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.
the image template. Omit or specify 0 to use the default (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
Expand All @@ -68,6 +68,7 @@ class ImageTemplate(Resource):
'provisioning_state': {'readonly': True},
'provisioning_error': {'readonly': True},
'last_run_status': {'readonly': True},
'build_timeout_in_minutes': {'maximum': 960, 'minimum': 0},
}

_attribute_map = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ImageTemplateSharedImageDistributor(ImageTemplateDistributor):
"""

_validation = {
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_]{1,64}$'},
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_.]{1,64}$'},
'type': {'required': True},
'gallery_image_id': {'required': True},
'replication_regions': {'required': True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ImageTemplateSharedImageDistributor(ImageTemplateDistributor):
"""

_validation = {
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_]{1,64}$'},
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_.]{1,64}$'},
'type': {'required': True},
'gallery_image_id': {'required': True},
'replication_regions': {'required': True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ImageTemplateVhdDistributor(ImageTemplateDistributor):
"""

_validation = {
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_]{1,64}$'},
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_.]{1,64}$'},
'type': {'required': True},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ImageTemplateVhdDistributor(ImageTemplateDistributor):
"""

_validation = {
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_]{1,64}$'},
'run_output_name': {'required': True, 'pattern': r'^[A-Za-z0-9-_.]{1,64}$'},
'type': {'required': True},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def _create_or_update_initial(
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_]{1,64}$')
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_.]{1,64}$')
}
url = self._client.format_url(url, **path_format_arguments)

Expand Down Expand Up @@ -281,7 +281,7 @@ def _update_initial(
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_]{1,64}$')
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_.]{1,64}$')
}
url = self._client.format_url(url, **path_format_arguments)

Expand Down Expand Up @@ -400,7 +400,7 @@ def get(
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_]{1,64}$')
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_.]{1,64}$')
}
url = self._client.format_url(url, **path_format_arguments)

Expand Down Expand Up @@ -445,7 +445,7 @@ def _delete_initial(
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_]{1,64}$')
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_.]{1,64}$')
}
url = self._client.format_url(url, **path_format_arguments)

Expand Down Expand Up @@ -523,7 +523,7 @@ def _run_initial(
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_]{1,64}$')
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_.]{1,64}$')
}
url = self._client.format_url(url, **path_format_arguments)

Expand Down Expand Up @@ -620,7 +620,7 @@ def internal_paging(next_link=None, raw=False):
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_]{1,64}$')
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_.]{1,64}$')
}
url = self._client.format_url(url, **path_format_arguments)

Expand Down Expand Up @@ -688,8 +688,8 @@ def get_run_output(
path_format_arguments = {
'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_]{1,64}$'),
'runOutputName': self._serialize.url("run_output_name", run_output_name, 'str', pattern=r'^[A-Za-z0-9-_]{1,64}$')
'imageTemplateName': self._serialize.url("image_template_name", image_template_name, 'str', pattern=r'^[A-Za-z0-9-_.]{1,64}$'),
'runOutputName': self._serialize.url("run_output_name", run_output_name, 'str', pattern=r'^[A-Za-z0-9-_.]{1,64}$')
}
url = self._client.format_url(url, **path_format_arguments)

Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "0.2.0"
VERSION = "0.2.1"