Update from master

sdk/batch/azure-mgmt-batch/CHANGELOG.md

@@ -1,19 +1,5 @@
 # Release History
 
-## 8.0.0 (2020-04-10)
-### REST API version
-- This version targets REST API version 2020-03-01.
-
-### Features
-- Added ability to access the Batch DataPlane API without needing a public DNS entry for the account via the new `public_network_access` property on `BatchAccount`.
-- Added new `PrivateLinkResource` and `PrivateEndpointConnection` resource types. These are both only used when the `public_network_access` property on `BatchAccount` is set to `Disabled`.
-  - When `public_network_access` is set to `Disabled` a new `PrivateLinkResource` is visible in that account, which can be used to connect to the account using an ARM Private Endpoint in your VNET.
-- Added ability to encrypt `ComputeNode` disk drives using the new `disk_encryption_configuration` property of `VirtualMachineConfiguration`.
-- **[Breaking]** The `id` property of `ImageReference` can now only refer to a Shared Image Gallery image.
-- **[Breaking]** Pools can now be provisioned without a public IP using the new `public_ip_configuration` property of `NetworkConfiguration`.
-  - The `public_ips` property of `NetworkConfiguration` has moved in to `PublicIPAddressConfiguration` as well. This property can only be specified if `IPAddressProvisioningType` is `UserManaged`.
-
-
 ## 7.0.0 (2019-08-05)
 
   - Added ability to specify a collection of public IPs on

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

@@ -185,8 +185,6 @@
     ContainerWorkingDirectory,
     CertificateStoreLocation,
     CertificateVisibility,
-    ContainerType,
-    ResourceType,
     NameAvailabilityReason,
 )
 
@@ -295,7 +293,5 @@
     'ContainerWorkingDirectory',
     'CertificateStoreLocation',
     'CertificateVisibility',
-    'ContainerType',
-    'ResourceType',
     'NameAvailabilityReason',
 ]

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

@@ -188,16 +188,6 @@ class CertificateVisibility(str, Enum):
     remote_user = "RemoteUser"  #: The certificate should be visible to the user accounts under which users remotely access the node.
 
 
-class ContainerType(str, Enum):
-
-    docker_compatible = "DockerCompatible"  #: A Docker compatible container technology will be used to launch the containers.
-
-
-class ResourceType(str, Enum):
-
-    batch_accounts = "Microsoft.Batch/batchAccounts"  #: The Batch account resource type.
-
-
 class NameAvailabilityReason(str, Enum):
 
     invalid = "Invalid"  #: The requested name is invalid.

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

@@ -25,8 +25,6 @@ class BatchAccountPaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(BatchAccountPaged, self).__init__(*args, **kwargs)
-
-
 class ApplicationPackagePaged(Paged):
     """
     A paging container for iterating over a list of :class:`ApplicationPackage <azure.mgmt.batch.models.ApplicationPackage>` object
@@ -40,8 +38,6 @@ class ApplicationPackagePaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(ApplicationPackagePaged, self).__init__(*args, **kwargs)
-
-
 class ApplicationPaged(Paged):
     """
     A paging container for iterating over a list of :class:`Application <azure.mgmt.batch.models.Application>` object
@@ -55,8 +51,6 @@ class ApplicationPaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(ApplicationPaged, self).__init__(*args, **kwargs)
-
-
 class OperationPaged(Paged):
     """
     A paging container for iterating over a list of :class:`Operation <azure.mgmt.batch.models.Operation>` object
@@ -70,8 +64,6 @@ class OperationPaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(OperationPaged, self).__init__(*args, **kwargs)
-
-
 class CertificatePaged(Paged):
     """
     A paging container for iterating over a list of :class:`Certificate <azure.mgmt.batch.models.Certificate>` object
@@ -85,8 +77,6 @@ class CertificatePaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(CertificatePaged, self).__init__(*args, **kwargs)
-
-
 class PrivateLinkResourcePaged(Paged):
     """
     A paging container for iterating over a list of :class:`PrivateLinkResource <azure.mgmt.batch.models.PrivateLinkResource>` object
@@ -100,8 +90,6 @@ class PrivateLinkResourcePaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(PrivateLinkResourcePaged, self).__init__(*args, **kwargs)
-
-
 class PrivateEndpointConnectionPaged(Paged):
     """
     A paging container for iterating over a list of :class:`PrivateEndpointConnection <azure.mgmt.batch.models.PrivateEndpointConnection>` object
@@ -115,8 +103,6 @@ class PrivateEndpointConnectionPaged(Paged):
     def __init__(self, *args, **kwargs):
 
         super(PrivateEndpointConnectionPaged, self).__init__(*args, **kwargs)
-
-
 class PoolPaged(Paged):
     """
     A paging container for iterating over a list of :class:`Pool <azure.mgmt.batch.models.Pool>` object

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

@@ -25,7 +25,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: The API version to use for the request. Constant value: "2020-03-01".
+    :ivar api_version: The API version to be used with the HTTP request. Constant value: "2020-03-01".
     """
 
     models = models

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/operations/_application_package_operations.py

@@ -25,7 +25,7 @@ class ApplicationPackageOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version to use for the request. Constant value: "2020-03-01".
+    :ivar api_version: The API version to be used with the HTTP request. Constant value: "2020-03-01".
     """
 
     models = models

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/operations/_batch_account_operations.py

@@ -27,7 +27,7 @@ class BatchAccountOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version to use for the request. Constant value: "2020-03-01".
+    :ivar api_version: The API version to be used with the HTTP request. Constant value: "2020-03-01".
     """
 
     models = models
@@ -162,19 +162,17 @@ def get_long_running_output(response):
     create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}'}
 
     def update(
-            self, resource_group_name, account_name, tags=None, auto_storage=None, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, parameters, 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 Batch account.
         :type account_name: str
-        :param tags: The user-specified tags associated with the account.
-        :type tags: dict[str, str]
-        :param auto_storage: The properties related to the auto-storage
-         account.
-        :type auto_storage: ~azure.mgmt.batch.models.AutoStorageBaseProperties
+        :param parameters: Additional parameters for account update.
+        :type parameters:
+         ~azure.mgmt.batch.models.BatchAccountUpdateParameters
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -185,8 +183,6 @@ def update(
          ~msrest.pipeline.ClientRawResponse
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
-        parameters = models.BatchAccountUpdateParameters(tags=tags, auto_storage=auto_storage)
-
         # Construct URL
         url = self.update.metadata['url']
         path_format_arguments = {

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/operations/_certificate_operations.py

@@ -27,7 +27,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: The API version to use for the request. Constant value: "2020-03-01".
+    :ivar api_version: The API version to be used with the HTTP request. Constant value: "2020-03-01".
     """
 
     models = models

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/operations/_location_operations.py

@@ -25,7 +25,7 @@ class LocationOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version to use for the request. Constant value: "2020-03-01".
+    :ivar api_version: The API version to be used with the HTTP request. Constant value: "2020-03-01".
     """
 
     models = models

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/operations/_operations.py

@@ -25,7 +25,7 @@ class Operations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version to use for the request. Constant value: "2020-03-01".
+    :ivar api_version: The API version to be used with the HTTP request. Constant value: "2020-03-01".
     """
 
     models = models

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/operations/_pool_operations.py

@@ -27,7 +27,7 @@ class PoolOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version to use for the request. Constant value: "2020-03-01".
+    :ivar api_version: The API version to be used with the HTTP request. Constant value: "2020-03-01".
     """
 
     models = models

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/operations/_private_endpoint_connection_operations.py

@@ -25,7 +25,7 @@ class PrivateEndpointConnectionOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version to use for the request. Constant value: "2020-03-01".
+    :ivar api_version: The API version to be used with the HTTP request. Constant value: "2020-03-01".
     """
 
     models = models

sdk/batch/azure-mgmt-batch/azure/mgmt/batch/operations/_private_link_resource_operations.py

@@ -25,7 +25,7 @@ class PrivateLinkResourceOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version to use for the request. Constant value: "2020-03-01".
+    :ivar api_version: The API version to be used with the HTTP request. Constant value: "2020-03-01".
     """
 
     models = models

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

@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "8.0.0"
+VERSION = "7.0.0"
 

sdk/batch/azure-mgmt-batch/tests/mgmt_batch_preparers.py

@@ -25,8 +25,7 @@ def __init__(self,
         super(KeyVaultPreparer, self).__init__(name_prefix, 24,
                                                disable_recording=disable_recording,
                                                playback_fake_resource=playback_fake_resource,
-                                               client_kwargs=client_kwargs,
-                                               random_name_enabled=True)
+                                               client_kwargs=client_kwargs)
         self.location = location
         self.resource_group_parameter_name = resource_group_parameter_name
         self.parameter_name = parameter_name