Merge pull request #11 from annatisch/batch-mgmt-fix

Test + notes update
Azure · Mar 7, 2017 · e41b1e2 · e41b1e2
2 parents 12dc242 + ffc4d79
commit e41b1e2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/azure-mgmt-batch/HISTORY.rst b/azure-mgmt-batch/HISTORY.rst
@@ -3,7 +3,7 @@
 Release History
 ===============
 
-3.0.0 (2017-02-23)
+3.0.0 (2017-03-07)
 ++++++++++++++++++
 
 - Updated `BatchAccount` model - support for pool allocation in the user's subscription.
@@ -12,7 +12,6 @@ Release History
 - Updated `ApplicationPackage` model - properties are now read only.
 - Updated `BatchAccountKeys` model - properties are now read only.
 - Updated `BatchLocationQuota` model - properties are now read only.
-- Update Batch Account operation now takes a `BatchAccountUpdateParameters` object rather than `tags` and `auto_storage` parameters.
 
 2.0.0 (2016-10-04)
 ++++++++++++++++++

diff --git a/azure-mgmt/tests/test_batch.py b/azure-mgmt/tests/test_batch.py
@@ -387,9 +387,9 @@ def test_batch_accounts(self):
 
         _m = "Test Update Account"
         LOG.debug(_m)
-        update_params = {'tags': {'Name': 'tagName', 'Value': 'tagValue'}}
+        update_tags = {'Name': 'tagName', 'Value': 'tagValue'}
         updated = self.assertRuns(_e, _m, self.batch_mgmt_client.batch_account.update,
-                                   AZURE_RESOURCE_GROUP, AZURE_BATCH_ACCOUNT, update_params)
+                                   AZURE_RESOURCE_GROUP, AZURE_BATCH_ACCOUNT, update_tags)
         self.assertTrue(_e, _m, isinstance(updated, azure.mgmt.batch.models.BatchAccount))
         if updated:
             self.assertEqual(_e, _m, updated.tags['Name'], 'tagName')

diff --git a/azure.pyproj b/azure.pyproj
@@ -47,9 +47,11 @@
     <Compile Include="azure-batch\azure\batch\models\application_package_reference.py" />
     <Compile Include="azure-batch\azure\batch\models\application_summary.py" />
     <Compile Include="azure-batch\azure\batch\models\application_summary_paged.py" />
+    <Compile Include="azure-batch\azure\batch\models\authentication_token_settings.py" />
     <Compile Include="azure-batch\azure\batch\models\auto_pool_specification.py" />
     <Compile Include="azure-batch\azure\batch\models\auto_scale_run.py" />
     <Compile Include="azure-batch\azure\batch\models\auto_scale_run_error.py" />
+    <Compile Include="azure-batch\azure\batch\models\auto_user_specification.py" />
     <Compile Include="azure-batch\azure\batch\models\batch_error.py" />
     <Compile Include="azure-batch\azure\batch\models\batch_error_detail.py" />
     <Compile Include="azure-batch\azure\batch\models\batch_service_client_enums.py" />
@@ -92,12 +94,16 @@
     <Compile Include="azure-batch\azure\batch\models\delete_certificate_error.py" />
     <Compile Include="azure-batch\azure\batch\models\environment_setting.py" />
     <Compile Include="azure-batch\azure\batch\models\error_message.py" />
+    <Compile Include="azure-batch\azure\batch\models\exit_code_mapping.py" />
+    <Compile Include="azure-batch\azure\batch\models\exit_code_range_mapping.py" />
+    <Compile Include="azure-batch\azure\batch\models\exit_conditions.py" />
+    <Compile Include="azure-batch\azure\batch\models\exit_options.py" />
     <Compile Include="azure-batch\azure\batch\models\file_delete_from_compute_node_options.py" />
     <Compile Include="azure-batch\azure\batch\models\file_delete_from_task_options.py" />
     <Compile Include="azure-batch\azure\batch\models\file_get_from_compute_node_options.py" />
     <Compile Include="azure-batch\azure\batch\models\file_get_from_task_options.py" />
-    <Compile Include="azure-batch\azure\batch\models\file_get_node_file_properties_from_compute_node_options.py" />
-    <Compile Include="azure-batch\azure\batch\models\file_get_node_file_properties_from_task_options.py" />
+    <Compile Include="azure-batch\azure\batch\models\file_get_properties_from_compute_node_options.py" />
+    <Compile Include="azure-batch\azure\batch\models\file_get_properties_from_task_options.py" />
     <Compile Include="azure-batch\azure\batch\models\file_list_from_compute_node_options.py" />
     <Compile Include="azure-batch\azure\batch\models\file_list_from_task_options.py" />
     <Compile Include="azure-batch\azure\batch\models\file_properties.py" />
@@ -110,7 +116,7 @@
     <Compile Include="azure-batch\azure\batch\models\job_disable_parameter.py" />
     <Compile Include="azure-batch\azure\batch\models\job_enable_options.py" />
     <Compile Include="azure-batch\azure\batch\models\job_execution_information.py" />
-    <Compile Include="azure-batch\azure\batch\models\job_get_all_jobs_lifetime_statistics_options.py" />
+    <Compile Include="azure-batch\azure\batch\models\job_get_all_lifetime_statistics_options.py" />
     <Compile Include="azure-batch\azure\batch\models\job_get_options.py" />
     <Compile Include="azure-batch\azure\batch\models\job_list_from_job_schedule_options.py" />
     <Compile Include="azure-batch\azure\batch\models\job_list_options.py" />
@@ -149,6 +155,7 @@
     <Compile Include="azure-batch\azure\batch\models\metadata_item.py" />
     <Compile Include="azure-batch\azure\batch\models\multi_instance_settings.py" />
     <Compile Include="azure-batch\azure\batch\models\name_value_pair.py" />
+    <Compile Include="azure-batch\azure\batch\models\network_configuration.py" />
     <Compile Include="azure-batch\azure\batch\models\node_agent_sku.py" />
     <Compile Include="azure-batch\azure\batch\models\node_agent_sku_paged.py" />
     <Compile Include="azure-batch\azure\batch\models\node_disable_scheduling_parameter.py" />
@@ -158,6 +165,7 @@
     <Compile Include="azure-batch\azure\batch\models\node_reimage_parameter.py" />
     <Compile Include="azure-batch\azure\batch\models\node_remove_parameter.py" />
     <Compile Include="azure-batch\azure\batch\models\node_update_user_parameter.py" />
+    <Compile Include="azure-batch\azure\batch\models\os_disk.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_add_options.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_add_parameter.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_delete_options.py" />
@@ -167,11 +175,11 @@
     <Compile Include="azure-batch\azure\batch\models\pool_evaluate_auto_scale_options.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_evaluate_auto_scale_parameter.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_exists_options.py" />
-    <Compile Include="azure-batch\azure\batch\models\pool_get_all_pools_lifetime_statistics_options.py" />
+    <Compile Include="azure-batch\azure\batch\models\pool_get_all_lifetime_statistics_options.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_get_options.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_information.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_list_options.py" />
-    <Compile Include="azure-batch\azure\batch\models\pool_list_pool_usage_metrics_options.py" />
+    <Compile Include="azure-batch\azure\batch\models\pool_list_usage_metrics_options.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_patch_options.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_patch_parameter.py" />
     <Compile Include="azure-batch\azure\batch\models\pool_remove_nodes_options.py" />
@@ -209,13 +217,16 @@
     <Compile Include="azure-batch\azure\batch\models\task_information.py" />
     <Compile Include="azure-batch\azure\batch\models\task_list_options.py" />
     <Compile Include="azure-batch\azure\batch\models\task_list_subtasks_options.py" />
+    <Compile Include="azure-batch\azure\batch\models\task_reactivate_options.py" />
     <Compile Include="azure-batch\azure\batch\models\task_scheduling_error.py" />
     <Compile Include="azure-batch\azure\batch\models\task_scheduling_policy.py" />
     <Compile Include="azure-batch\azure\batch\models\task_statistics.py" />
     <Compile Include="azure-batch\azure\batch\models\task_terminate_options.py" />
     <Compile Include="azure-batch\azure\batch\models\task_update_options.py" />
     <Compile Include="azure-batch\azure\batch\models\task_update_parameter.py" />
     <Compile Include="azure-batch\azure\batch\models\usage_statistics.py" />
+    <Compile Include="azure-batch\azure\batch\models\user_account.py" />
+    <Compile Include="azure-batch\azure\batch\models\user_identity.py" />
     <Compile Include="azure-batch\azure\batch\models\virtual_machine_configuration.py" />
     <Compile Include="azure-batch\azure\batch\models\windows_configuration.py" />
     <Compile Include="azure-batch\azure\batch\models\__init__.py" />
@@ -381,31 +392,29 @@
     <Compile Include="azure-mgmt-authorization\azure\__init__.py" />
     <Compile Include="azure-mgmt-authorization\setup.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\batch_management_client.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\account_base_properties.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\account_resource.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\account_resource_paged.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\activate_application_package_parameters.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\add_application_package_result.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\add_application_parameters.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\application.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\application_package.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\application_paged.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\auto_storage_base_properties.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\auto_storage_properties.py" />
+    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_account.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_account_create_parameters.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_account_list_key_result.py" />
+    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_account_keys.py" />
+    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_account_paged.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_account_regenerate_key_parameters.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_account_regenerate_key_result.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_account_update_parameters.py" />
+    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_location_quota.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\batch_management_client_enums.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\get_application_package_result.py" />
+    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\key_vault_reference.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\resource.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\subscription_quotas_get_result.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\update_application_parameters.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\models\__init__.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\operations\account_operations.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\operations\application_operations.py" />
-    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\operations\subscription_operations.py" />
+    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\operations\application_package_operations.py" />
+    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\operations\batch_account_operations.py" />
+    <Compile Include="azure-mgmt-batch\azure\mgmt\batch\operations\location_operations.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\operations\__init__.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\batch\__init__.py" />
     <Compile Include="azure-mgmt-batch\azure\mgmt\__init__.py" />