CodeGen from PR 13128 in Azure/azure-rest-api-specs

Revert "[Hub Generated] Review request for Microsoft.Resources to add version stable/2021-01-01 (Azure#13000)" (Azure#13128) This reverts commit 231d094.
AzureSDKAutomation · Feb 24, 2021 · b43f7af · b43f7af
1 parent ac0820a
commit b43f7af
Show file tree

Hide file tree

Showing 16 changed files with 1,138 additions and 119 deletions.
diff --git a/...mgmt-resource/azure/mgmt/resource/deploymentscripts/v2019_10_01_preview/models/_models.py b/...mgmt-resource/azure/mgmt/resource/deploymentscripts/v2019_10_01_preview/models/_models.py
@@ -150,7 +150,8 @@ class AzureCliScript(DeploymentScript):
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
     :param cleanup_preference: The clean up preference when the script
      execution gets in a terminal state. Default setting is 'Always'. Possible
-     values include: 'Always', 'OnSuccess', 'OnExpiration'
+     values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
+     "Always" .
     :type cleanup_preference: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
     :ivar provisioning_state: State of the script execution. This only appears
@@ -187,7 +188,7 @@ class AzureCliScript(DeploymentScript):
      pattern (for example P7D means one week).
     :type retention_interval: timedelta
     :param timeout: Maximum allowed script execution time specified in ISO
-     8601 format. Default value is PT1H
+     8601 format. Default value is P1D. Default value: "P1D" .
     :type timeout: timedelta
     :param az_cli_version: Required. Azure CLI module version to be used.
     :type az_cli_version: str
@@ -239,7 +240,7 @@ def __init__(self, **kwargs):
         super(AzureCliScript, self).__init__(**kwargs)
         self.container_settings = kwargs.get('container_settings', None)
         self.storage_account_settings = kwargs.get('storage_account_settings', None)
-        self.cleanup_preference = kwargs.get('cleanup_preference', None)
+        self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
         self.provisioning_state = None
         self.status = None
         self.outputs = None
@@ -250,7 +251,7 @@ def __init__(self, **kwargs):
         self.environment_variables = kwargs.get('environment_variables', None)
         self.force_update_tag = kwargs.get('force_update_tag', None)
         self.retention_interval = kwargs.get('retention_interval', None)
-        self.timeout = kwargs.get('timeout', None)
+        self.timeout = kwargs.get('timeout', "P1D")
         self.az_cli_version = kwargs.get('az_cli_version', None)
         self.kind = 'AzureCLI'
 
@@ -291,7 +292,8 @@ class AzurePowerShellScript(DeploymentScript):
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
     :param cleanup_preference: The clean up preference when the script
      execution gets in a terminal state. Default setting is 'Always'. Possible
-     values include: 'Always', 'OnSuccess', 'OnExpiration'
+     values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
+     "Always" .
     :type cleanup_preference: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
     :ivar provisioning_state: State of the script execution. This only appears
@@ -328,7 +330,7 @@ class AzurePowerShellScript(DeploymentScript):
      pattern (for example P7D means one week).
     :type retention_interval: timedelta
     :param timeout: Maximum allowed script execution time specified in ISO
-     8601 format. Default value is PT1H
+     8601 format. Default value is P1D. Default value: "P1D" .
     :type timeout: timedelta
     :param az_power_shell_version: Required. Azure PowerShell module version
      to be used.
@@ -381,7 +383,7 @@ def __init__(self, **kwargs):
         super(AzurePowerShellScript, self).__init__(**kwargs)
         self.container_settings = kwargs.get('container_settings', None)
         self.storage_account_settings = kwargs.get('storage_account_settings', None)
-        self.cleanup_preference = kwargs.get('cleanup_preference', None)
+        self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
         self.provisioning_state = None
         self.status = None
         self.outputs = None
@@ -392,7 +394,7 @@ def __init__(self, **kwargs):
         self.environment_variables = kwargs.get('environment_variables', None)
         self.force_update_tag = kwargs.get('force_update_tag', None)
         self.retention_interval = kwargs.get('retention_interval', None)
-        self.timeout = kwargs.get('timeout', None)
+        self.timeout = kwargs.get('timeout', "P1D")
         self.az_power_shell_version = kwargs.get('az_power_shell_version', None)
         self.kind = 'AzurePowerShell'
 
@@ -450,7 +452,8 @@ class DeploymentScriptPropertiesBase(Model):
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
     :param cleanup_preference: The clean up preference when the script
      execution gets in a terminal state. Default setting is 'Always'. Possible
-     values include: 'Always', 'OnSuccess', 'OnExpiration'
+     values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
+     "Always" .
     :type cleanup_preference: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
     :ivar provisioning_state: State of the script execution. This only appears
@@ -484,7 +487,7 @@ def __init__(self, **kwargs):
         super(DeploymentScriptPropertiesBase, self).__init__(**kwargs)
         self.container_settings = kwargs.get('container_settings', None)
         self.storage_account_settings = kwargs.get('storage_account_settings', None)
-        self.cleanup_preference = kwargs.get('cleanup_preference', None)
+        self.cleanup_preference = kwargs.get('cleanup_preference', "Always")
         self.provisioning_state = None
         self.status = None
         self.outputs = None
@@ -719,7 +722,7 @@ class ScriptConfigurationBase(Model):
      pattern (for example P7D means one week).
     :type retention_interval: timedelta
     :param timeout: Maximum allowed script execution time specified in ISO
-     8601 format. Default value is PT1H
+     8601 format. Default value is P1D. Default value: "P1D" .
     :type timeout: timedelta
     """
 
@@ -748,7 +751,7 @@ def __init__(self, **kwargs):
         self.environment_variables = kwargs.get('environment_variables', None)
         self.force_update_tag = kwargs.get('force_update_tag', None)
         self.retention_interval = kwargs.get('retention_interval', None)
-        self.timeout = kwargs.get('timeout', None)
+        self.timeout = kwargs.get('timeout', "P1D")
 
 
 class ScriptLog(AzureResourceBase):
@@ -890,8 +893,7 @@ class SystemData(Model):
      'ManagedIdentity', 'Key'
     :type last_modified_by_type: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CreatedByType
-    :param last_modified_at: The type of identity that last modified the
-     resource.
+    :param last_modified_at: The timestamp of resource last modification (UTC)
     :type last_modified_at: datetime
     """
 
@@ -917,19 +919,27 @@ def __init__(self, **kwargs):
 class UserAssignedIdentity(Model):
     """User-assigned managed identity.
 
-    :param principal_id: Azure Active Directory principal ID associated with
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: Azure Active Directory principal ID associated with
      this identity.
-    :type principal_id: str
-    :param client_id: Client App Id associated with this identity.
-    :type client_id: str
+    :vartype principal_id: str
+    :ivar client_id: Client App Id associated with this 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(UserAssignedIdentity, self).__init__(**kwargs)
-        self.principal_id = kwargs.get('principal_id', None)
-        self.client_id = kwargs.get('client_id', None)
+        self.principal_id = None
+        self.client_id = None
diff --git a/...-resource/azure/mgmt/resource/deploymentscripts/v2019_10_01_preview/models/_models_py3.py b/...-resource/azure/mgmt/resource/deploymentscripts/v2019_10_01_preview/models/_models_py3.py
@@ -150,7 +150,8 @@ class AzureCliScript(DeploymentScript):
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
     :param cleanup_preference: The clean up preference when the script
      execution gets in a terminal state. Default setting is 'Always'. Possible
-     values include: 'Always', 'OnSuccess', 'OnExpiration'
+     values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
+     "Always" .
     :type cleanup_preference: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
     :ivar provisioning_state: State of the script execution. This only appears
@@ -187,7 +188,7 @@ class AzureCliScript(DeploymentScript):
      pattern (for example P7D means one week).
     :type retention_interval: timedelta
     :param timeout: Maximum allowed script execution time specified in ISO
-     8601 format. Default value is PT1H
+     8601 format. Default value is P1D. Default value: "P1D" .
     :type timeout: timedelta
     :param az_cli_version: Required. Azure CLI module version to be used.
     :type az_cli_version: str
@@ -235,7 +236,7 @@ class AzureCliScript(DeploymentScript):
         'az_cli_version': {'key': 'properties.azCliVersion', 'type': 'str'},
     }
 
-    def __init__(self, *, identity, location: str, retention_interval, az_cli_version: str, tags=None, container_settings=None, storage_account_settings=None, cleanup_preference=None, primary_script_uri: str=None, supporting_script_uris=None, script_content: str=None, arguments: str=None, environment_variables=None, force_update_tag: str=None, timeout=None, **kwargs) -> None:
+    def __init__(self, *, identity, location: str, retention_interval, az_cli_version: str, tags=None, container_settings=None, storage_account_settings=None, cleanup_preference="Always", primary_script_uri: str=None, supporting_script_uris=None, script_content: str=None, arguments: str=None, environment_variables=None, force_update_tag: str=None, timeout="P1D", **kwargs) -> None:
         super(AzureCliScript, self).__init__(identity=identity, location=location, tags=tags, **kwargs)
         self.container_settings = container_settings
         self.storage_account_settings = storage_account_settings
@@ -291,7 +292,8 @@ class AzurePowerShellScript(DeploymentScript):
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
     :param cleanup_preference: The clean up preference when the script
      execution gets in a terminal state. Default setting is 'Always'. Possible
-     values include: 'Always', 'OnSuccess', 'OnExpiration'
+     values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
+     "Always" .
     :type cleanup_preference: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
     :ivar provisioning_state: State of the script execution. This only appears
@@ -328,7 +330,7 @@ class AzurePowerShellScript(DeploymentScript):
      pattern (for example P7D means one week).
     :type retention_interval: timedelta
     :param timeout: Maximum allowed script execution time specified in ISO
-     8601 format. Default value is PT1H
+     8601 format. Default value is P1D. Default value: "P1D" .
     :type timeout: timedelta
     :param az_power_shell_version: Required. Azure PowerShell module version
      to be used.
@@ -377,7 +379,7 @@ class AzurePowerShellScript(DeploymentScript):
         'az_power_shell_version': {'key': 'properties.azPowerShellVersion', 'type': 'str'},
     }
 
-    def __init__(self, *, identity, location: str, retention_interval, az_power_shell_version: str, tags=None, container_settings=None, storage_account_settings=None, cleanup_preference=None, primary_script_uri: str=None, supporting_script_uris=None, script_content: str=None, arguments: str=None, environment_variables=None, force_update_tag: str=None, timeout=None, **kwargs) -> None:
+    def __init__(self, *, identity, location: str, retention_interval, az_power_shell_version: str, tags=None, container_settings=None, storage_account_settings=None, cleanup_preference="Always", primary_script_uri: str=None, supporting_script_uris=None, script_content: str=None, arguments: str=None, environment_variables=None, force_update_tag: str=None, timeout="P1D", **kwargs) -> None:
         super(AzurePowerShellScript, self).__init__(identity=identity, location=location, tags=tags, **kwargs)
         self.container_settings = container_settings
         self.storage_account_settings = storage_account_settings
@@ -450,7 +452,8 @@ class DeploymentScriptPropertiesBase(Model):
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.StorageAccountConfiguration
     :param cleanup_preference: The clean up preference when the script
      execution gets in a terminal state. Default setting is 'Always'. Possible
-     values include: 'Always', 'OnSuccess', 'OnExpiration'
+     values include: 'Always', 'OnSuccess', 'OnExpiration'. Default value:
+     "Always" .
     :type cleanup_preference: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CleanupOptions
     :ivar provisioning_state: State of the script execution. This only appears
@@ -480,7 +483,7 @@ class DeploymentScriptPropertiesBase(Model):
         'outputs': {'key': 'outputs', 'type': '{object}'},
     }
 
-    def __init__(self, *, container_settings=None, storage_account_settings=None, cleanup_preference=None, **kwargs) -> None:
+    def __init__(self, *, container_settings=None, storage_account_settings=None, cleanup_preference="Always", **kwargs) -> None:
         super(DeploymentScriptPropertiesBase, self).__init__(**kwargs)
         self.container_settings = container_settings
         self.storage_account_settings = storage_account_settings
@@ -719,7 +722,7 @@ class ScriptConfigurationBase(Model):
      pattern (for example P7D means one week).
     :type retention_interval: timedelta
     :param timeout: Maximum allowed script execution time specified in ISO
-     8601 format. Default value is PT1H
+     8601 format. Default value is P1D. Default value: "P1D" .
     :type timeout: timedelta
     """
 
@@ -739,7 +742,7 @@ class ScriptConfigurationBase(Model):
         'timeout': {'key': 'timeout', 'type': 'duration'},
     }
 
-    def __init__(self, *, retention_interval, primary_script_uri: str=None, supporting_script_uris=None, script_content: str=None, arguments: str=None, environment_variables=None, force_update_tag: str=None, timeout=None, **kwargs) -> None:
+    def __init__(self, *, retention_interval, primary_script_uri: str=None, supporting_script_uris=None, script_content: str=None, arguments: str=None, environment_variables=None, force_update_tag: str=None, timeout="P1D", **kwargs) -> None:
         super(ScriptConfigurationBase, self).__init__(**kwargs)
         self.primary_script_uri = primary_script_uri
         self.supporting_script_uris = supporting_script_uris
@@ -890,8 +893,7 @@ class SystemData(Model):
      'ManagedIdentity', 'Key'
     :type last_modified_by_type: str or
      ~azure.mgmt.resource.deploymentscripts.v2019_10_01_preview.models.CreatedByType
-    :param last_modified_at: The type of identity that last modified the
-     resource.
+    :param last_modified_at: The timestamp of resource last modification (UTC)
     :type last_modified_at: datetime
     """
 
@@ -917,19 +919,27 @@ def __init__(self, *, created_by: str=None, created_by_type=None, created_at=Non
 class UserAssignedIdentity(Model):
     """User-assigned managed identity.
 
-    :param principal_id: Azure Active Directory principal ID associated with
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: Azure Active Directory principal ID associated with
      this identity.
-    :type principal_id: str
-    :param client_id: Client App Id associated with this identity.
-    :type client_id: str
+    :vartype principal_id: str
+    :ivar client_id: Client App Id associated with this 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, *, principal_id: str=None, client_id: str=None, **kwargs) -> None:
+    def __init__(self, **kwargs) -> None:
         super(UserAssignedIdentity, self).__init__(**kwargs)
-        self.principal_id = principal_id
-        self.client_id = client_id
+        self.principal_id = None
+        self.client_id = None