Skip to content

Commit 984db8e

Browse files
author
SDKAuto
committed
CodeGen from PR 13120 in Azure/azure-rest-api-specs
Merge e7161ade0ecb69834ab1532ee6ccecd50153db0c into 0f59438
1 parent 19efd8c commit 984db8e

File tree

16 files changed

+1193
-138
lines changed

16 files changed

+1193
-138
lines changed

sdk/resources/azure-mgmt-resource/azure/mgmt/resource/deploymentscripts/v2019_10_01_preview/models/_models.py

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ class AzureCliScript(DeploymentScript):
150150
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
151151
:param cleanup_preference: The clean up preference when the script
152152
execution gets in a terminal state. Default setting is 'Always'. Possible
153-
values include: 'Always', 'OnSuccess', 'OnExpiration'
153+
values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
154+
"Always" .
154155
:type cleanup_preference: str or
155156
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
156157
:ivar provisioning_state: State of the script execution. This only appears
@@ -184,10 +185,10 @@ class AzureCliScript(DeploymentScript):
184185
:param retention_interval: Required. Interval for which the service
185186
retains the script resource after it reaches a terminal state. Resource
186187
will be deleted when this duration expires. Duration is based on ISO 8601
187-
pattern (for example P7D means one week).
188+
pattern (for example P1D means one day).
188189
:type retention_interval: timedelta
189190
:param timeout: Maximum allowed script execution time specified in ISO
190-
8601 format. Default value is PT1H
191+
8601 format. Default value is P1D. Default value: "P1D" .
191192
:type timeout: timedelta
192193
:param az_cli_version: Required. Azure CLI module version to be used.
193194
:type az_cli_version: str
@@ -239,7 +240,7 @@ def __init__(self, **kwargs):
239240
super(AzureCliScript, self).__init__(**kwargs)
240241
self.container_settings = kwargs.get('container_settings', None)
241242
self.storage_account_settings = kwargs.get('storage_account_settings', None)
242-
self.cleanup_preference = kwargs.get('cleanup_preference', None)
243+
self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
243244
self.provisioning_state = None
244245
self.status = None
245246
self.outputs = None
@@ -250,7 +251,7 @@ def __init__(self, **kwargs):
250251
self.environment_variables = kwargs.get('environment_variables', None)
251252
self.force_update_tag = kwargs.get('force_update_tag', None)
252253
self.retention_interval = kwargs.get('retention_interval', None)
253-
self.timeout = kwargs.get('timeout', None)
254+
self.timeout = kwargs.get('timeout', "P1D")
254255
self.az_cli_version = kwargs.get('az_cli_version', None)
255256
self.kind = 'AzureCLI'
256257

@@ -291,7 +292,8 @@ class AzurePowerShellScript(DeploymentScript):
291292
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
292293
:param cleanup_preference: The clean up preference when the script
293294
execution gets in a terminal state. Default setting is 'Always'. Possible
294-
values include: 'Always', 'OnSuccess', 'OnExpiration'
295+
values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
296+
"Always" .
295297
:type cleanup_preference: str or
296298
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
297299
:ivar provisioning_state: State of the script execution. This only appears
@@ -325,10 +327,10 @@ class AzurePowerShellScript(DeploymentScript):
325327
:param retention_interval: Required. Interval for which the service
326328
retains the script resource after it reaches a terminal state. Resource
327329
will be deleted when this duration expires. Duration is based on ISO 8601
328-
pattern (for example P7D means one week).
330+
pattern (for example P1D means one day).
329331
:type retention_interval: timedelta
330332
:param timeout: Maximum allowed script execution time specified in ISO
331-
8601 format. Default value is PT1H
333+
8601 format. Default value is P1D. Default value: "P1D" .
332334
:type timeout: timedelta
333335
:param az_power_shell_version: Required. Azure PowerShell module version
334336
to be used.
@@ -381,7 +383,7 @@ def __init__(self, **kwargs):
381383
super(AzurePowerShellScript, self).__init__(**kwargs)
382384
self.container_settings = kwargs.get('container_settings', None)
383385
self.storage_account_settings = kwargs.get('storage_account_settings', None)
384-
self.cleanup_preference = kwargs.get('cleanup_preference', None)
386+
self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
385387
self.provisioning_state = None
386388
self.status = None
387389
self.outputs = None
@@ -392,7 +394,7 @@ def __init__(self, **kwargs):
392394
self.environment_variables = kwargs.get('environment_variables', None)
393395
self.force_update_tag = kwargs.get('force_update_tag', None)
394396
self.retention_interval = kwargs.get('retention_interval', None)
395-
self.timeout = kwargs.get('timeout', None)
397+
self.timeout = kwargs.get('timeout', "P1D")
396398
self.az_power_shell_version = kwargs.get('az_power_shell_version', None)
397399
self.kind = 'AzurePowerShell'
398400

@@ -450,7 +452,8 @@ class DeploymentScriptPropertiesBase(Model):
450452
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
451453
:param cleanup_preference: The clean up preference when the script
452454
execution gets in a terminal state. Default setting is 'Always'. Possible
453-
values include: 'Always', 'OnSuccess', 'OnExpiration'
455+
values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
456+
"Always" .
454457
:type cleanup_preference: str or
455458
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
456459
:ivar provisioning_state: State of the script execution. This only appears
@@ -484,7 +487,7 @@ def __init__(self, **kwargs):
484487
super(DeploymentScriptPropertiesBase, self).__init__(**kwargs)
485488
self.container_settings = kwargs.get('container_settings', None)
486489
self.storage_account_settings = kwargs.get('storage_account_settings', None)
487-
self.cleanup_preference = kwargs.get('cleanup_preference', None)
490+
self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
488491
self.provisioning_state = None
489492
self.status = None
490493
self.outputs = None
@@ -663,19 +666,26 @@ def __init__(self, **kwargs):
663666
class ManagedServiceIdentity(Model):
664667
"""Managed identity generic object.
665668
669+
Variables are only populated by the server, and will be ignored when
670+
sending a request.
671+
666672
:param type: Type of the managed identity. Possible values include:
667673
'UserAssigned'
668674
:type type: str or
669675
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.ManagedServiceIdentityType
670-
:param tenant_id: ID of the Azure Active Directory.
671-
:type tenant_id: str
676+
:ivar tenant_id: ID of the Azure Active Directory.
677+
:vartype tenant_id: str
672678
:param user_assigned_identities: The list of user-assigned managed
673679
identities associated with the resource. Key is the Azure resource Id of
674680
the managed identity.
675681
:type user_assigned_identities: dict[str,
676682
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.UserAssignedIdentity]
677683
"""
678684

685+
_validation = {
686+
'tenant_id': {'readonly': True},
687+
}
688+
679689
_attribute_map = {
680690
'type': {'key': 'type', 'type': 'str'},
681691
'tenant_id': {'key': 'tenantId', 'type': 'str'},
@@ -685,7 +695,7 @@ class ManagedServiceIdentity(Model):
685695
def __init__(self, **kwargs):
686696
super(ManagedServiceIdentity, self).__init__(**kwargs)
687697
self.type = kwargs.get('type', None)
688-
self.tenant_id = kwargs.get('tenant_id', None)
698+
self.tenant_id = None
689699
self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
690700

691701

@@ -716,10 +726,10 @@ class ScriptConfigurationBase(Model):
716726
:param retention_interval: Required. Interval for which the service
717727
retains the script resource after it reaches a terminal state. Resource
718728
will be deleted when this duration expires. Duration is based on ISO 8601
719-
pattern (for example P7D means one week).
729+
pattern (for example P1D means one day).
720730
:type retention_interval: timedelta
721731
:param timeout: Maximum allowed script execution time specified in ISO
722-
8601 format. Default value is PT1H
732+
8601 format. Default value is P1D. Default value: "P1D" .
723733
:type timeout: timedelta
724734
"""
725735

@@ -748,7 +758,7 @@ def __init__(self, **kwargs):
748758
self.environment_variables = kwargs.get('environment_variables', None)
749759
self.force_update_tag = kwargs.get('force_update_tag', None)
750760
self.retention_interval = kwargs.get('retention_interval', None)
751-
self.timeout = kwargs.get('timeout', None)
761+
self.timeout = kwargs.get('timeout', "P1D")
752762

753763

754764
class ScriptLog(AzureResourceBase):
@@ -890,8 +900,7 @@ class SystemData(Model):
890900
'ManagedIdentity', 'Key'
891901
:type last_modified_by_type: str or
892902
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CreatedByType
893-
:param last_modified_at: The type of identity that last modified the
894-
resource.
903+
:param last_modified_at: The timestamp of resource last modification (UTC)
895904
:type last_modified_at: datetime
896905
"""
897906

@@ -917,19 +926,27 @@ def __init__(self, **kwargs):
917926
class UserAssignedIdentity(Model):
918927
"""User-assigned managed identity.
919928
920-
:param principal_id: Azure Active Directory principal ID associated with
929+
Variables are only populated by the server, and will be ignored when
930+
sending a request.
931+
932+
:ivar principal_id: Azure Active Directory principal ID associated with
921933
this identity.
922-
:type principal_id: str
923-
:param client_id: Client App Id associated with this identity.
924-
:type client_id: str
934+
:vartype principal_id: str
935+
:ivar client_id: Client App Id associated with this identity.
936+
:vartype client_id: str
925937
"""
926938

939+
_validation = {
940+
'principal_id': {'readonly': True},
941+
'client_id': {'readonly': True},
942+
}
943+
927944
_attribute_map = {
928945
'principal_id': {'key': 'principalId', 'type': 'str'},
929946
'client_id': {'key': 'clientId', 'type': 'str'},
930947
}
931948

932949
def __init__(self, **kwargs):
933950
super(UserAssignedIdentity, self).__init__(**kwargs)
934-
self.principal_id = kwargs.get('principal_id', None)
935-
self.client_id = kwargs.get('client_id', None)
951+
self.principal_id = None
952+
self.client_id = None

0 commit comments

Comments
 (0)