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

Merge 95bc64d4c349e9a79dc2031dead1bc40837ff5c9 into c2e43f8

Author: SDKAuto

sdk/batch/azure-mgmt-batch/MANIFEST.in

@@ -1,3 +1,4 @@
+include _meta.json
 recursive-include tests *.py *.yaml
 include *.md
 include azure/__init__.py

sdk/batch/azure-mgmt-batch/_meta.json

@@ -0,0 +1,8 @@
+{
+  "autorest": "V2",
+  "use": "@microsoft.azure/autorest.python@~4.0.71",
+  "commit": "51f2369aadb2ea7e64b0c2826e36ecc407b79332",
+  "repository_url": "https://github.com/Azure/azure-rest-api-specs",
+  "autorest_command": "autorest specification/batch/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk [email protected]/autorest.python@~4.0.71 --version=V2",
+  "readme": "specification/batch/resource-manager/readme.md"
+}

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

@@ -9,9 +9,9 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from ._configuration import BatchManagementClientConfiguration
-from ._batch_management_client import BatchManagementClient
-__all__ = ['BatchManagementClient', 'BatchManagementClientConfiguration']
+from ._configuration import BatchManagementConfiguration
+from ._batch_management import BatchManagement
+__all__ = ['BatchManagement', 'BatchManagementConfiguration']
 
 from .version import VERSION
 

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/_batch_management_client.py renamed to sdk/batch/azure-mgmt-batch/azure/mgmt/batch/_batch_management.py

@@ -12,7 +12,7 @@
 from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 
-from ._configuration import BatchManagementClientConfiguration
+from ._configuration import BatchManagementConfiguration
 from .operations import BatchAccountOperations
 from .operations import ApplicationPackageOperations
 from .operations import ApplicationOperations
@@ -25,11 +25,11 @@
 from . import models
 
 
-class BatchManagementClient(SDKClient):
-    """BatchManagementClient
+class BatchManagement(SDKClient):
+    """BatchManagement
 
     :ivar config: Configuration for client.
-    :vartype config: BatchManagementClientConfiguration
+    :vartype config: BatchManagementConfiguration
 
     :ivar batch_account: BatchAccount operations
     :vartype batch_account: azure.mgmt.batch.operations.BatchAccountOperations
@@ -62,11 +62,11 @@ class BatchManagementClient(SDKClient):
     def __init__(
             self, credentials, subscription_id, base_url=None):
 
-        self.config = BatchManagementClientConfiguration(credentials, subscription_id, base_url)
-        super(BatchManagementClient, self).__init__(self.config.credentials, self.config)
+        self.config = BatchManagementConfiguration(credentials, subscription_id, base_url)
+        super(BatchManagement, 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 = '2021-01-01'
+        self.api_version = '2021-06-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/_configuration.py

@@ -13,8 +13,8 @@
 from .version import VERSION
 
 
-class BatchManagementClientConfiguration(AzureConfiguration):
-    """Configuration for BatchManagementClient
+class BatchManagementConfiguration(AzureConfiguration):
+    """Configuration for BatchManagement
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
@@ -37,7 +37,7 @@ def __init__(
         if not base_url:
             base_url = 'https://management.azure.com'
 
-        super(BatchManagementClientConfiguration, self).__init__(base_url)
+        super(BatchManagementConfiguration, self).__init__(base_url)
 
         # Starting Autorest.Python 4.0.64, make connection pool activated by default
         self.keep_alive = True

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

@@ -25,13 +25,11 @@
     from ._models_py3 import BatchAccount
     from ._models_py3 import BatchAccountCreateParameters
     from ._models_py3 import BatchAccountIdentity
-    from ._models_py3 import BatchAccountIdentityUserAssignedIdentitiesValue
     from ._models_py3 import BatchAccountKeys
     from ._models_py3 import BatchAccountRegenerateKeyParameters
     from ._models_py3 import BatchAccountUpdateParameters
     from ._models_py3 import BatchLocationQuota
     from ._models_py3 import BatchPoolIdentity
-    from ._models_py3 import BatchPoolIdentityUserAssignedIdentitiesValue
     from ._models_py3 import Certificate
     from ._models_py3 import CertificateBaseProperties
     from ._models_py3 import CertificateCreateOrUpdateParameters
@@ -40,13 +38,17 @@
     from ._models_py3 import CheckNameAvailabilityResult
     from ._models_py3 import CIFSMountConfiguration
     from ._models_py3 import CloudServiceConfiguration
+    from ._models_py3 import ComputeNodeIdentityReference
     from ._models_py3 import ContainerConfiguration
     from ._models_py3 import ContainerRegistry
     from ._models_py3 import DataDisk
     from ._models_py3 import DeleteCertificateError
     from ._models_py3 import DeploymentConfiguration
+    from ._models_py3 import DiffDiskSettings
     from ._models_py3 import DiskEncryptionConfiguration
     from ._models_py3 import EncryptionProperties
+    from ._models_py3 import EndpointDependency
+    from ._models_py3 import EndpointDetail
     from ._models_py3 import EnvironmentSetting
     from ._models_py3 import FixedScaleSettings
     from ._models_py3 import ImageReference
@@ -62,6 +64,8 @@
     from ._models_py3 import NodePlacementConfiguration
     from ._models_py3 import Operation
     from ._models_py3 import OperationDisplay
+    from ._models_py3 import OSDisk
+    from ._models_py3 import OutboundEnvironmentEndpoint
     from ._models_py3 import Pool
     from ._models_py3 import PoolEndpointConfiguration
     from ._models_py3 import PrivateEndpoint
@@ -75,10 +79,13 @@
     from ._models_py3 import Resource
     from ._models_py3 import ResourceFile
     from ._models_py3 import ScaleSettings
+    from ._models_py3 import SkuCapability
     from ._models_py3 import StartTask
+    from ._models_py3 import SupportedSku
     from ._models_py3 import TaskContainerSettings
     from ._models_py3 import TaskSchedulingPolicy
     from ._models_py3 import UserAccount
+    from ._models_py3 import UserAssignedIdentities
     from ._models_py3 import UserIdentity
     from ._models_py3 import VirtualMachineConfiguration
     from ._models_py3 import VirtualMachineFamilyCoreQuota
@@ -101,13 +108,11 @@
     from ._models import BatchAccount
     from ._models import BatchAccountCreateParameters
     from ._models import BatchAccountIdentity
-    from ._models import BatchAccountIdentityUserAssignedIdentitiesValue
     from ._models import BatchAccountKeys
     from ._models import BatchAccountRegenerateKeyParameters
     from ._models import BatchAccountUpdateParameters
     from ._models import BatchLocationQuota
     from ._models import BatchPoolIdentity
-    from ._models import BatchPoolIdentityUserAssignedIdentitiesValue
     from ._models import Certificate
     from ._models import CertificateBaseProperties
     from ._models import CertificateCreateOrUpdateParameters
@@ -116,13 +121,17 @@
     from ._models import CheckNameAvailabilityResult
     from ._models import CIFSMountConfiguration
     from ._models import CloudServiceConfiguration
+    from ._models import ComputeNodeIdentityReference
     from ._models import ContainerConfiguration
     from ._models import ContainerRegistry
     from ._models import DataDisk
     from ._models import DeleteCertificateError
     from ._models import DeploymentConfiguration
+    from ._models import DiffDiskSettings
     from ._models import DiskEncryptionConfiguration
     from ._models import EncryptionProperties
+    from ._models import EndpointDependency
+    from ._models import EndpointDetail
     from ._models import EnvironmentSetting
     from ._models import FixedScaleSettings
     from ._models import ImageReference
@@ -138,6 +147,8 @@
     from ._models import NodePlacementConfiguration
     from ._models import Operation
     from ._models import OperationDisplay
+    from ._models import OSDisk
+    from ._models import OutboundEnvironmentEndpoint
     from ._models import Pool
     from ._models import PoolEndpointConfiguration
     from ._models import PrivateEndpoint
@@ -151,10 +162,13 @@
     from ._models import Resource
     from ._models import ResourceFile
     from ._models import ScaleSettings
+    from ._models import SkuCapability
     from ._models import StartTask
+    from ._models import SupportedSku
     from ._models import TaskContainerSettings
     from ._models import TaskSchedulingPolicy
     from ._models import UserAccount
+    from ._models import UserAssignedIdentities
     from ._models import UserIdentity
     from ._models import VirtualMachineConfiguration
     from ._models import VirtualMachineFamilyCoreQuota
@@ -166,11 +180,15 @@
 from ._paged_models import BatchAccountPaged
 from ._paged_models import CertificatePaged
 from ._paged_models import OperationPaged
+from ._paged_models import OutboundEnvironmentEndpointPaged
 from ._paged_models import PoolPaged
 from ._paged_models import PrivateEndpointConnectionPaged
 from ._paged_models import PrivateLinkResourcePaged
-from ._batch_management_client_enums import (
+from ._paged_models import SupportedSkuPaged
+from ._batch_management_enums import (
+    AutoStorageAuthenticationMode,
     KeySource,
+    AuthenticationMode,
     PoolAllocationMode,
     PublicNetworkAccessType,
     ResourceIdentityType,
@@ -187,6 +205,7 @@
     StorageAccountType,
     DiskEncryptionTarget,
     NodePlacementPolicyType,
+    DiffDiskPlacement,
     ComputeNodeDeallocationOption,
     InterNodeCommunicationState,
     InboundEndpointProtocol,
@@ -219,13 +238,11 @@
     'BatchAccount',
     'BatchAccountCreateParameters',
     'BatchAccountIdentity',
-    'BatchAccountIdentityUserAssignedIdentitiesValue',
     'BatchAccountKeys',
     'BatchAccountRegenerateKeyParameters',
     'BatchAccountUpdateParameters',
     'BatchLocationQuota',
     'BatchPoolIdentity',
-    'BatchPoolIdentityUserAssignedIdentitiesValue',
     'Certificate',
     'CertificateBaseProperties',
     'CertificateCreateOrUpdateParameters',
@@ -234,13 +251,17 @@
     'CheckNameAvailabilityResult',
     'CIFSMountConfiguration',
     'CloudServiceConfiguration',
+    'ComputeNodeIdentityReference',
     'ContainerConfiguration',
     'ContainerRegistry',
     'DataDisk',
     'DeleteCertificateError',
     'DeploymentConfiguration',
+    'DiffDiskSettings',
     'DiskEncryptionConfiguration',
     'EncryptionProperties',
+    'EndpointDependency',
+    'EndpointDetail',
     'EnvironmentSetting',
     'FixedScaleSettings',
     'ImageReference',
@@ -256,6 +277,8 @@
     'NodePlacementConfiguration',
     'Operation',
     'OperationDisplay',
+    'OSDisk',
+    'OutboundEnvironmentEndpoint',
     'Pool',
     'PoolEndpointConfiguration',
     'PrivateEndpoint',
@@ -269,25 +292,32 @@
     'Resource',
     'ResourceFile',
     'ScaleSettings',
+    'SkuCapability',
     'StartTask',
+    'SupportedSku',
     'TaskContainerSettings',
     'TaskSchedulingPolicy',
     'UserAccount',
+    'UserAssignedIdentities',
     'UserIdentity',
     'VirtualMachineConfiguration',
     'VirtualMachineFamilyCoreQuota',
     'VMExtension',
     'WindowsConfiguration',
     'WindowsUserConfiguration',
     'BatchAccountPaged',
+    'OutboundEnvironmentEndpointPaged',
     'ApplicationPackagePaged',
     'ApplicationPaged',
+    'SupportedSkuPaged',
     'OperationPaged',
     'CertificatePaged',
     'PrivateLinkResourcePaged',
     'PrivateEndpointConnectionPaged',
     'PoolPaged',
+    'AutoStorageAuthenticationMode',
     'KeySource',
+    'AuthenticationMode',
     'PoolAllocationMode',
     'PublicNetworkAccessType',
     'ResourceIdentityType',
@@ -304,6 +334,7 @@
     'StorageAccountType',
     'DiskEncryptionTarget',
     'NodePlacementPolicyType',
+    'DiffDiskPlacement',
     'ComputeNodeDeallocationOption',
     'InterNodeCommunicationState',
     'InboundEndpointProtocol',

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/models/_batch_management_client_enums.py renamed to sdk/batch/azure-mgmt-batch/azure/mgmt/batch/models/_batch_management_enums.py

@@ -12,12 +12,25 @@
 from enum import Enum
 
 
+class AutoStorageAuthenticationMode(str, Enum):
+
+    storage_keys = "StorageKeys"  #: The Batch service will authenticate requests to auto-storage using storage account keys.
+    batch_account_managed_identity = "BatchAccountManagedIdentity"  #: The Batch service will authenticate requests to auto-storage using the managed identity assigned to the Batch account.
+
+
 class KeySource(str, Enum):
 
     microsoft_batch = "Microsoft.Batch"  #: Batch creates and manages the encryption keys used to protect the account data.
     microsoft_key_vault = "Microsoft.KeyVault"  #: The encryption keys used to protect the account data are stored in an external key vault. If this is set then the Batch Account identity must be set to `SystemAssigned` and a valid Key Identifier must also be supplied under the keyVaultProperties.
 
 
+class AuthenticationMode(str, Enum):
+
+    shared_key = "SharedKey"  #: The authentication mode using shared keys.
+    aad = "AAD"  #: The authentication mode using Azure Active Directory.
+    task_authentication_token = "TaskAuthenticationToken"  #: The authentication mode using task authentication tokens.
+
+
 class PoolAllocationMode(str, Enum):
 
     batch_service = "BatchService"  #: Pools will be allocated in subscriptions owned by the Batch service.
@@ -125,6 +138,11 @@ class NodePlacementPolicyType(str, Enum):
     zonal = "Zonal"  #: Nodes in the pool will be spread across different zones with best effort balancing.
 
 
+class DiffDiskPlacement(str, Enum):
+
+    cache_disk = "CacheDisk"  #: The Ephemeral OS Disk is stored on the VM cache.
+
+
 class ComputeNodeDeallocationOption(str, Enum):
 
     requeue = "Requeue"  #: Terminate running task processes and requeue the tasks. The tasks will run again when a node is available. Remove nodes as soon as tasks have been terminated.