Skip to content

Commit 93a794d

Browse files
AutorestCIlmazuel
authored andcommitted
[AutoPR] sqlvirtualmachine/resource-manager (#5652)
* Generated from 240abfcce64ced97f3f7251145b3d8c78a9aa07a (#5651) Merge branch 'yadi-updateswagger' of https://github.com/yareyes/azure-rest-api-specs into yadi-updateswagger * Packaging update of azure-mgmt-sqlvirtualmachine * Update version.py * Update HISTORY.rst
1 parent b93fd3e commit 93a794d

14 files changed

+98
-110
lines changed

sdk/sql/azure-mgmt-sqlvirtualmachine/HISTORY.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
Release History
44
===============
55

6+
0.3.0 (2019-06-03)
7+
++++++++++++++++++
8+
9+
**Features**
10+
11+
- sql_image_sku is now writable
12+
613
0.2.0 (2018-12-07)
714
++++++++++++++++++
815

sdk/sql/azure-mgmt-sqlvirtualmachine/MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
recursive-include tests *.py *.yaml
12
include *.rst
23
include azure/__init__.py
34
include azure/mgmt/__init__.py

sdk/sql/azure-mgmt-sqlvirtualmachine/README.rst

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
1414
For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.
1515

1616

17-
Compatibility
18-
=============
19-
20-
**IMPORTANT**: If you have an earlier version of the azure package
21-
(version < 1.0), you should uninstall it before installing this package.
22-
23-
You can check the version using pip:
24-
25-
.. code:: shell
26-
27-
pip freeze
28-
29-
If you see azure==0.11.0 (or any version below 1.0), uninstall it first:
30-
31-
.. code:: shell
32-
33-
pip uninstall azure
34-
35-
3617
Usage
3718
=====
3819

sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class AvailabilityGroupListener(ProxyResource):
2424
:vartype name: str
2525
:ivar type: Resource type.
2626
:vartype type: str
27-
:ivar provisioning_state: Provisioning state to track the aysnc operation
27+
:ivar provisioning_state: Provisioning state to track the async operation
2828
status.
2929
:vartype provisioning_state: str
3030
:param availability_group_name: Name of the availability group.

sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/availability_group_listener_py3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class AvailabilityGroupListener(ProxyResource):
2424
:vartype name: str
2525
:ivar type: Resource type.
2626
:vartype type: str
27-
:ivar provisioning_state: Provisioning state to track the aysnc operation
27+
:ivar provisioning_state: Provisioning state to track the async operation
2828
status.
2929
:vartype provisioning_state: str
3030
:param availability_group_name: Name of the availability group.

sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ class SqlStorageUpdateSettings(Model):
1717
1818
:param disk_count: Virtual machine disk count.
1919
:type disk_count: int
20+
:param starting_device_id: Device id of the first disk to be updated.
21+
:type starting_device_id: int
2022
:param disk_configuration_type: Disk configuration to apply to SQL Server.
2123
Possible values include: 'NEW', 'EXTEND', 'ADD'
2224
:type disk_configuration_type: str or
2325
~azure.mgmt.sqlvirtualmachine.models.DiskConfigurationType
24-
:param starting_device_id: Device id of the first disk to be updated.
25-
:type starting_device_id: int
2626
"""
2727

2828
_attribute_map = {
2929
'disk_count': {'key': 'diskCount', 'type': 'int'},
30-
'disk_configuration_type': {'key': 'diskConfigurationType', 'type': 'str'},
3130
'starting_device_id': {'key': 'startingDeviceId', 'type': 'int'},
31+
'disk_configuration_type': {'key': 'diskConfigurationType', 'type': 'str'},
3232
}
3333

3434
def __init__(self, **kwargs):
3535
super(SqlStorageUpdateSettings, self).__init__(**kwargs)
3636
self.disk_count = kwargs.get('disk_count', None)
37-
self.disk_configuration_type = kwargs.get('disk_configuration_type', None)
3837
self.starting_device_id = kwargs.get('starting_device_id', None)
38+
self.disk_configuration_type = kwargs.get('disk_configuration_type', None)

sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_storage_update_settings_py3.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ class SqlStorageUpdateSettings(Model):
1717
1818
:param disk_count: Virtual machine disk count.
1919
:type disk_count: int
20+
:param starting_device_id: Device id of the first disk to be updated.
21+
:type starting_device_id: int
2022
:param disk_configuration_type: Disk configuration to apply to SQL Server.
2123
Possible values include: 'NEW', 'EXTEND', 'ADD'
2224
:type disk_configuration_type: str or
2325
~azure.mgmt.sqlvirtualmachine.models.DiskConfigurationType
24-
:param starting_device_id: Device id of the first disk to be updated.
25-
:type starting_device_id: int
2626
"""
2727

2828
_attribute_map = {
2929
'disk_count': {'key': 'diskCount', 'type': 'int'},
30-
'disk_configuration_type': {'key': 'diskConfigurationType', 'type': 'str'},
3130
'starting_device_id': {'key': 'startingDeviceId', 'type': 'int'},
31+
'disk_configuration_type': {'key': 'diskConfigurationType', 'type': 'str'},
3232
}
3333

34-
def __init__(self, *, disk_count: int=None, disk_configuration_type=None, starting_device_id: int=None, **kwargs) -> None:
34+
def __init__(self, *, disk_count: int=None, starting_device_id: int=None, disk_configuration_type=None, **kwargs) -> None:
3535
super(SqlStorageUpdateSettings, self).__init__(**kwargs)
3636
self.disk_count = disk_count
37-
self.disk_configuration_type = disk_configuration_type
3837
self.starting_device_id = starting_device_id
38+
self.disk_configuration_type = disk_configuration_type

sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class SqlVirtualMachine(TrackedResource):
3535
:param virtual_machine_resource_id: ARM Resource id of underlying virtual
3636
machine created from SQL marketplace image.
3737
:type virtual_machine_resource_id: str
38-
:ivar provisioning_state: Provisioning state to track the aysnc operation
38+
:ivar provisioning_state: Provisioning state to track the async operation
3939
status.
4040
:vartype provisioning_state: str
4141
:ivar sql_image_offer: SQL image offer. Examples include SQL2016-WS2016,
@@ -45,9 +45,9 @@ class SqlVirtualMachine(TrackedResource):
4545
include: 'PAYG', 'AHUB'
4646
:type sql_server_license_type: str or
4747
~azure.mgmt.sqlvirtualmachine.models.SqlServerLicenseType
48-
:ivar sql_image_sku: SQL image sku. Possible values include: 'Developer',
49-
'Express', 'Standard', 'Enterprise', 'Web'
50-
:vartype sql_image_sku: str or
48+
:param sql_image_sku: SQL Server edition type. Possible values include:
49+
'Developer', 'Express', 'Standard', 'Enterprise', 'Web'
50+
:type sql_image_sku: str or
5151
~azure.mgmt.sqlvirtualmachine.models.SqlImageSku
5252
:param sql_virtual_machine_group_resource_id: ARM resource id of the SQL
5353
virtual machine group this SQL virtual machine is or will be part of.
@@ -79,7 +79,6 @@ class SqlVirtualMachine(TrackedResource):
7979
'location': {'required': True},
8080
'provisioning_state': {'readonly': True},
8181
'sql_image_offer': {'readonly': True},
82-
'sql_image_sku': {'readonly': True},
8382
}
8483

8584
_attribute_map = {
@@ -109,7 +108,7 @@ def __init__(self, **kwargs):
109108
self.provisioning_state = None
110109
self.sql_image_offer = None
111110
self.sql_server_license_type = kwargs.get('sql_server_license_type', None)
112-
self.sql_image_sku = None
111+
self.sql_image_sku = kwargs.get('sql_image_sku', None)
113112
self.sql_virtual_machine_group_resource_id = kwargs.get('sql_virtual_machine_group_resource_id', None)
114113
self.wsfc_domain_credentials = kwargs.get('wsfc_domain_credentials', None)
115114
self.auto_patching_settings = kwargs.get('auto_patching_settings', None)

sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SqlVirtualMachineGroup(TrackedResource):
3030
:type location: str
3131
:param tags: Resource tags.
3232
:type tags: dict[str, str]
33-
:ivar provisioning_state: Provisioning state to track the aysnc operation
33+
:ivar provisioning_state: Provisioning state to track the async operation
3434
status.
3535
:vartype provisioning_state: str
3636
:param sql_image_offer: SQL image offer. Examples may include

sdk/sql/azure-mgmt-sqlvirtualmachine/azure/mgmt/sqlvirtualmachine/models/sql_virtual_machine_group_py3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SqlVirtualMachineGroup(TrackedResource):
3030
:type location: str
3131
:param tags: Resource tags.
3232
:type tags: dict[str, str]
33-
:ivar provisioning_state: Provisioning state to track the aysnc operation
33+
:ivar provisioning_state: Provisioning state to track the async operation
3434
status.
3535
:vartype provisioning_state: str
3636
:param sql_image_offer: SQL image offer. Examples may include

0 commit comments

Comments
 (0)