Update from master

Author: SDK Automation

sdk/resources/azure-mgmt-resource/README.md

@@ -1,28 +1,21 @@
-## Microsoft Azure SDK for Python
+# Microsoft Azure SDK for Python
 
 This is the Microsoft Azure Resource Management Client Library.
-
-Azure Resource Manager (ARM) is the next generation of management APIs
-that replace the old Azure Service Management (ASM).
-
 This package has been tested with Python 2.7, 3.5, 3.6, 3.7 and 3.8.
+For a more complete view of Azure libraries, see the [Github repo](https://github.com/Azure/azure-sdk-for-python/)
 
-For the older Azure Service Management (ASM) libraries, see
-[azure-servicemanagement-legacy](https://pypi.python.org/pypi/azure-servicemanagement-legacy)
-library.
-
-For a more complete set of Azure libraries, see the
-[azure](https://pypi.python.org/pypi/azure) bundle package.
 
-## Usage
+# Usage
 
 For code examples, see [Resource Management](https://docs.microsoft.com/python/api/overview/azure/resources)
 on docs.microsoft.com.
 
-## Provide Feedback
 
-If you encounter any bugs or have suggestions, please file an issue in
-the [Issues](https://github.com/Azure/azure-sdk-for-python/issues)
+# Provide Feedback
+
+If you encounter any bugs or have suggestions, please file an issue in the
+[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
 section of the project.
 
-![image](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-resource%2FREADME.png)
+
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-resource%2FREADME.png)

sdk/resources/azure-mgmt-resource/azure/mgmt/resource/deploymentscripts/v2019_10_preview/models/__init__.py

@@ -15,15 +15,16 @@
     from ._models_py3 import AzureResourceBase
     from ._models_py3 import ContainerConfiguration
     from ._models_py3 import DeploymentScript
-    from ._models_py3 import DeploymentScriptUpdateParameter
     from ._models_py3 import DeploymentScriptsError, DeploymentScriptsErrorException
+    from ._models_py3 import DeploymentScriptUpdateParameter
     from ._models_py3 import EnvironmentVariable
     from ._models_py3 import ErrorAdditionalInfo
     from ._models_py3 import ErrorResponse
     from ._models_py3 import ManagedServiceIdentity
     from ._models_py3 import ScriptLog
     from ._models_py3 import ScriptLogsList
     from ._models_py3 import ScriptStatus
+    from ._models_py3 import StorageAccountConfiguration
     from ._models_py3 import SystemData
     from ._models_py3 import UserAssignedIdentity
 except (SyntaxError, ImportError):
@@ -32,15 +33,16 @@
     from ._models import AzureResourceBase
     from ._models import ContainerConfiguration
     from ._models import DeploymentScript
-    from ._models import DeploymentScriptUpdateParameter
     from ._models import DeploymentScriptsError, DeploymentScriptsErrorException
+    from ._models import DeploymentScriptUpdateParameter
     from ._models import EnvironmentVariable
     from ._models import ErrorAdditionalInfo
     from ._models import ErrorResponse
     from ._models import ManagedServiceIdentity
     from ._models import ScriptLog
     from ._models import ScriptLogsList
     from ._models import ScriptStatus
+    from ._models import StorageAccountConfiguration
     from ._models import SystemData
     from ._models import UserAssignedIdentity
 from ._paged_models import DeploymentScriptPaged
@@ -57,15 +59,16 @@
     'AzureResourceBase',
     'ContainerConfiguration',
     'DeploymentScript',
-    'DeploymentScriptUpdateParameter',
     'DeploymentScriptsError', 'DeploymentScriptsErrorException',
+    'DeploymentScriptUpdateParameter',
     'EnvironmentVariable',
     'ErrorAdditionalInfo',
     'ErrorResponse',
     'ManagedServiceIdentity',
     'ScriptLog',
     'ScriptLogsList',
     'ScriptStatus',
+    'StorageAccountConfiguration',
     'SystemData',
     'UserAssignedIdentity',
     'DeploymentScriptPaged',

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

@@ -145,6 +145,9 @@ class AzureCliScript(DeploymentScript):
     :param container_settings: Container settings.
     :type container_settings:
      ~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ContainerConfiguration
+    :param storage_account_settings: Storage Account settings.
+    :type storage_account_settings:
+     ~azure.mgmt.resource.deploymentscripts.v2019_10_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'
@@ -216,6 +219,7 @@ class AzureCliScript(DeploymentScript):
         'system_data': {'key': 'systemData', 'type': 'SystemData'},
         'kind': {'key': 'kind', 'type': 'str'},
         'container_settings': {'key': 'properties.containerSettings', 'type': 'ContainerConfiguration'},
+        'storage_account_settings': {'key': 'properties.storageAccountSettings', 'type': 'StorageAccountConfiguration'},
         'cleanup_preference': {'key': 'properties.cleanupPreference', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'status': {'key': 'properties.status', 'type': 'ScriptStatus'},
@@ -234,6 +238,7 @@ class AzureCliScript(DeploymentScript):
     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.provisioning_state = None
         self.status = None
@@ -281,6 +286,9 @@ class AzurePowerShellScript(DeploymentScript):
     :param container_settings: Container settings.
     :type container_settings:
      ~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ContainerConfiguration
+    :param storage_account_settings: Storage Account settings.
+    :type storage_account_settings:
+     ~azure.mgmt.resource.deploymentscripts.v2019_10_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'
@@ -353,6 +361,7 @@ class AzurePowerShellScript(DeploymentScript):
         'system_data': {'key': 'systemData', 'type': 'SystemData'},
         'kind': {'key': 'kind', 'type': 'str'},
         'container_settings': {'key': 'properties.containerSettings', 'type': 'ContainerConfiguration'},
+        'storage_account_settings': {'key': 'properties.storageAccountSettings', 'type': 'StorageAccountConfiguration'},
         'cleanup_preference': {'key': 'properties.cleanupPreference', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'status': {'key': 'properties.status', 'type': 'ScriptStatus'},
@@ -371,6 +380,7 @@ class AzurePowerShellScript(DeploymentScript):
     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.provisioning_state = None
         self.status = None
@@ -435,6 +445,9 @@ class DeploymentScriptPropertiesBase(Model):
     :param container_settings: Container settings.
     :type container_settings:
      ~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ContainerConfiguration
+    :param storage_account_settings: Storage Account settings.
+    :type storage_account_settings:
+     ~azure.mgmt.resource.deploymentscripts.v2019_10_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'
@@ -460,6 +473,7 @@ class DeploymentScriptPropertiesBase(Model):
 
     _attribute_map = {
         'container_settings': {'key': 'containerSettings', 'type': 'ContainerConfiguration'},
+        'storage_account_settings': {'key': 'storageAccountSettings', 'type': 'StorageAccountConfiguration'},
         'cleanup_preference': {'key': 'cleanupPreference', 'type': 'str'},
         'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
         'status': {'key': 'status', 'type': 'ScriptStatus'},
@@ -469,12 +483,42 @@ class DeploymentScriptPropertiesBase(Model):
     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.provisioning_state = None
         self.status = None
         self.outputs = None
 
 
+class DeploymentScriptsError(Model):
+    """Deployment scripts error response.
+
+    :param error:
+    :type error:
+     ~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ErrorResponse
+    """
+
+    _attribute_map = {
+        'error': {'key': 'error', 'type': 'ErrorResponse'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DeploymentScriptsError, self).__init__(**kwargs)
+        self.error = kwargs.get('error', None)
+
+
+class DeploymentScriptsErrorException(HttpOperationError):
+    """Server responsed with exception of type: 'DeploymentScriptsError'.
+
+    :param deserialize: A deserializer
+    :param response: Server response to be deserialized.
+    """
+
+    def __init__(self, deserialize, response, *args):
+
+        super(DeploymentScriptsErrorException, self).__init__(deserialize, response, 'DeploymentScriptsError', *args)
+
+
 class DeploymentScriptUpdateParameter(AzureResourceBase):
     """Deployment script parameters to be updated. .
 
@@ -509,35 +553,6 @@ def __init__(self, **kwargs):
         self.tags = kwargs.get('tags', None)
 
 
-class DeploymentScriptsError(Model):
-    """Deployment scripts error response.
-
-    :param error:
-    :type error:
-     ~azure.mgmt.resource.deploymentscripts.v2019_10_preview.models.ErrorResponse
-    """
-
-    _attribute_map = {
-        'error': {'key': 'error', 'type': 'ErrorResponse'},
-    }
-
-    def __init__(self, **kwargs):
-        super(DeploymentScriptsError, self).__init__(**kwargs)
-        self.error = kwargs.get('error', None)
-
-
-class DeploymentScriptsErrorException(HttpOperationError):
-    """Server responsed with exception of type: 'DeploymentScriptsError'.
-
-    :param deserialize: A deserializer
-    :param response: Server response to be deserialized.
-    """
-
-    def __init__(self, deserialize, response, *args):
-
-        super(DeploymentScriptsErrorException, self).__init__(deserialize, response, 'DeploymentScriptsError', *args)
-
-
 class EnvironmentVariable(Model):
     """The environment variable to pass to the script in the container instance.
 
@@ -828,6 +843,27 @@ def __init__(self, **kwargs):
         self.error = kwargs.get('error', None)
 
 
+class StorageAccountConfiguration(Model):
+    """Settings to use an existing storage account. Valid storage account kinds
+    are: Storage, StorageV2 and FileStorage.
+
+    :param storage_account_name: The storage account name.
+    :type storage_account_name: str
+    :param storage_account_key: The storage account access key.
+    :type storage_account_key: str
+    """
+
+    _attribute_map = {
+        'storage_account_name': {'key': 'storageAccountName', 'type': 'str'},
+        'storage_account_key': {'key': 'storageAccountKey', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(StorageAccountConfiguration, self).__init__(**kwargs)
+        self.storage_account_name = kwargs.get('storage_account_name', None)
+        self.storage_account_key = kwargs.get('storage_account_key', None)
+
+
 class SystemData(Model):
     """Metadata pertaining to creation and last modification of the resource.