Azure Batch Data-Plane SDK Upgrade (Azure#15460)

* Ran autorest

* Update test recordings

* Update import for azure identity and new recording for test_batch_files

* Fix batch name error when running against recordings and update recordings for all data-plane tests

* Fix test_batch_applications and test_batch_jobs

* Add scrubber

* Update test_batch_files recording

Author: cRui861

sdk/batch/azure-batch/azure/batch/_batch_service_client.py

@@ -64,7 +64,7 @@ def __init__(
         super(BatchServiceClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2020-03-01.11.0'
+        self.api_version = '2020-09-01.12.0'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
@@ -86,6 +86,4 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.compute_node = ComputeNodeOperations(
             self._client, self.config, self._serialize, self._deserialize)
-
-
 patch_client()

sdk/batch/azure-batch/azure/batch/models/__init__.py

@@ -194,6 +194,7 @@
     from ._models_py3 import TaskContainerExecutionInformation
     from ._models_py3 import TaskContainerSettings
     from ._models_py3 import TaskCounts
+    from ._models_py3 import TaskCountsResult
     from ._models_py3 import TaskDeleteOptions
     from ._models_py3 import TaskDependencies
     from ._models_py3 import TaskExecutionInformation
@@ -205,6 +206,7 @@
     from ._models_py3 import TaskListSubtasksOptions
     from ._models_py3 import TaskReactivateOptions
     from ._models_py3 import TaskSchedulingPolicy
+    from ._models_py3 import TaskSlotCounts
     from ._models_py3 import TaskStatistics
     from ._models_py3 import TaskTerminateOptions
     from ._models_py3 import TaskUpdateOptions
@@ -402,6 +404,7 @@
     from ._models import TaskContainerExecutionInformation
     from ._models import TaskContainerSettings
     from ._models import TaskCounts
+    from ._models import TaskCountsResult
     from ._models import TaskDeleteOptions
     from ._models import TaskDependencies
     from ._models import TaskExecutionInformation
@@ -413,6 +416,7 @@
     from ._models import TaskListSubtasksOptions
     from ._models import TaskReactivateOptions
     from ._models import TaskSchedulingPolicy
+    from ._models import TaskSlotCounts
     from ._models import TaskStatistics
     from ._models import TaskTerminateOptions
     from ._models import TaskUpdateOptions
@@ -669,6 +673,7 @@
     'TaskContainerExecutionInformation',
     'TaskContainerSettings',
     'TaskCounts',
+    'TaskCountsResult',
     'TaskDeleteOptions',
     'TaskDependencies',
     'TaskExecutionInformation',
@@ -680,6 +685,7 @@
     'TaskListSubtasksOptions',
     'TaskReactivateOptions',
     'TaskSchedulingPolicy',
+    'TaskSlotCounts',
     'TaskStatistics',
     'TaskTerminateOptions',
     'TaskUpdateOptions',

sdk/batch/azure-batch/azure/batch/models/_batch_service_client_enums.py

@@ -89,7 +89,7 @@ class OutputFileUploadCondition(str, Enum):
 class ComputeNodeFillType(str, Enum):
 
     spread = "spread"  #: Tasks should be assigned evenly across all Compute Nodes in the Pool.
-    pack = "pack"  #: As many Tasks as possible (maxTasksPerNode) should be assigned to each Compute Node in the Pool before any Tasks are assigned to the next Compute Node in the Pool.
+    pack = "pack"  #: As many Tasks as possible (taskSlotsPerNode) should be assigned to each Compute Node in the Pool before any Tasks are assigned to the next Compute Node in the Pool.
 
 
 class CertificateStoreLocation(str, Enum):
@@ -120,7 +120,7 @@ class StorageAccountType(str, Enum):
 
 class DiskEncryptionTarget(str, Enum):
 
-    os_disk = "osdisk"  #: The OS Disk on the compute node is encrypted.
+    os_disk = "osdisk"  #: The temporary disk on the compute node is encrypted. On Linux this encryption applies to other partitions (such as those on mounted data disks) when encryption occurs at boot time.
     temporary_disk = "temporarydisk"  #: The temporary disk on the compute node is encrypted. On Linux this encryption applies to other partitions (such as those on mounted data disks) when encryption occurs at boot time.
 
 

sdk/batch/azure-batch/azure/batch/models/_models.py

@@ -23,8 +23,8 @@ class ApplicationSummaryPaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(ApplicationSummaryPaged, self).__init__(*args, **kwargs)
 
+        super(ApplicationSummaryPaged, self).__init__(*args, **kwargs)
 class PoolUsageMetricsPaged(Paged):
     """
     A paging container for iterating over a list of :class:`PoolUsageMetrics <azure.batch.models.PoolUsageMetrics>` object
@@ -36,8 +36,8 @@ class PoolUsageMetricsPaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(PoolUsageMetricsPaged, self).__init__(*args, **kwargs)
 
+        super(PoolUsageMetricsPaged, self).__init__(*args, **kwargs)
 class CloudPoolPaged(Paged):
     """
     A paging container for iterating over a list of :class:`CloudPool <azure.batch.models.CloudPool>` object
@@ -49,8 +49,8 @@ class CloudPoolPaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(CloudPoolPaged, self).__init__(*args, **kwargs)
 
+        super(CloudPoolPaged, self).__init__(*args, **kwargs)
 class ImageInformationPaged(Paged):
     """
     A paging container for iterating over a list of :class:`ImageInformation <azure.batch.models.ImageInformation>` object
@@ -62,8 +62,8 @@ class ImageInformationPaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(ImageInformationPaged, self).__init__(*args, **kwargs)
 
+        super(ImageInformationPaged, self).__init__(*args, **kwargs)
 class PoolNodeCountsPaged(Paged):
     """
     A paging container for iterating over a list of :class:`PoolNodeCounts <azure.batch.models.PoolNodeCounts>` object
@@ -75,8 +75,8 @@ class PoolNodeCountsPaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(PoolNodeCountsPaged, self).__init__(*args, **kwargs)
 
+        super(PoolNodeCountsPaged, self).__init__(*args, **kwargs)
 class CloudJobPaged(Paged):
     """
     A paging container for iterating over a list of :class:`CloudJob <azure.batch.models.CloudJob>` object
@@ -88,8 +88,8 @@ class CloudJobPaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(CloudJobPaged, self).__init__(*args, **kwargs)
 
+        super(CloudJobPaged, self).__init__(*args, **kwargs)
 class JobPreparationAndReleaseTaskExecutionInformationPaged(Paged):
     """
     A paging container for iterating over a list of :class:`JobPreparationAndReleaseTaskExecutionInformation <azure.batch.models.JobPreparationAndReleaseTaskExecutionInformation>` object
@@ -101,8 +101,8 @@ class JobPreparationAndReleaseTaskExecutionInformationPaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(JobPreparationAndReleaseTaskExecutionInformationPaged, self).__init__(*args, **kwargs)
 
+        super(JobPreparationAndReleaseTaskExecutionInformationPaged, self).__init__(*args, **kwargs)
 class CertificatePaged(Paged):
     """
     A paging container for iterating over a list of :class:`Certificate <azure.batch.models.Certificate>` object
@@ -114,8 +114,8 @@ class CertificatePaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(CertificatePaged, self).__init__(*args, **kwargs)
 
+        super(CertificatePaged, self).__init__(*args, **kwargs)
 class NodeFilePaged(Paged):
     """
     A paging container for iterating over a list of :class:`NodeFile <azure.batch.models.NodeFile>` object
@@ -127,8 +127,8 @@ class NodeFilePaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(NodeFilePaged, self).__init__(*args, **kwargs)
 
+        super(NodeFilePaged, self).__init__(*args, **kwargs)
 class CloudJobSchedulePaged(Paged):
     """
     A paging container for iterating over a list of :class:`CloudJobSchedule <azure.batch.models.CloudJobSchedule>` object
@@ -140,8 +140,8 @@ class CloudJobSchedulePaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(CloudJobSchedulePaged, self).__init__(*args, **kwargs)
 
+        super(CloudJobSchedulePaged, self).__init__(*args, **kwargs)
 class CloudTaskPaged(Paged):
     """
     A paging container for iterating over a list of :class:`CloudTask <azure.batch.models.CloudTask>` object
@@ -153,8 +153,8 @@ class CloudTaskPaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
-        super(CloudTaskPaged, self).__init__(*args, **kwargs)
 
+        super(CloudTaskPaged, self).__init__(*args, **kwargs)
 class ComputeNodePaged(Paged):
     """
     A paging container for iterating over a list of :class:`ComputeNode <azure.batch.models.ComputeNode>` object
@@ -166,4 +166,5 @@ class ComputeNodePaged(Paged):
     }
 
     def __init__(self, *args, **kwargs):
+
         super(ComputeNodePaged, self).__init__(*args, **kwargs)

sdk/batch/azure-batch/azure/batch/models/_models_py3.py

@@ -24,7 +24,7 @@ class AccountOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client API Version. Constant value: "2020-03-01.11.0".
+    :ivar api_version: Client API Version. Constant value: "2020-09-01.12.0".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-03-01.11.0"
+        self.api_version = "2020-09-01.12.0"
 
         self.config = config
 
@@ -140,7 +140,9 @@ def internal_paging(next_link=None):
 
     def list_pool_node_counts(
             self, account_list_pool_node_counts_options=None, custom_headers=None, raw=False, **operation_config):
-        """Gets the number of Compute Nodes in each state, grouped by Pool.
+        """Gets the number of Compute Nodes in each state, grouped by Pool. Note
+        that the numbers returned may not always be up to date. If you need
+        exact node counts, use a list query.
 
         :param account_list_pool_node_counts_options: Additional parameters
          for the operation

sdk/batch/azure-batch/azure/batch/models/_paged_models.py

@@ -24,7 +24,7 @@ class ApplicationOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client API Version. Constant value: "2020-03-01.11.0".
+    :ivar api_version: Client API Version. Constant value: "2020-09-01.12.0".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-03-01.11.0"
+        self.api_version = "2020-09-01.12.0"
 
         self.config = config
 

sdk/batch/azure-batch/azure/batch/operations/_account_operations.py

@@ -24,7 +24,7 @@ class CertificateOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client API Version. Constant value: "2020-03-01.11.0".
+    :ivar api_version: Client API Version. Constant value: "2020-09-01.12.0".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-03-01.11.0"
+        self.api_version = "2020-09-01.12.0"
 
         self.config = config
 

sdk/batch/azure-batch/azure/batch/operations/_application_operations.py

@@ -24,7 +24,7 @@ class ComputeNodeOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client API Version. Constant value: "2020-03-01.11.0".
+    :ivar api_version: Client API Version. Constant value: "2020-09-01.12.0".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-03-01.11.0"
+        self.api_version = "2020-09-01.12.0"
 
         self.config = config