diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener.py index 0647367c314f..c34d27fb606c 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener.py @@ -24,7 +24,7 @@ class AvailabilityGroupListener(ProxyResource): :vartype name: str :ivar type: Resource type. :vartype type: str - :ivar provisioning_state: Provisioning state to track the aysnc operation + :ivar provisioning_state: Provisioning state to track the async operation status. :vartype provisioning_state: str :param availability_group_name: Name of the availability group. diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener_py3.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener_py3.py index 2f290deacd45..a1c2beb48414 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener_py3.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener_py3.py @@ -24,7 +24,7 @@ class AvailabilityGroupListener(ProxyResource): :vartype name: str :ivar type: Resource type. :vartype type: str - :ivar provisioning_state: Provisioning state to track the aysnc operation + :ivar provisioning_state: Provisioning state to track the async operation status. :vartype provisioning_state: str :param availability_group_name: Name of the availability group. diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings.py index 9698b522e3cb..10091fe3b693 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings.py @@ -17,22 +17,22 @@ class SqlStorageUpdateSettings(Model): :param disk_count: Virtual machine disk count. :type disk_count: int + :param starting_device_id: Device id of the first disk to be updated. + :type starting_device_id: int :param disk_configuration_type: Disk configuration to apply to SQL Server. Possible values include: 'NEW', 'EXTEND', 'ADD' :type disk_configuration_type: str or ~azure.mgmt.sqlvirtualmachine.models.DiskConfigurationType - :param starting_device_id: Device id of the first disk to be updated. - :type starting_device_id: int """ _attribute_map = { 'disk_count': {'key': 'diskCount', 'type': 'int'}, - 'disk_configuration_type': {'key': 'diskConfigurationType', 'type': 'str'}, 'starting_device_id': {'key': 'startingDeviceId', 'type': 'int'}, + 'disk_configuration_type': {'key': 'diskConfigurationType', 'type': 'str'}, } def __init__(self, **kwargs): super(SqlStorageUpdateSettings, self).__init__(**kwargs) self.disk_count = kwargs.get('disk_count', None) - self.disk_configuration_type = kwargs.get('disk_configuration_type', None) self.starting_device_id = kwargs.get('starting_device_id', None) + self.disk_configuration_type = kwargs.get('disk_configuration_type', None) diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings_py3.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings_py3.py index a392f27f9089..1948c580be7a 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings_py3.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings_py3.py @@ -17,22 +17,22 @@ class SqlStorageUpdateSettings(Model): :param disk_count: Virtual machine disk count. :type disk_count: int + :param starting_device_id: Device id of the first disk to be updated. + :type starting_device_id: int :param disk_configuration_type: Disk configuration to apply to SQL Server. Possible values include: 'NEW', 'EXTEND', 'ADD' :type disk_configuration_type: str or ~azure.mgmt.sqlvirtualmachine.models.DiskConfigurationType - :param starting_device_id: Device id of the first disk to be updated. - :type starting_device_id: int """ _attribute_map = { 'disk_count': {'key': 'diskCount', 'type': 'int'}, - 'disk_configuration_type': {'key': 'diskConfigurationType', 'type': 'str'}, 'starting_device_id': {'key': 'startingDeviceId', 'type': 'int'}, + 'disk_configuration_type': {'key': 'diskConfigurationType', 'type': 'str'}, } - def __init__(self, *, disk_count: int=None, disk_configuration_type=None, starting_device_id: int=None, **kwargs) -> None: + def __init__(self, *, disk_count: int=None, starting_device_id: int=None, disk_configuration_type=None, **kwargs) -> None: super(SqlStorageUpdateSettings, self).__init__(**kwargs) self.disk_count = disk_count - self.disk_configuration_type = disk_configuration_type self.starting_device_id = starting_device_id + self.disk_configuration_type = disk_configuration_type diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine.py index c72dc4d1a1f3..061c98882703 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine.py @@ -35,7 +35,7 @@ class SqlVirtualMachine(TrackedResource): :param virtual_machine_resource_id: ARM Resource id of underlying virtual machine created from SQL marketplace image. :type virtual_machine_resource_id: str - :ivar provisioning_state: Provisioning state to track the aysnc operation + :ivar provisioning_state: Provisioning state to track the async operation status. :vartype provisioning_state: str :ivar sql_image_offer: SQL image offer. Examples include SQL2016-WS2016, @@ -45,9 +45,9 @@ class SqlVirtualMachine(TrackedResource): include: 'PAYG', 'AHUB' :type sql_server_license_type: str or ~azure.mgmt.sqlvirtualmachine.models.SqlServerLicenseType - :ivar sql_image_sku: SQL image sku. Possible values include: 'Developer', - 'Express', 'Standard', 'Enterprise', 'Web' - :vartype sql_image_sku: str or + :param sql_image_sku: SQL Server edition type. Possible values include: + 'Developer', 'Express', 'Standard', 'Enterprise', 'Web' + :type sql_image_sku: str or ~azure.mgmt.sqlvirtualmachine.models.SqlImageSku :param sql_virtual_machine_group_resource_id: ARM resource id of the SQL virtual machine group this SQL virtual machine is or will be part of. @@ -79,7 +79,6 @@ class SqlVirtualMachine(TrackedResource): 'location': {'required': True}, 'provisioning_state': {'readonly': True}, 'sql_image_offer': {'readonly': True}, - 'sql_image_sku': {'readonly': True}, } _attribute_map = { @@ -109,7 +108,7 @@ def __init__(self, **kwargs): self.provisioning_state = None self.sql_image_offer = None self.sql_server_license_type = kwargs.get('sql_server_license_type', None) - self.sql_image_sku = None + self.sql_image_sku = kwargs.get('sql_image_sku', None) self.sql_virtual_machine_group_resource_id = kwargs.get('sql_virtual_machine_group_resource_id', None) self.wsfc_domain_credentials = kwargs.get('wsfc_domain_credentials', None) self.auto_patching_settings = kwargs.get('auto_patching_settings', None) diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group.py index 81cd2b479027..538c955f7fc8 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group.py @@ -30,7 +30,7 @@ class SqlVirtualMachineGroup(TrackedResource): :type location: str :param tags: Resource tags. :type tags: dict[str, str] - :ivar provisioning_state: Provisioning state to track the aysnc operation + :ivar provisioning_state: Provisioning state to track the async operation status. :vartype provisioning_state: str :param sql_image_offer: SQL image offer. Examples may include diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group_py3.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group_py3.py index 93b3b2e08a6c..f538fee0a410 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group_py3.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group_py3.py @@ -30,7 +30,7 @@ class SqlVirtualMachineGroup(TrackedResource): :type location: str :param tags: Resource tags. :type tags: dict[str, str] - :ivar provisioning_state: Provisioning state to track the aysnc operation + :ivar provisioning_state: Provisioning state to track the async operation status. :vartype provisioning_state: str :param sql_image_offer: SQL image offer. Examples may include diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_py3.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_py3.py index d63a77f1c398..2a1072594bad 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_py3.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_py3.py @@ -35,7 +35,7 @@ class SqlVirtualMachine(TrackedResource): :param virtual_machine_resource_id: ARM Resource id of underlying virtual machine created from SQL marketplace image. :type virtual_machine_resource_id: str - :ivar provisioning_state: Provisioning state to track the aysnc operation + :ivar provisioning_state: Provisioning state to track the async operation status. :vartype provisioning_state: str :ivar sql_image_offer: SQL image offer. Examples include SQL2016-WS2016, @@ -45,9 +45,9 @@ class SqlVirtualMachine(TrackedResource): include: 'PAYG', 'AHUB' :type sql_server_license_type: str or ~azure.mgmt.sqlvirtualmachine.models.SqlServerLicenseType - :ivar sql_image_sku: SQL image sku. Possible values include: 'Developer', - 'Express', 'Standard', 'Enterprise', 'Web' - :vartype sql_image_sku: str or + :param sql_image_sku: SQL Server edition type. Possible values include: + 'Developer', 'Express', 'Standard', 'Enterprise', 'Web' + :type sql_image_sku: str or ~azure.mgmt.sqlvirtualmachine.models.SqlImageSku :param sql_virtual_machine_group_resource_id: ARM resource id of the SQL virtual machine group this SQL virtual machine is or will be part of. @@ -79,7 +79,6 @@ class SqlVirtualMachine(TrackedResource): 'location': {'required': True}, 'provisioning_state': {'readonly': True}, 'sql_image_offer': {'readonly': True}, - 'sql_image_sku': {'readonly': True}, } _attribute_map = { @@ -102,14 +101,14 @@ class SqlVirtualMachine(TrackedResource): 'server_configurations_management_settings': {'key': 'properties.serverConfigurationsManagementSettings', 'type': 'ServerConfigurationsManagementSettings'}, } - def __init__(self, *, location: str, tags=None, identity=None, virtual_machine_resource_id: str=None, sql_server_license_type=None, sql_virtual_machine_group_resource_id: str=None, wsfc_domain_credentials=None, auto_patching_settings=None, auto_backup_settings=None, key_vault_credential_settings=None, server_configurations_management_settings=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, identity=None, virtual_machine_resource_id: str=None, sql_server_license_type=None, sql_image_sku=None, sql_virtual_machine_group_resource_id: str=None, wsfc_domain_credentials=None, auto_patching_settings=None, auto_backup_settings=None, key_vault_credential_settings=None, server_configurations_management_settings=None, **kwargs) -> None: super(SqlVirtualMachine, self).__init__(location=location, tags=tags, **kwargs) self.identity = identity self.virtual_machine_resource_id = virtual_machine_resource_id self.provisioning_state = None self.sql_image_offer = None self.sql_server_license_type = sql_server_license_type - self.sql_image_sku = None + self.sql_image_sku = sql_image_sku self.sql_virtual_machine_group_resource_id = sql_virtual_machine_group_resource_id self.wsfc_domain_credentials = wsfc_domain_credentials self.auto_patching_settings = auto_patching_settings diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/operations/sql_virtual_machines_operations.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/operations/sql_virtual_machines_operations.py index efb68b3f404b..4d79d8516fd7 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/operations/sql_virtual_machines_operations.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/operations/sql_virtual_machines_operations.py @@ -39,6 +39,70 @@ def __init__(self, client, config, serializer, deserializer): self.config = config + def list( + self, custom_headers=None, raw=False, **operation_config): + """Gets all SQL virtual machines in a subscription. + + :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: An iterator like instance of SqlVirtualMachine + :rtype: + ~azure.mgmt.sqlvirtualmachine.models.SqlVirtualMachinePaged[~azure.mgmt.sqlvirtualmachine.models.SqlVirtualMachine] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + '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 = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + 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 and send request + request = self._client.get(url, query_parameters, header_parameters) + 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 + + return response + + # Deserialize response + deserialized = models.SqlVirtualMachinePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.SqlVirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines'} + def get( self, resource_group_name, sql_virtual_machine_name, expand=None, custom_headers=None, raw=False, **operation_config): """Gets a SQL virtual machine. @@ -465,67 +529,3 @@ def internal_paging(next_link=None, raw=False): return deserialized list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines'} - - def list( - self, custom_headers=None, raw=False, **operation_config): - """Gets all SQL virtual machines in a subscription. - - :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: An iterator like instance of SqlVirtualMachine - :rtype: - ~azure.mgmt.sqlvirtualmachine.models.SqlVirtualMachinePaged[~azure.mgmt.sqlvirtualmachine.models.SqlVirtualMachine] - :raises: :class:`CloudError` - """ - def internal_paging(next_link=None, raw=False): - - if not next_link: - # Construct URL - url = self.list.metadata['url'] - path_format_arguments = { - '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 = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - - else: - url = next_link - query_parameters = {} - - # Construct headers - header_parameters = {} - header_parameters['Accept'] = 'application/json' - 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 and send request - request = self._client.get(url, query_parameters, header_parameters) - 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 - - return response - - # Deserialize response - deserialized = models.SqlVirtualMachinePaged(internal_paging, self._deserialize.dependencies) - - if raw: - header_dict = {} - client_raw_response = models.SqlVirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict) - return client_raw_response - - return deserialized - list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines'} diff --git a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/version.py b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/version.py index 9bd1dfac7ecb..87acb1634c35 100644 --- a/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/version.py +++ b/sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.2.0" +VERSION = "2017-03-01-preview"