Skip to content

Commit

Permalink
Update RDBMS SDKs for PostgreSQL and MySQL. (#104)
Browse files Browse the repository at this point in the history
* Update SDK.

* Update SDK again.

* Update tests.

* Fix CI.
  • Loading branch information
rohit-joy authored and derekbekoe committed Mar 20, 2018
1 parent 1e959c4 commit 5288815
Show file tree
Hide file tree
Showing 34 changed files with 1,354 additions and 1,637 deletions.
8 changes: 4 additions & 4 deletions src/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,9 @@
],
"rdbms": [
{
"filename": "rdbms-0.0.3-py2.py3-none-any.whl",
"sha256Digest": "3125d386c56599dd364534988ebc7cac35d79de58bb6e89af04bc48569da9522",
"downloadUrl": "https://prodrdbmsclipackages.blob.core.windows.net/cliextensions/rdbms-0.0.3-py2.py3-none-any.whl",
"filename": "rdbms-0.0.4-py2.py3-none-any.whl",
"sha256Digest": "6e0f6d39c98c3a39c9664ed54576b2e0f1cd23b412b137f19815a276e7510350",
"downloadUrl": "https://prodrdbmsclipackages.blob.core.windows.net/cliextensions/rdbms-0.0.4-py2.py3-none-any.whl",
"metadata": {
"classifiers": [
"Development Status :: 4 - Beta",
Expand Down Expand Up @@ -454,7 +454,7 @@
"metadata_version": "2.0",
"name": "rdbms",
"summary": "An Azure CLI Extension to manage Azure MySQL and Azure PostgreSQL resources",
"version": "0.0.3"
"version": "0.0.4"
}
}
],
Expand Down
6 changes: 1 addition & 5 deletions src/rdbms/azext_rdbms/mysql/models/log_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ class LogFile(ProxyResource):
:vartype name: str
:ivar type: Resource type.
:vartype type: str
:param log_file_name: Log file name.
:type log_file_name: str
:param size_in_kb: Size of the log file.
:type size_in_kb: long
:ivar created_time: Creation timestamp of the log file.
Expand All @@ -50,17 +48,15 @@ class LogFile(ProxyResource):
'id': {'key': 'id', 'type': 'str'},
'name': {'key': 'name', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'log_file_name': {'key': 'properties.name', 'type': 'str'},
'size_in_kb': {'key': 'properties.sizeInKB', 'type': 'long'},
'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
'last_modified_time': {'key': 'properties.lastModifiedTime', 'type': 'iso-8601'},
'log_file_type': {'key': 'properties.type', 'type': 'str'},
'url': {'key': 'properties.url', 'type': 'str'},
}

def __init__(self, log_file_name=None, size_in_kb=None, log_file_type=None, url=None):
def __init__(self, size_in_kb=None, log_file_type=None, url=None):
super(LogFile, self).__init__()
self.log_file_name = log_file_name
self.size_in_kb = size_in_kb
self.created_time = None
self.last_modified_time = None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ class PerformanceTierProperties(Model):
:param id: ID of the performance tier.
:type id: str
:param max_backup_retention_days: Maximum Backup retention in days for the
performance tier edition
:type max_backup_retention_days: int
:param min_backup_retention_days: Minimum Backup retention in days for the
performance tier edition
:type min_backup_retention_days: int
:param max_storage_mb: Max storage allowed for a server.
:type max_storage_mb: int
:param min_storage_mb: Max storage allowed for a server.
:type min_storage_mb: int
:param service_level_objectives: Service level objectives associated with
the performance tier
:type service_level_objectives:
Expand All @@ -35,18 +25,10 @@ class PerformanceTierProperties(Model):

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'max_backup_retention_days': {'key': 'maxBackupRetentionDays', 'type': 'int'},
'min_backup_retention_days': {'key': 'minBackupRetentionDays', 'type': 'int'},
'max_storage_mb': {'key': 'maxStorageMB', 'type': 'int'},
'min_storage_mb': {'key': 'minStorageMB', 'type': 'int'},
'service_level_objectives': {'key': 'serviceLevelObjectives', 'type': '[PerformanceTierServiceLevelObjectives]'},
}

def __init__(self, id=None, max_backup_retention_days=None, min_backup_retention_days=None, max_storage_mb=None, min_storage_mb=None, service_level_objectives=None):
def __init__(self, id=None, service_level_objectives=None):
super(PerformanceTierProperties, self).__init__()
self.id = id
self.max_backup_retention_days = max_backup_retention_days
self.min_backup_retention_days = min_backup_retention_days
self.max_storage_mb = max_storage_mb
self.min_storage_mb = min_storage_mb
self.service_level_objectives = service_level_objectives
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,36 @@ class PerformanceTierServiceLevelObjectives(Model):
:param hardware_generation: Hardware generation associated with the
service level objective
:type hardware_generation: str
:param max_backup_retention_days: Maximum Backup retention in days for the
performance tier edition
:type max_backup_retention_days: int
:param min_backup_retention_days: Minimum Backup retention in days for the
performance tier edition
:type min_backup_retention_days: int
:param max_storage_mb: Max storage allowed for a server.
:type max_storage_mb: int
:param min_storage_mb: Max storage allowed for a server.
:type min_storage_mb: int
"""

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'edition': {'key': 'edition', 'type': 'str'},
'v_core': {'key': 'vCore', 'type': 'int'},
'hardware_generation': {'key': 'hardwareGeneration', 'type': 'str'},
'max_backup_retention_days': {'key': 'maxBackupRetentionDays', 'type': 'int'},
'min_backup_retention_days': {'key': 'minBackupRetentionDays', 'type': 'int'},
'max_storage_mb': {'key': 'maxStorageMB', 'type': 'int'},
'min_storage_mb': {'key': 'minStorageMB', 'type': 'int'},
}

def __init__(self, id=None, edition=None, v_core=None, hardware_generation=None):
def __init__(self, id=None, edition=None, v_core=None, hardware_generation=None, max_backup_retention_days=None, min_backup_retention_days=None, max_storage_mb=None, min_storage_mb=None):
super(PerformanceTierServiceLevelObjectives, self).__init__()
self.id = id
self.edition = edition
self.v_core = v_core
self.hardware_generation = hardware_generation
self.max_backup_retention_days = max_backup_retention_days
self.min_backup_retention_days = min_backup_retention_days
self.max_storage_mb = max_storage_mb
self.min_storage_mb = min_storage_mb
2 changes: 1 addition & 1 deletion src/rdbms/azext_rdbms/mysql/my_sql_management_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def __init__(
self._client = ServiceClient(self.config.credentials, self.config)

client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
self.api_version = '2017-12-01-preview'
self.api_version = '2017-12-01'
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class CheckNameAvailabilityOperations(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: "2017-12-01-preview".
:ivar api_version: The API version to use for the request. Constant value: "2017-12-01".
"""

models = models
Expand All @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-12-01-preview"
self.api_version = "2017-12-01"

self.config = config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ConfigurationsOperations(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: "2017-12-01-preview".
:ivar api_version: The API version to use for the request. Constant value: "2017-12-01".
"""

models = models
Expand All @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-12-01-preview"
self.api_version = "2017-12-01"

self.config = config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class DatabasesOperations(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: "2017-12-01-preview".
:ivar api_version: The API version to use for the request. Constant value: "2017-12-01".
"""

models = models
Expand All @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-12-01-preview"
self.api_version = "2017-12-01"

self.config = config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class FirewallRulesOperations(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: "2017-12-01-preview".
:ivar api_version: The API version to use for the request. Constant value: "2017-12-01".
"""

models = models
Expand All @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-12-01-preview"
self.api_version = "2017-12-01"

self.config = config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class LocationBasedPerformanceTierOperations(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: "2017-12-01-preview".
:ivar api_version: The API version to use for the request. Constant value: "2017-12-01".
"""

models = models
Expand All @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-12-01-preview"
self.api_version = "2017-12-01"

self.config = config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class LogFilesOperations(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: "2017-12-01-preview".
:ivar api_version: The API version to use for the request. Constant value: "2017-12-01".
"""

models = models
Expand All @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-12-01-preview"
self.api_version = "2017-12-01"

self.config = config

Expand Down
4 changes: 2 additions & 2 deletions src/rdbms/azext_rdbms/mysql/operations/operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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: "2017-12-01-preview".
:ivar api_version: The API version to use for the request. Constant value: "2017-12-01".
"""

models = models
Expand All @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-12-01-preview"
self.api_version = "2017-12-01"

self.config = config

Expand Down
4 changes: 2 additions & 2 deletions src/rdbms/azext_rdbms/mysql/operations/servers_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ServersOperations(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: "2017-12-01-preview".
:ivar api_version: The API version to use for the request. Constant value: "2017-12-01".
"""

models = models
Expand All @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-12-01-preview"
self.api_version = "2017-12-01"

self.config = config

Expand Down
2 changes: 1 addition & 1 deletion src/rdbms/azext_rdbms/mysql/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "2017-12-01-preview"
VERSION = "0.1.0"
6 changes: 1 addition & 5 deletions src/rdbms/azext_rdbms/postgresql/models/log_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ class LogFile(ProxyResource):
:vartype name: str
:ivar type: Resource type.
:vartype type: str
:param log_file_name: Log file name.
:type log_file_name: str
:param size_in_kb: Size of the log file.
:type size_in_kb: long
:ivar created_time: Creation timestamp of the log file.
Expand All @@ -50,17 +48,15 @@ class LogFile(ProxyResource):
'id': {'key': 'id', 'type': 'str'},
'name': {'key': 'name', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'log_file_name': {'key': 'properties.name', 'type': 'str'},
'size_in_kb': {'key': 'properties.sizeInKB', 'type': 'long'},
'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
'last_modified_time': {'key': 'properties.lastModifiedTime', 'type': 'iso-8601'},
'log_file_type': {'key': 'properties.type', 'type': 'str'},
'url': {'key': 'properties.url', 'type': 'str'},
}

def __init__(self, log_file_name=None, size_in_kb=None, log_file_type=None, url=None):
def __init__(self, size_in_kb=None, log_file_type=None, url=None):
super(LogFile, self).__init__()
self.log_file_name = log_file_name
self.size_in_kb = size_in_kb
self.created_time = None
self.last_modified_time = None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,6 @@ class PerformanceTierProperties(Model):
:param id: ID of the performance tier.
:type id: str
:param max_backup_retention_days: Maximum Backup retention in days for the
performance tier edition
:type max_backup_retention_days: int
:param min_backup_retention_days: Minimum Backup retention in days for the
performance tier edition
:type min_backup_retention_days: int
:param max_storage_mb: Max storage allowed for a server.
:type max_storage_mb: int
:param min_storage_mb: Max storage allowed for a server.
:type min_storage_mb: int
:param service_level_objectives: Service level objectives associated with
the performance tier
:type service_level_objectives:
Expand All @@ -35,18 +25,10 @@ class PerformanceTierProperties(Model):

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'max_backup_retention_days': {'key': 'maxBackupRetentionDays', 'type': 'int'},
'min_backup_retention_days': {'key': 'minBackupRetentionDays', 'type': 'int'},
'max_storage_mb': {'key': 'maxStorageMB', 'type': 'int'},
'min_storage_mb': {'key': 'minStorageMB', 'type': 'int'},
'service_level_objectives': {'key': 'serviceLevelObjectives', 'type': '[PerformanceTierServiceLevelObjectives]'},
}

def __init__(self, id=None, max_backup_retention_days=None, min_backup_retention_days=None, max_storage_mb=None, min_storage_mb=None, service_level_objectives=None):
def __init__(self, id=None, service_level_objectives=None):
super(PerformanceTierProperties, self).__init__()
self.id = id
self.max_backup_retention_days = max_backup_retention_days
self.min_backup_retention_days = min_backup_retention_days
self.max_storage_mb = max_storage_mb
self.min_storage_mb = min_storage_mb
self.service_level_objectives = service_level_objectives
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,36 @@ class PerformanceTierServiceLevelObjectives(Model):
:param hardware_generation: Hardware generation associated with the
service level objective
:type hardware_generation: str
:param max_backup_retention_days: Maximum Backup retention in days for the
performance tier edition
:type max_backup_retention_days: int
:param min_backup_retention_days: Minimum Backup retention in days for the
performance tier edition
:type min_backup_retention_days: int
:param max_storage_mb: Max storage allowed for a server.
:type max_storage_mb: int
:param min_storage_mb: Max storage allowed for a server.
:type min_storage_mb: int
"""

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'edition': {'key': 'edition', 'type': 'str'},
'v_core': {'key': 'vCore', 'type': 'int'},
'hardware_generation': {'key': 'hardwareGeneration', 'type': 'str'},
'max_backup_retention_days': {'key': 'maxBackupRetentionDays', 'type': 'int'},
'min_backup_retention_days': {'key': 'minBackupRetentionDays', 'type': 'int'},
'max_storage_mb': {'key': 'maxStorageMB', 'type': 'int'},
'min_storage_mb': {'key': 'minStorageMB', 'type': 'int'},
}

def __init__(self, id=None, edition=None, v_core=None, hardware_generation=None):
def __init__(self, id=None, edition=None, v_core=None, hardware_generation=None, max_backup_retention_days=None, min_backup_retention_days=None, max_storage_mb=None, min_storage_mb=None):
super(PerformanceTierServiceLevelObjectives, self).__init__()
self.id = id
self.edition = edition
self.v_core = v_core
self.hardware_generation = hardware_generation
self.max_backup_retention_days = max_backup_retention_days
self.min_backup_retention_days = min_backup_retention_days
self.max_storage_mb = max_storage_mb
self.min_storage_mb = min_storage_mb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ class GeoRedundantBackup(Enum):
class SkuTier(Enum):

basic = "Basic"
standard = "Standard"
general_purpose = "GeneralPurpose"
memory_optimized = "MemoryOptimized"


class OperationOrigin(Enum):
Expand Down
Loading

0 comments on commit 5288815

Please sign in to comment.