Generated from 4a42ab5

howard-d3 · Mar 7, 2017 · 12dc242 · 12dc242
1 parent b66b12f
commit 12dc242
Show file tree

Hide file tree

Showing 27 changed files with 9 additions and 22 deletions.
diff --git a/azure-mgmt-batch/azure/mgmt/batch/__init__.py b/azure-mgmt-batch/azure/mgmt/batch/__init__.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/batch_management_client.py b/azure-mgmt-batch/azure/mgmt/batch/batch_management_client.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/__init__.py b/azure-mgmt-batch/azure/mgmt/batch/models/__init__.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/activate_application_package_parameters.py b/azure-mgmt-batch/azure/mgmt/batch/models/activate_application_package_parameters.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/add_application_parameters.py b/azure-mgmt-batch/azure/mgmt/batch/models/add_application_parameters.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/application.py b/azure-mgmt-batch/azure/mgmt/batch/models/application.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/application_package.py b/azure-mgmt-batch/azure/mgmt/batch/models/application_package.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/application_paged.py b/azure-mgmt-batch/azure/mgmt/batch/models/application_paged.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/auto_storage_base_properties.py b/azure-mgmt-batch/azure/mgmt/batch/models/auto_storage_base_properties.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/auto_storage_properties.py b/azure-mgmt-batch/azure/mgmt/batch/models/auto_storage_properties.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/batch_account.py b/azure-mgmt-batch/azure/mgmt/batch/models/batch_account.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_create_parameters.py b/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_create_parameters.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_keys.py b/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_keys.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_paged.py b/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_paged.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_regenerate_key_parameters.py b/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_regenerate_key_parameters.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_update_parameters.py b/azure-mgmt-batch/azure/mgmt/batch/models/batch_account_update_parameters.py
@@ -20,30 +20,13 @@ class BatchAccountUpdateParameters(Model):
     :param auto_storage: The properties related to auto storage account.
     :type auto_storage: :class:`AutoStorageBaseProperties
      <azure.mgmt.batch.models.AutoStorageBaseProperties>`
-    :param pool_allocation_mode: The allocation mode to use for creating pools
-     in the Batch account. The pool allocation mode also affects how clients
-     may authenticate to the Batch Service API. If the mode is BatchService,
-     clients may authenticate using access keys or Azure Active Directory. If
-     the mode is UserSubscription, clients must use Azure Active Directory. The
-     default is BatchService. Possible values include: 'BatchService',
-     'UserSubscription'
-    :type pool_allocation_mode: str or :class:`PoolAllocationMode
-     <azure.mgmt.batch.models.PoolAllocationMode>`
-    :param key_vault_reference: A reference to the Azure key vault associated
-     with the Batch account.
-    :type key_vault_reference: :class:`KeyVaultReference
-     <azure.mgmt.batch.models.KeyVaultReference>`
     """
 
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
         'auto_storage': {'key': 'properties.autoStorage', 'type': 'AutoStorageBaseProperties'},
-        'pool_allocation_mode': {'key': 'properties.poolAllocationMode', 'type': 'PoolAllocationMode'},
-        'key_vault_reference': {'key': 'properties.keyVaultReference', 'type': 'KeyVaultReference'},
     }
 
-    def __init__(self, tags=None, auto_storage=None, pool_allocation_mode=None, key_vault_reference=None):
+    def __init__(self, tags=None, auto_storage=None):
         self.tags = tags
         self.auto_storage = auto_storage
-        self.pool_allocation_mode = pool_allocation_mode
-        self.key_vault_reference = key_vault_reference
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/batch_location_quota.py b/azure-mgmt-batch/azure/mgmt/batch/models/batch_location_quota.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/batch_management_client_enums.py b/azure-mgmt-batch/azure/mgmt/batch/models/batch_management_client_enums.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/key_vault_reference.py b/azure-mgmt-batch/azure/mgmt/batch/models/key_vault_reference.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/resource.py b/azure-mgmt-batch/azure/mgmt/batch/models/resource.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/models/update_application_parameters.py b/azure-mgmt-batch/azure/mgmt/batch/models/update_application_parameters.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/operations/__init__.py b/azure-mgmt-batch/azure/mgmt/batch/operations/__init__.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/operations/application_operations.py b/azure-mgmt-batch/azure/mgmt/batch/operations/application_operations.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/operations/application_package_operations.py b/azure-mgmt-batch/azure/mgmt/batch/operations/application_package_operations.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/operations/batch_account_operations.py b/azure-mgmt-batch/azure/mgmt/batch/operations/batch_account_operations.py
@@ -141,17 +141,19 @@ def get_long_running_output(response):
             get_long_running_status, long_running_operation_timeout)
 
     def update(
-            self, resource_group_name, account_name, parameters, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, tags=None, auto_storage=None, custom_headers=None, raw=False, **operation_config):
         """Updates the properties of an existing Batch account.
 
         :param resource_group_name: The name of the resource group that
          contains the Batch account.
         :type resource_group_name: str
         :param account_name: The name of the account.
         :type account_name: str
-        :param parameters: Additional parameters for account update.
-        :type parameters: :class:`BatchAccountUpdateParameters
-         <azure.mgmt.batch.models.BatchAccountUpdateParameters>`
+        :param tags: The user specified tags associated with the account.
+        :type tags: dict
+        :param auto_storage: The properties related to auto storage account.
+        :type auto_storage: :class:`AutoStorageBaseProperties
+         <azure.mgmt.batch.models.AutoStorageBaseProperties>`
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -162,6 +164,8 @@ def update(
          if raw=true
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
+        parameters = models.BatchAccountUpdateParameters(tags=tags, auto_storage=auto_storage)
+
         # Construct URL
         url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}'
         path_format_arguments = {

diff --git a/azure-mgmt-batch/azure/mgmt/batch/operations/location_operations.py b/azure-mgmt-batch/azure/mgmt/batch/operations/location_operations.py
diff --git a/azure-mgmt-batch/azure/mgmt/batch/version.py b/azure-mgmt-batch/azure/mgmt/batch/version.py