Skip to content

Commit 97adedc

Browse files
author
SDKAuto
committed
CodeGen from PR 13326 in Azure/azure-rest-api-specs
Merge a9b089a52a751f1b3b06b88544a1863da4365ce9 into a7d95a7
1 parent f9769f2 commit 97adedc

File tree

4 files changed

+58
-27
lines changed

4 files changed

+58
-27
lines changed

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class AzureCliScript(DeploymentScript):
180180
:type force_update_tag: str
181181
:param retention_interval: Required. Interval for which the service retains the script resource
182182
after it reaches a terminal state. Resource will be deleted when this duration expires.
183-
Duration is based on ISO 8601 pattern (for example P7D means one week).
183+
Duration is based on ISO 8601 pattern (for example P1D means one day).
184184
:type retention_interval: ~datetime.timedelta
185185
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
186186
value is P1D.
@@ -276,7 +276,7 @@ class ScriptConfigurationBase(msrest.serialization.Model):
276276
:type force_update_tag: str
277277
:param retention_interval: Required. Interval for which the service retains the script resource
278278
after it reaches a terminal state. Resource will be deleted when this duration expires.
279-
Duration is based on ISO 8601 pattern (for example P7D means one week).
279+
Duration is based on ISO 8601 pattern (for example P1D means one day).
280280
:type retention_interval: ~datetime.timedelta
281281
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
282282
value is P1D.
@@ -393,7 +393,7 @@ class AzureCliScriptProperties(DeploymentScriptPropertiesBase, ScriptConfigurati
393393
:type force_update_tag: str
394394
:param retention_interval: Required. Interval for which the service retains the script resource
395395
after it reaches a terminal state. Resource will be deleted when this duration expires.
396-
Duration is based on ISO 8601 pattern (for example P7D means one week).
396+
Duration is based on ISO 8601 pattern (for example P1D means one day).
397397
:type retention_interval: ~datetime.timedelta
398398
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
399399
value is P1D.
@@ -537,7 +537,7 @@ class AzurePowerShellScript(DeploymentScript):
537537
:type force_update_tag: str
538538
:param retention_interval: Required. Interval for which the service retains the script resource
539539
after it reaches a terminal state. Resource will be deleted when this duration expires.
540-
Duration is based on ISO 8601 pattern (for example P7D means one week).
540+
Duration is based on ISO 8601 pattern (for example P1D means one day).
541541
:type retention_interval: ~datetime.timedelta
542542
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
543543
value is P1D.
@@ -635,7 +635,7 @@ class AzurePowerShellScriptProperties(DeploymentScriptPropertiesBase, ScriptConf
635635
:type force_update_tag: str
636636
:param retention_interval: Required. Interval for which the service retains the script resource
637637
after it reaches a terminal state. Resource will be deleted when this duration expires.
638-
Duration is based on ISO 8601 pattern (for example P7D means one week).
638+
Duration is based on ISO 8601 pattern (for example P1D means one day).
639639
:type retention_interval: ~datetime.timedelta
640640
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
641641
value is P1D.
@@ -945,17 +945,23 @@ def __init__(
945945
class ManagedServiceIdentity(msrest.serialization.Model):
946946
"""Managed identity generic object.
947947
948+
Variables are only populated by the server, and will be ignored when sending a request.
949+
948950
:param type: Type of the managed identity. Possible values include: "UserAssigned".
949951
:type type: str or
950952
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.ManagedServiceIdentityType
951-
:param tenant_id: ID of the Azure Active Directory.
952-
:type tenant_id: str
953+
:ivar tenant_id: ID of the Azure Active Directory.
954+
:vartype tenant_id: str
953955
:param user_assigned_identities: The list of user-assigned managed identities associated with
954956
the resource. Key is the Azure resource Id of the managed identity.
955957
:type user_assigned_identities: dict[str,
956958
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.UserAssignedIdentity]
957959
"""
958960

961+
_validation = {
962+
'tenant_id': {'readonly': True},
963+
}
964+
959965
_attribute_map = {
960966
'type': {'key': 'type', 'type': 'str'},
961967
'tenant_id': {'key': 'tenantId', 'type': 'str'},
@@ -968,7 +974,7 @@ def __init__(
968974
):
969975
super(ManagedServiceIdentity, self).__init__(**kwargs)
970976
self.type = kwargs.get('type', None)
971-
self.tenant_id = kwargs.get('tenant_id', None)
977+
self.tenant_id = None
972978
self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
973979

974980

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class AzureCliScript(DeploymentScript):
189189
:type force_update_tag: str
190190
:param retention_interval: Required. Interval for which the service retains the script resource
191191
after it reaches a terminal state. Resource will be deleted when this duration expires.
192-
Duration is based on ISO 8601 pattern (for example P7D means one week).
192+
Duration is based on ISO 8601 pattern (for example P1D means one day).
193193
:type retention_interval: ~datetime.timedelta
194194
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
195195
value is P1D.
@@ -301,7 +301,7 @@ class ScriptConfigurationBase(msrest.serialization.Model):
301301
:type force_update_tag: str
302302
:param retention_interval: Required. Interval for which the service retains the script resource
303303
after it reaches a terminal state. Resource will be deleted when this duration expires.
304-
Duration is based on ISO 8601 pattern (for example P7D means one week).
304+
Duration is based on ISO 8601 pattern (for example P1D means one day).
305305
:type retention_interval: ~datetime.timedelta
306306
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
307307
value is P1D.
@@ -431,7 +431,7 @@ class AzureCliScriptProperties(DeploymentScriptPropertiesBase, ScriptConfigurati
431431
:type force_update_tag: str
432432
:param retention_interval: Required. Interval for which the service retains the script resource
433433
after it reaches a terminal state. Resource will be deleted when this duration expires.
434-
Duration is based on ISO 8601 pattern (for example P7D means one week).
434+
Duration is based on ISO 8601 pattern (for example P1D means one day).
435435
:type retention_interval: ~datetime.timedelta
436436
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
437437
value is P1D.
@@ -588,7 +588,7 @@ class AzurePowerShellScript(DeploymentScript):
588588
:type force_update_tag: str
589589
:param retention_interval: Required. Interval for which the service retains the script resource
590590
after it reaches a terminal state. Resource will be deleted when this duration expires.
591-
Duration is based on ISO 8601 pattern (for example P7D means one week).
591+
Duration is based on ISO 8601 pattern (for example P1D means one day).
592592
:type retention_interval: ~datetime.timedelta
593593
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
594594
value is P1D.
@@ -702,7 +702,7 @@ class AzurePowerShellScriptProperties(DeploymentScriptPropertiesBase, ScriptConf
702702
:type force_update_tag: str
703703
:param retention_interval: Required. Interval for which the service retains the script resource
704704
after it reaches a terminal state. Resource will be deleted when this duration expires.
705-
Duration is based on ISO 8601 pattern (for example P7D means one week).
705+
Duration is based on ISO 8601 pattern (for example P1D means one day).
706706
:type retention_interval: ~datetime.timedelta
707707
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
708708
value is P1D.
@@ -1037,17 +1037,23 @@ def __init__(
10371037
class ManagedServiceIdentity(msrest.serialization.Model):
10381038
"""Managed identity generic object.
10391039
1040+
Variables are only populated by the server, and will be ignored when sending a request.
1041+
10401042
:param type: Type of the managed identity. Possible values include: "UserAssigned".
10411043
:type type: str or
10421044
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.ManagedServiceIdentityType
1043-
:param tenant_id: ID of the Azure Active Directory.
1044-
:type tenant_id: str
1045+
:ivar tenant_id: ID of the Azure Active Directory.
1046+
:vartype tenant_id: str
10451047
:param user_assigned_identities: The list of user-assigned managed identities associated with
10461048
the resource. Key is the Azure resource Id of the managed identity.
10471049
:type user_assigned_identities: dict[str,
10481050
~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.UserAssignedIdentity]
10491051
"""
10501052

1053+
_validation = {
1054+
'tenant_id': {'readonly': True},
1055+
}
1056+
10511057
_attribute_map = {
10521058
'type': {'key': 'type', 'type': 'str'},
10531059
'tenant_id': {'key': 'tenantId', 'type': 'str'},
@@ -1058,13 +1064,12 @@ def __init__(
10581064
self,
10591065
*,
10601066
type: Optional[Union[str, "ManagedServiceIdentityType"]] = None,
1061-
tenant_id: Optional[str] = None,
10621067
user_assigned_identities: Optional[Dict[str, "UserAssignedIdentity"]] = None,
10631068
**kwargs
10641069
):
10651070
super(ManagedServiceIdentity, self).__init__(**kwargs)
10661071
self.type = type
1067-
self.tenant_id = tenant_id
1072+
self.tenant_id = None
10681073
self.user_assigned_identities = user_assigned_identities
10691074

10701075

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ class AzureCliScript(DeploymentScript):
177177
:type force_update_tag: str
178178
:param retention_interval: Required. Interval for which the service retains the script resource
179179
after it reaches a terminal state. Resource will be deleted when this duration expires.
180-
Duration is based on ISO 8601 pattern (for example P7D means one week).
180+
Duration is based on ISO 8601 pattern (for example P1D means one day).
181181
:type retention_interval: ~datetime.timedelta
182182
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
183183
value is P1D.
@@ -272,7 +272,7 @@ class ScriptConfigurationBase(msrest.serialization.Model):
272272
:type force_update_tag: str
273273
:param retention_interval: Required. Interval for which the service retains the script resource
274274
after it reaches a terminal state. Resource will be deleted when this duration expires.
275-
Duration is based on ISO 8601 pattern (for example P7D means one week).
275+
Duration is based on ISO 8601 pattern (for example P1D means one day).
276276
:type retention_interval: ~datetime.timedelta
277277
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
278278
value is P1D.
@@ -389,7 +389,7 @@ class AzureCliScriptProperties(DeploymentScriptPropertiesBase, ScriptConfigurati
389389
:type force_update_tag: str
390390
:param retention_interval: Required. Interval for which the service retains the script resource
391391
after it reaches a terminal state. Resource will be deleted when this duration expires.
392-
Duration is based on ISO 8601 pattern (for example P7D means one week).
392+
Duration is based on ISO 8601 pattern (for example P1D means one day).
393393
:type retention_interval: ~datetime.timedelta
394394
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
395395
value is P1D.
@@ -532,7 +532,7 @@ class AzurePowerShellScript(DeploymentScript):
532532
:type force_update_tag: str
533533
:param retention_interval: Required. Interval for which the service retains the script resource
534534
after it reaches a terminal state. Resource will be deleted when this duration expires.
535-
Duration is based on ISO 8601 pattern (for example P7D means one week).
535+
Duration is based on ISO 8601 pattern (for example P1D means one day).
536536
:type retention_interval: ~datetime.timedelta
537537
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
538538
value is P1D.
@@ -629,7 +629,7 @@ class AzurePowerShellScriptProperties(DeploymentScriptPropertiesBase, ScriptConf
629629
:type force_update_tag: str
630630
:param retention_interval: Required. Interval for which the service retains the script resource
631631
after it reaches a terminal state. Resource will be deleted when this duration expires.
632-
Duration is based on ISO 8601 pattern (for example P7D means one week).
632+
Duration is based on ISO 8601 pattern (for example P1D means one day).
633633
:type retention_interval: ~datetime.timedelta
634634
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
635635
value is P1D.
@@ -937,17 +937,26 @@ def __init__(
937937
class ManagedServiceIdentity(msrest.serialization.Model):
938938
"""Managed identity generic object.
939939
940+
Variables are only populated by the server, and will be ignored when sending a request.
941+
940942
:param type: Type of the managed identity. Possible values include: "UserAssigned".
941943
:type type: str or
942944
~azure.mgmt.resource.deploymentscripts.v2020_10_01.models.ManagedServiceIdentityType
945+
:ivar tenant_id: ID of the Azure Active Directory.
946+
:vartype tenant_id: str
943947
:param user_assigned_identities: The list of user-assigned managed identities associated with
944948
the resource. Key is the Azure resource Id of the managed identity.
945949
:type user_assigned_identities: dict[str,
946950
~azure.mgmt.resource.deploymentscripts.v2020_10_01.models.UserAssignedIdentity]
947951
"""
948952

953+
_validation = {
954+
'tenant_id': {'readonly': True},
955+
}
956+
949957
_attribute_map = {
950958
'type': {'key': 'type', 'type': 'str'},
959+
'tenant_id': {'key': 'tenantId', 'type': 'str'},
951960
'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{UserAssignedIdentity}'},
952961
}
953962

@@ -957,6 +966,7 @@ def __init__(
957966
):
958967
super(ManagedServiceIdentity, self).__init__(**kwargs)
959968
self.type = kwargs.get('type', None)
969+
self.tenant_id = None
960970
self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
961971

962972

sdk/resources/azure-mgmt-resource/azure/mgmt/resource/deploymentscripts/v2020_10_01/models/_models_py3.py

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class AzureCliScript(DeploymentScript):
186186
:type force_update_tag: str
187187
:param retention_interval: Required. Interval for which the service retains the script resource
188188
after it reaches a terminal state. Resource will be deleted when this duration expires.
189-
Duration is based on ISO 8601 pattern (for example P7D means one week).
189+
Duration is based on ISO 8601 pattern (for example P1D means one day).
190190
:type retention_interval: ~datetime.timedelta
191191
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
192192
value is P1D.
@@ -297,7 +297,7 @@ class ScriptConfigurationBase(msrest.serialization.Model):
297297
:type force_update_tag: str
298298
:param retention_interval: Required. Interval for which the service retains the script resource
299299
after it reaches a terminal state. Resource will be deleted when this duration expires.
300-
Duration is based on ISO 8601 pattern (for example P7D means one week).
300+
Duration is based on ISO 8601 pattern (for example P1D means one day).
301301
:type retention_interval: ~datetime.timedelta
302302
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
303303
value is P1D.
@@ -427,7 +427,7 @@ class AzureCliScriptProperties(DeploymentScriptPropertiesBase, ScriptConfigurati
427427
:type force_update_tag: str
428428
:param retention_interval: Required. Interval for which the service retains the script resource
429429
after it reaches a terminal state. Resource will be deleted when this duration expires.
430-
Duration is based on ISO 8601 pattern (for example P7D means one week).
430+
Duration is based on ISO 8601 pattern (for example P1D means one day).
431431
:type retention_interval: ~datetime.timedelta
432432
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
433433
value is P1D.
@@ -583,7 +583,7 @@ class AzurePowerShellScript(DeploymentScript):
583583
:type force_update_tag: str
584584
:param retention_interval: Required. Interval for which the service retains the script resource
585585
after it reaches a terminal state. Resource will be deleted when this duration expires.
586-
Duration is based on ISO 8601 pattern (for example P7D means one week).
586+
Duration is based on ISO 8601 pattern (for example P1D means one day).
587587
:type retention_interval: ~datetime.timedelta
588588
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
589589
value is P1D.
@@ -696,7 +696,7 @@ class AzurePowerShellScriptProperties(DeploymentScriptPropertiesBase, ScriptConf
696696
:type force_update_tag: str
697697
:param retention_interval: Required. Interval for which the service retains the script resource
698698
after it reaches a terminal state. Resource will be deleted when this duration expires.
699-
Duration is based on ISO 8601 pattern (for example P7D means one week).
699+
Duration is based on ISO 8601 pattern (for example P1D means one day).
700700
:type retention_interval: ~datetime.timedelta
701701
:param timeout: Maximum allowed script execution time specified in ISO 8601 format. Default
702702
value is P1D.
@@ -1029,17 +1029,26 @@ def __init__(
10291029
class ManagedServiceIdentity(msrest.serialization.Model):
10301030
"""Managed identity generic object.
10311031
1032+
Variables are only populated by the server, and will be ignored when sending a request.
1033+
10321034
:param type: Type of the managed identity. Possible values include: "UserAssigned".
10331035
:type type: str or
10341036
~azure.mgmt.resource.deploymentscripts.v2020_10_01.models.ManagedServiceIdentityType
1037+
:ivar tenant_id: ID of the Azure Active Directory.
1038+
:vartype tenant_id: str
10351039
:param user_assigned_identities: The list of user-assigned managed identities associated with
10361040
the resource. Key is the Azure resource Id of the managed identity.
10371041
:type user_assigned_identities: dict[str,
10381042
~azure.mgmt.resource.deploymentscripts.v2020_10_01.models.UserAssignedIdentity]
10391043
"""
10401044

1045+
_validation = {
1046+
'tenant_id': {'readonly': True},
1047+
}
1048+
10411049
_attribute_map = {
10421050
'type': {'key': 'type', 'type': 'str'},
1051+
'tenant_id': {'key': 'tenantId', 'type': 'str'},
10431052
'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{UserAssignedIdentity}'},
10441053
}
10451054

@@ -1052,6 +1061,7 @@ def __init__(
10521061
):
10531062
super(ManagedServiceIdentity, self).__init__(**kwargs)
10541063
self.type = type
1064+
self.tenant_id = None
10551065
self.user_assigned_identities = user_assigned_identities
10561066

10571067

0 commit comments

Comments
 (0)