Skip to content

Commit 64137c6

Browse files
AutorestCIAutorestCI
authored
[AutoPR mariadb/resource-manager] Update MariaDB default API version to 2018-06-01 (#4460)
* Generated from 6dc88857bdcf5ba185555564f857c9d389297e44 Update MariaDB default API version to 2018-06-01 * Packaging update of azure-mgmt-rdbms
1 parent 64f2a1e commit 64137c6

24 files changed

+369
-47
lines changed

‎azure-mgmt-rdbms/README.rst

-19
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

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/maria_db_management_client.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from msrestazure import AzureConfiguration
1515
from .version import VERSION
1616
from .operations.servers_operations import ServersOperations
17+
from .operations.replicas_operations import ReplicasOperations
1718
from .operations.firewall_rules_operations import FirewallRulesOperations
1819
from .operations.virtual_network_rules_operations import VirtualNetworkRulesOperations
1920
from .operations.databases_operations import DatabasesOperations
@@ -67,6 +68,8 @@ class MariaDBManagementClient(SDKClient):
6768
6869
:ivar servers: Servers operations
6970
:vartype servers: azure.mgmt.rdbms.mariadb.operations.ServersOperations
71+
:ivar replicas: Replicas operations
72+
:vartype replicas: azure.mgmt.rdbms.mariadb.operations.ReplicasOperations
7073
:ivar firewall_rules: FirewallRules operations
7174
:vartype firewall_rules: azure.mgmt.rdbms.mariadb.operations.FirewallRulesOperations
7275
:ivar virtual_network_rules: VirtualNetworkRules operations
@@ -102,12 +105,14 @@ def __init__(
102105
super(MariaDBManagementClient, self).__init__(self.config.credentials, self.config)
103106

104107
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
105-
self.api_version = '2018-06-01-preview'
108+
self.api_version = '2018-06-01'
106109
self._serialize = Serializer(client_models)
107110
self._deserialize = Deserializer(client_models)
108111

109112
self.servers = ServersOperations(
110113
self._client, self.config, self._serialize, self._deserialize)
114+
self.replicas = ReplicasOperations(
115+
self._client, self.config, self._serialize, self._deserialize)
111116
self.firewall_rules = FirewallRulesOperations(
112117
self._client, self.config, self._serialize, self._deserialize)
113118
self.virtual_network_rules = VirtualNetworkRulesOperations(

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/models/__init__.py

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from .server_properties_for_default_create_py3 import ServerPropertiesForDefaultCreate
1818
from .server_properties_for_restore_py3 import ServerPropertiesForRestore
1919
from .server_properties_for_geo_restore_py3 import ServerPropertiesForGeoRestore
20+
from .server_properties_for_replica_py3 import ServerPropertiesForReplica
2021
from .sku_py3 import Sku
2122
from .server_py3 import Server
2223
from .server_for_create_py3 import ServerForCreate
@@ -42,6 +43,7 @@
4243
from .server_properties_for_default_create import ServerPropertiesForDefaultCreate
4344
from .server_properties_for_restore import ServerPropertiesForRestore
4445
from .server_properties_for_geo_restore import ServerPropertiesForGeoRestore
46+
from .server_properties_for_replica import ServerPropertiesForReplica
4547
from .sku import Sku
4648
from .server import Server
4749
from .server_for_create import ServerForCreate
@@ -85,6 +87,7 @@
8587
'ServerPropertiesForDefaultCreate',
8688
'ServerPropertiesForRestore',
8789
'ServerPropertiesForGeoRestore',
90+
'ServerPropertiesForReplica',
8891
'Sku',
8992
'Server',
9093
'ServerForCreate',

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/models/server.py

+14
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,21 @@ class Server(TrackedResource):
5454
:type earliest_restore_date: datetime
5555
:param storage_profile: Storage profile of a server.
5656
:type storage_profile: ~azure.mgmt.rdbms.mariadb.models.StorageProfile
57+
:param replication_role: The replication role of the server.
58+
:type replication_role: str
59+
:param master_server_id: The master server id of a replica server.
60+
:type master_server_id: str
61+
:param replica_capacity: The maximum number of replicas that a master
62+
server can have.
63+
:type replica_capacity: int
5764
"""
5865

5966
_validation = {
6067
'id': {'readonly': True},
6168
'name': {'readonly': True},
6269
'type': {'readonly': True},
6370
'location': {'required': True},
71+
'replica_capacity': {'minimum': 0},
6472
}
6573

6674
_attribute_map = {
@@ -77,6 +85,9 @@ class Server(TrackedResource):
7785
'fully_qualified_domain_name': {'key': 'properties.fullyQualifiedDomainName', 'type': 'str'},
7886
'earliest_restore_date': {'key': 'properties.earliestRestoreDate', 'type': 'iso-8601'},
7987
'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
88+
'replication_role': {'key': 'properties.replicationRole', 'type': 'str'},
89+
'master_server_id': {'key': 'properties.masterServerId', 'type': 'str'},
90+
'replica_capacity': {'key': 'properties.replicaCapacity', 'type': 'int'},
8091
}
8192

8293
def __init__(self, **kwargs):
@@ -89,3 +100,6 @@ def __init__(self, **kwargs):
89100
self.fully_qualified_domain_name = kwargs.get('fully_qualified_domain_name', None)
90101
self.earliest_restore_date = kwargs.get('earliest_restore_date', None)
91102
self.storage_profile = kwargs.get('storage_profile', None)
103+
self.replication_role = kwargs.get('replication_role', None)
104+
self.master_server_id = kwargs.get('master_server_id', None)
105+
self.replica_capacity = kwargs.get('replica_capacity', None)

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/models/server_properties_for_create.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class ServerPropertiesForCreate(Model):
1717
1818
You probably want to use the sub-classes and not this class directly. Known
1919
sub-classes are: ServerPropertiesForDefaultCreate,
20-
ServerPropertiesForRestore, ServerPropertiesForGeoRestore
20+
ServerPropertiesForRestore, ServerPropertiesForGeoRestore,
21+
ServerPropertiesForReplica
2122
2223
All required parameters must be populated in order to send to Azure.
2324
@@ -45,7 +46,7 @@ class ServerPropertiesForCreate(Model):
4546
}
4647

4748
_subtype_map = {
48-
'create_mode': {'Default': 'ServerPropertiesForDefaultCreate', 'PointInTimeRestore': 'ServerPropertiesForRestore', 'GeoRestore': 'ServerPropertiesForGeoRestore'}
49+
'create_mode': {'Default': 'ServerPropertiesForDefaultCreate', 'PointInTimeRestore': 'ServerPropertiesForRestore', 'GeoRestore': 'ServerPropertiesForGeoRestore', 'Replica': 'ServerPropertiesForReplica'}
4950
}
5051

5152
def __init__(self, **kwargs):

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/models/server_properties_for_create_py3.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ class ServerPropertiesForCreate(Model):
1717
1818
You probably want to use the sub-classes and not this class directly. Known
1919
sub-classes are: ServerPropertiesForDefaultCreate,
20-
ServerPropertiesForRestore, ServerPropertiesForGeoRestore
20+
ServerPropertiesForRestore, ServerPropertiesForGeoRestore,
21+
ServerPropertiesForReplica
2122
2223
All required parameters must be populated in order to send to Azure.
2324
@@ -45,7 +46,7 @@ class ServerPropertiesForCreate(Model):
4546
}
4647

4748
_subtype_map = {
48-
'create_mode': {'Default': 'ServerPropertiesForDefaultCreate', 'PointInTimeRestore': 'ServerPropertiesForRestore', 'GeoRestore': 'ServerPropertiesForGeoRestore'}
49+
'create_mode': {'Default': 'ServerPropertiesForDefaultCreate', 'PointInTimeRestore': 'ServerPropertiesForRestore', 'GeoRestore': 'ServerPropertiesForGeoRestore', 'Replica': 'ServerPropertiesForReplica'}
4950
}
5051

5152
def __init__(self, *, version=None, ssl_enforcement=None, storage_profile=None, **kwargs) -> None:

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/models/server_properties_for_replica.py

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from .server_properties_for_create import ServerPropertiesForCreate
13+
14+
15+
class ServerPropertiesForReplica(ServerPropertiesForCreate):
16+
"""The properties to create a new replica.
17+
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param version: Server version. Possible values include: '5.6', '5.7'
21+
:type version: str or ~azure.mgmt.rdbms.mariadb.models.ServerVersion
22+
:param ssl_enforcement: Enable ssl enforcement or not when connect to
23+
server. Possible values include: 'Enabled', 'Disabled'
24+
:type ssl_enforcement: str or
25+
~azure.mgmt.rdbms.mariadb.models.SslEnforcementEnum
26+
:param storage_profile: Storage profile of a server.
27+
:type storage_profile: ~azure.mgmt.rdbms.mariadb.models.StorageProfile
28+
:param create_mode: Required. Constant filled by server.
29+
:type create_mode: str
30+
:param source_server_id: Required. The master server id to create replica
31+
from.
32+
:type source_server_id: str
33+
"""
34+
35+
_validation = {
36+
'create_mode': {'required': True},
37+
'source_server_id': {'required': True},
38+
}
39+
40+
_attribute_map = {
41+
'version': {'key': 'version', 'type': 'str'},
42+
'ssl_enforcement': {'key': 'sslEnforcement', 'type': 'SslEnforcementEnum'},
43+
'storage_profile': {'key': 'storageProfile', 'type': 'StorageProfile'},
44+
'create_mode': {'key': 'createMode', 'type': 'str'},
45+
'source_server_id': {'key': 'sourceServerId', 'type': 'str'},
46+
}
47+
48+
def __init__(self, **kwargs):
49+
super(ServerPropertiesForReplica, self).__init__(**kwargs)
50+
self.source_server_id = kwargs.get('source_server_id', None)
51+
self.create_mode = 'Replica'

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/models/server_properties_for_replica_py3.py

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
12+
from .server_properties_for_create_py3 import ServerPropertiesForCreate
13+
14+
15+
class ServerPropertiesForReplica(ServerPropertiesForCreate):
16+
"""The properties to create a new replica.
17+
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param version: Server version. Possible values include: '5.6', '5.7'
21+
:type version: str or ~azure.mgmt.rdbms.mariadb.models.ServerVersion
22+
:param ssl_enforcement: Enable ssl enforcement or not when connect to
23+
server. Possible values include: 'Enabled', 'Disabled'
24+
:type ssl_enforcement: str or
25+
~azure.mgmt.rdbms.mariadb.models.SslEnforcementEnum
26+
:param storage_profile: Storage profile of a server.
27+
:type storage_profile: ~azure.mgmt.rdbms.mariadb.models.StorageProfile
28+
:param create_mode: Required. Constant filled by server.
29+
:type create_mode: str
30+
:param source_server_id: Required. The master server id to create replica
31+
from.
32+
:type source_server_id: str
33+
"""
34+
35+
_validation = {
36+
'create_mode': {'required': True},
37+
'source_server_id': {'required': True},
38+
}
39+
40+
_attribute_map = {
41+
'version': {'key': 'version', 'type': 'str'},
42+
'ssl_enforcement': {'key': 'sslEnforcement', 'type': 'SslEnforcementEnum'},
43+
'storage_profile': {'key': 'storageProfile', 'type': 'StorageProfile'},
44+
'create_mode': {'key': 'createMode', 'type': 'str'},
45+
'source_server_id': {'key': 'sourceServerId', 'type': 'str'},
46+
}
47+
48+
def __init__(self, *, source_server_id: str, version=None, ssl_enforcement=None, storage_profile=None, **kwargs) -> None:
49+
super(ServerPropertiesForReplica, self).__init__(version=version, ssl_enforcement=ssl_enforcement, storage_profile=storage_profile, **kwargs)
50+
self.source_server_id = source_server_id
51+
self.create_mode = 'Replica'

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/models/server_py3.py

+15-1
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,21 @@ class Server(TrackedResource):
5454
:type earliest_restore_date: datetime
5555
:param storage_profile: Storage profile of a server.
5656
:type storage_profile: ~azure.mgmt.rdbms.mariadb.models.StorageProfile
57+
:param replication_role: The replication role of the server.
58+
:type replication_role: str
59+
:param master_server_id: The master server id of a replica server.
60+
:type master_server_id: str
61+
:param replica_capacity: The maximum number of replicas that a master
62+
server can have.
63+
:type replica_capacity: int
5764
"""
5865

5966
_validation = {
6067
'id': {'readonly': True},
6168
'name': {'readonly': True},
6269
'type': {'readonly': True},
6370
'location': {'required': True},
71+
'replica_capacity': {'minimum': 0},
6472
}
6573

6674
_attribute_map = {
@@ -77,9 +85,12 @@ class Server(TrackedResource):
7785
'fully_qualified_domain_name': {'key': 'properties.fullyQualifiedDomainName', 'type': 'str'},
7886
'earliest_restore_date': {'key': 'properties.earliestRestoreDate', 'type': 'iso-8601'},
7987
'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
88+
'replication_role': {'key': 'properties.replicationRole', 'type': 'str'},
89+
'master_server_id': {'key': 'properties.masterServerId', 'type': 'str'},
90+
'replica_capacity': {'key': 'properties.replicaCapacity', 'type': 'int'},
8091
}
8192

82-
def __init__(self, *, location: str, tags=None, sku=None, administrator_login: str=None, version=None, ssl_enforcement=None, user_visible_state=None, fully_qualified_domain_name: str=None, earliest_restore_date=None, storage_profile=None, **kwargs) -> None:
93+
def __init__(self, *, location: str, tags=None, sku=None, administrator_login: str=None, version=None, ssl_enforcement=None, user_visible_state=None, fully_qualified_domain_name: str=None, earliest_restore_date=None, storage_profile=None, replication_role: str=None, master_server_id: str=None, replica_capacity: int=None, **kwargs) -> None:
8394
super(Server, self).__init__(location=location, tags=tags, **kwargs)
8495
self.sku = sku
8596
self.administrator_login = administrator_login
@@ -89,3 +100,6 @@ def __init__(self, *, location: str, tags=None, sku=None, administrator_login: s
89100
self.fully_qualified_domain_name = fully_qualified_domain_name
90101
self.earliest_restore_date = earliest_restore_date
91102
self.storage_profile = storage_profile
103+
self.replication_role = replication_role
104+
self.master_server_id = master_server_id
105+
self.replica_capacity = replica_capacity

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/models/server_update_parameters.py

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class ServerUpdateParameters(Model):
2929
server. Possible values include: 'Enabled', 'Disabled'
3030
:type ssl_enforcement: str or
3131
~azure.mgmt.rdbms.mariadb.models.SslEnforcementEnum
32+
:param replication_role: The replication role of the server.
33+
:type replication_role: str
3234
:param tags: Application-specific metadata in the form of key-value pairs.
3335
:type tags: dict[str, str]
3436
"""
@@ -39,6 +41,7 @@ class ServerUpdateParameters(Model):
3941
'administrator_login_password': {'key': 'properties.administratorLoginPassword', 'type': 'str'},
4042
'version': {'key': 'properties.version', 'type': 'str'},
4143
'ssl_enforcement': {'key': 'properties.sslEnforcement', 'type': 'SslEnforcementEnum'},
44+
'replication_role': {'key': 'properties.replicationRole', 'type': 'str'},
4245
'tags': {'key': 'tags', 'type': '{str}'},
4346
}
4447

@@ -49,4 +52,5 @@ def __init__(self, **kwargs):
4952
self.administrator_login_password = kwargs.get('administrator_login_password', None)
5053
self.version = kwargs.get('version', None)
5154
self.ssl_enforcement = kwargs.get('ssl_enforcement', None)
55+
self.replication_role = kwargs.get('replication_role', None)
5256
self.tags = kwargs.get('tags', None)

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/models/server_update_parameters_py3.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class ServerUpdateParameters(Model):
2929
server. Possible values include: 'Enabled', 'Disabled'
3030
:type ssl_enforcement: str or
3131
~azure.mgmt.rdbms.mariadb.models.SslEnforcementEnum
32+
:param replication_role: The replication role of the server.
33+
:type replication_role: str
3234
:param tags: Application-specific metadata in the form of key-value pairs.
3335
:type tags: dict[str, str]
3436
"""
@@ -39,14 +41,16 @@ class ServerUpdateParameters(Model):
3941
'administrator_login_password': {'key': 'properties.administratorLoginPassword', 'type': 'str'},
4042
'version': {'key': 'properties.version', 'type': 'str'},
4143
'ssl_enforcement': {'key': 'properties.sslEnforcement', 'type': 'SslEnforcementEnum'},
44+
'replication_role': {'key': 'properties.replicationRole', 'type': 'str'},
4245
'tags': {'key': 'tags', 'type': '{str}'},
4346
}
4447

45-
def __init__(self, *, sku=None, storage_profile=None, administrator_login_password: str=None, version=None, ssl_enforcement=None, tags=None, **kwargs) -> None:
48+
def __init__(self, *, sku=None, storage_profile=None, administrator_login_password: str=None, version=None, ssl_enforcement=None, replication_role: str=None, tags=None, **kwargs) -> None:
4649
super(ServerUpdateParameters, self).__init__(**kwargs)
4750
self.sku = sku
4851
self.storage_profile = storage_profile
4952
self.administrator_login_password = administrator_login_password
5053
self.version = version
5154
self.ssl_enforcement = ssl_enforcement
55+
self.replication_role = replication_role
5256
self.tags = tags

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/operations/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# --------------------------------------------------------------------------
1111

1212
from .servers_operations import ServersOperations
13+
from .replicas_operations import ReplicasOperations
1314
from .firewall_rules_operations import FirewallRulesOperations
1415
from .virtual_network_rules_operations import VirtualNetworkRulesOperations
1516
from .databases_operations import DatabasesOperations
@@ -22,6 +23,7 @@
2223

2324
__all__ = [
2425
'ServersOperations',
26+
'ReplicasOperations',
2527
'FirewallRulesOperations',
2628
'VirtualNetworkRulesOperations',
2729
'DatabasesOperations',

‎azure-mgmt-rdbms/azure/mgmt/rdbms/mariadb/operations/check_name_availability_operations.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class CheckNameAvailabilityOperations(object):
2323
:param config: Configuration of service client.
2424
:param serializer: An object model serializer.
2525
:param deserializer: An object model deserializer.
26-
:ivar api_version: The API version to use for the request. Constant value: "2018-06-01-preview".
26+
:ivar api_version: The API version to use for the request. Constant value: "2018-06-01".
2727
"""
2828

2929
models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
3333
self._client = client
3434
self._serialize = serializer
3535
self._deserialize = deserializer
36-
self.api_version = "2018-06-01-preview"
36+
self.api_version = "2018-06-01"
3737

3838
self.config = config
3939

0 commit comments

Comments
 (0)