diff --git a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py index 657a62a111c8..9d55d22a4796 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py +++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py @@ -586,19 +586,6 @@ def virtual_machine_run_commands(self): raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property - def virtual_machine_scale_set(self): - """Instance depends on the API version: - - * 2019-03-01: :class:`VirtualMachineScaleSetOperations` - """ - api_version = self._get_api_version('virtual_machine_scale_set') - if api_version == '2019-03-01': - from .v2019_03_01.operations import VirtualMachineScaleSetOperations as OperationClass - else: - raise NotImplementedError("APIVersion {} is not available".format(api_version)) - return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) - @property def virtual_machine_scale_set_extensions(self): """Instance depends on the API version: diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30/models/__init__.py index e8a71aaf255f..4a1cc092e224 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30/models/__init__.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_09_30/models/__init__.py @@ -54,8 +54,6 @@ SnapshotStorageAccountTypes, AccessLevel, ) -# Manual change to avoid major release until the next major release -StorageAccountTypes = DiskStorageAccountTypes __all__ = [ 'Resource', @@ -77,7 +75,6 @@ 'DiskPaged', 'SnapshotPaged', 'DiskStorageAccountTypes', - 'StorageAccountTypes', 'OperatingSystemTypes', 'HyperVGeneration', 'DiskCreateOption', diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/compute_management_client.py index 5f579785b9a8..f0641446c374 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/compute_management_client.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/compute_management_client.py @@ -25,7 +25,6 @@ from .operations.virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations from .operations.virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations from .operations.virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations -from .operations.virtual_machine_scale_set_operations import VirtualMachineScaleSetOperations from .operations.virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations from .operations.log_analytics_operations import LogAnalyticsOperations from .operations.virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations @@ -99,8 +98,6 @@ class ComputeManagementClient(SDKClient): :vartype virtual_machine_scale_set_extensions: azure.mgmt.compute.v2019_03_01.operations.VirtualMachineScaleSetExtensionsOperations :ivar virtual_machine_scale_set_rolling_upgrades: VirtualMachineScaleSetRollingUpgrades operations :vartype virtual_machine_scale_set_rolling_upgrades: azure.mgmt.compute.v2019_03_01.operations.VirtualMachineScaleSetRollingUpgradesOperations - :ivar virtual_machine_scale_set: VirtualMachineScaleSet operations - :vartype virtual_machine_scale_set: azure.mgmt.compute.v2019_03_01.operations.VirtualMachineScaleSetOperations :ivar virtual_machine_scale_set_vms: VirtualMachineScaleSetVMs operations :vartype virtual_machine_scale_set_vms: azure.mgmt.compute.v2019_03_01.operations.VirtualMachineScaleSetVMsOperations :ivar log_analytics: LogAnalytics operations @@ -159,8 +156,6 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.virtual_machine_scale_set_rolling_upgrades = VirtualMachineScaleSetRollingUpgradesOperations( self._client, self.config, self._serialize, self._deserialize) - self.virtual_machine_scale_set = VirtualMachineScaleSetOperations( - self._client, self.config, self._serialize, self._deserialize) self.virtual_machine_scale_set_vms = VirtualMachineScaleSetVMsOperations( self._client, self.config, self._serialize, self._deserialize) self.log_analytics = LogAnalyticsOperations( diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/__init__.py index 83128987a916..b5dd84c8bc05 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/__init__.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/__init__.py @@ -21,7 +21,6 @@ from .virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations from .virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations from .virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations -from .virtual_machine_scale_set_operations import VirtualMachineScaleSetOperations from .virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations from .log_analytics_operations import LogAnalyticsOperations from .virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations @@ -42,7 +41,6 @@ 'VirtualMachineScaleSetsOperations', 'VirtualMachineScaleSetExtensionsOperations', 'VirtualMachineScaleSetRollingUpgradesOperations', - 'VirtualMachineScaleSetOperations', 'VirtualMachineScaleSetVMsOperations', 'LogAnalyticsOperations', 'VirtualMachineRunCommandsOperations', diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/virtual_machine_scale_set_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/virtual_machine_scale_set_operations.py deleted file mode 100644 index 98ccf7b677bd..000000000000 --- a/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/virtual_machine_scale_set_operations.py +++ /dev/null @@ -1,102 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -import uuid -from msrest.pipeline import ClientRawResponse -from msrestazure.azure_exceptions import CloudError - -from .. import models - - -class VirtualMachineScaleSetOperations(object): - """VirtualMachineScaleSetOperations operations. - - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. - """ - - models = models - - def __init__(self, client, config, serializer, deserializer): - - self._client = client - self._serialize = serializer - self._deserialize = deserializer - - self.config = config - - def convert_to_single_placement_group( - self, resource_group_name, vm_scale_set_name, active_placement_group_id=None, custom_headers=None, raw=False, **operation_config): - """Converts SinglePlacementGroup property to false for a existing virtual - machine scale set. - - :param resource_group_name: The name of the resource group. - :type resource_group_name: str - :param vm_scale_set_name: The name of the virtual machine scale set to - create or update. - :type vm_scale_set_name: str - :param active_placement_group_id: Id of the placement group in which - you want future virtual machine instances to be placed. To query - placement group Id, please use Virtual Machine Scale Set VMs - Get - API. If not provided, the platform will choose one with maximum number - of virtual machine instances. - :type active_placement_group_id: str - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` - """ - parameters = models.VMScaleSetConvertToSinglePlacementGroupInput(active_placement_group_id=active_placement_group_id) - - # Construct URL - url = self.convert_to_single_placement_group.metadata['url'] - path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), - 'vmScaleSetName': self._serialize.url("vm_scale_set_name", vm_scale_set_name, 'str'), - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct body - body_content = self._serialize.body(parameters, 'VMScaleSetConvertToSinglePlacementGroupInput') - - # Construct and send request - request = self._client.post(url, query_parameters, header_parameters, body_content) - response = self._client.send(request, stream=False, **operation_config) - - if response.status_code not in [200]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - - if raw: - client_raw_response = ClientRawResponse(None, response) - return client_raw_response - convert_to_single_placement_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/convertToSinglePlacementGroup'} diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/virtual_machine_scale_sets_operations.py index b225fd295c76..b3806d0b44fd 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/virtual_machine_scale_sets_operations.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/virtual_machine_scale_sets_operations.py @@ -1762,3 +1762,69 @@ def force_recovery_service_fabric_platform_update_domain_walk( return deserialized force_recovery_service_fabric_platform_update_domain_walk.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/forceRecoveryServiceFabricPlatformUpdateDomainWalk'} + + def convert_to_single_placement_group( + self, resource_group_name, vm_scale_set_name, active_placement_group_id=None, custom_headers=None, raw=False, **operation_config): + """Converts SinglePlacementGroup property to false for a existing virtual + machine scale set. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param vm_scale_set_name: The name of the virtual machine scale set to + create or update. + :type vm_scale_set_name: str + :param active_placement_group_id: Id of the placement group in which + you want future virtual machine instances to be placed. To query + placement group Id, please use Virtual Machine Scale Set VMs - Get + API. If not provided, the platform will choose one with maximum number + of virtual machine instances. + :type active_placement_group_id: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + parameters = models.VMScaleSetConvertToSinglePlacementGroupInput(active_placement_group_id=active_placement_group_id) + + # Construct URL + url = self.convert_to_single_placement_group.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'vmScaleSetName': self._serialize.url("vm_scale_set_name", vm_scale_set_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(parameters, 'VMScaleSetConvertToSinglePlacementGroupInput') + + # Construct and send request + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + convert_to_single_placement_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/convertToSinglePlacementGroup'}