CodeGen from PR 15674 in Azure/azure-rest-api-specs

Merge e9610ec64883d538805eeef7efae613f1cabbe31 into 60d6c39

sdk/redis/azure-mgmt-redis/_meta.json

@@ -1,11 +1,11 @@
 {
-  "autorest": "3.4.2",
+  "autorest": "3.4.5",
   "use": [
-    "@autorest/python@5.8.1",
+    "@autorest/python@5.8.4",
     "@autorest/modelerfour@4.19.2"
   ],
-  "commit": "55558c4b2a1ee05064b1ce6733edf72a0345cfb8",
+  "commit": "2eac009a839d8131948fa874e571f19752141d95",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest_command": "autorest specification/redis/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.1 --use=@autorest/modelerfour@4.19.2 --version=3.4.2",
+  "autorest_command": "autorest specification/redis/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.4 --use=@autorest/modelerfour@4.19.2 --version=3.4.5",
   "readme": "specification/redis/resource-manager/readme.md"
 }

sdk/redis/azure-mgmt-redis/azure/mgmt/redis/_version.py

@@ -6,4 +6,4 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "13.0.0"
+VERSION = "12.0.0b1"

sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/__init__.py

@@ -26,6 +26,7 @@
     from ._models_py3 import ProxyResource
     from ._models_py3 import RedisAccessKeys
     from ._models_py3 import RedisCommonProperties
+    from ._models_py3 import RedisCommonPropertiesRedisConfiguration
     from ._models_py3 import RedisCreateParameters
     from ._models_py3 import RedisCreateProperties
     from ._models_py3 import RedisFirewallRule
@@ -73,6 +74,7 @@
     from ._models import ProxyResource  # type: ignore
     from ._models import RedisAccessKeys  # type: ignore
     from ._models import RedisCommonProperties  # type: ignore
+    from ._models import RedisCommonPropertiesRedisConfiguration  # type: ignore
     from ._models import RedisCreateParameters  # type: ignore
     from ._models import RedisCreateProperties  # type: ignore
     from ._models import RedisFirewallRule  # type: ignore
@@ -136,6 +138,7 @@
     'ProxyResource',
     'RedisAccessKeys',
     'RedisCommonProperties',
+    'RedisCommonPropertiesRedisConfiguration',
     'RedisCreateParameters',
     'RedisCreateProperties',
     'RedisFirewallRule',

sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/_models.py

@@ -610,7 +610,7 @@ class RedisCommonProperties(msrest.serialization.Model):
     :param redis_configuration: All Redis Settings. Few possible keys:
      rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value
      etc.
-    :type redis_configuration: dict[str, str]
+    :type redis_configuration: ~azure.mgmt.redis.models.RedisCommonPropertiesRedisConfiguration
     :param redis_version: Redis version. Only major version will be used in PUT/PATCH request with
      current valid values: (4, 6).
     :type redis_version: str
@@ -635,7 +635,7 @@ class RedisCommonProperties(msrest.serialization.Model):
     """
 
     _attribute_map = {
-        'redis_configuration': {'key': 'redisConfiguration', 'type': '{str}'},
+        'redis_configuration': {'key': 'redisConfiguration', 'type': 'RedisCommonPropertiesRedisConfiguration'},
         'redis_version': {'key': 'redisVersion', 'type': 'str'},
         'enable_non_ssl_port': {'key': 'enableNonSslPort', 'type': 'bool'},
         'replicas_per_master': {'key': 'replicasPerMaster', 'type': 'int'},
@@ -662,6 +662,81 @@ def __init__(
         self.public_network_access = kwargs.get('public_network_access', None)
 
 
+class RedisCommonPropertiesRedisConfiguration(msrest.serialization.Model):
+    """All Redis Settings. Few possible keys: rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value etc.
+
+    Variables are only populated by the server, and will be ignored when sending a request.
+
+    :param additional_properties: Unmatched properties from the message are deserialized to this
+     collection.
+    :type additional_properties: dict[str, str]
+    :param rdb_backup_enabled: Specifies whether the rdb backup is enabled.
+    :type rdb_backup_enabled: str
+    :param rdb_backup_frequency: Specifies the frequency for creating rdb backup.
+    :type rdb_backup_frequency: str
+    :param rdb_backup_max_snapshot_count: Specifies the maximum number of snapshots for rdb backup.
+    :type rdb_backup_max_snapshot_count: str
+    :param rdb_storage_connection_string: The storage account connection string for storing rdb
+     file.
+    :type rdb_storage_connection_string: str
+    :param aof_storage_connection_string0: First storage account connection string.
+    :type aof_storage_connection_string0: str
+    :param aof_storage_connection_string1: Second storage account connection string.
+    :type aof_storage_connection_string1: str
+    :param maxfragmentationmemory_reserved: Value in megabytes reserved for fragmentation per
+     shard.
+    :type maxfragmentationmemory_reserved: str
+    :param maxmemory_policy: The eviction strategy used when your data won't fit within its memory
+     limit.
+    :type maxmemory_policy: str
+    :param maxmemory_reserved: Value in megabytes reserved for non-cache usage per shard e.g.
+     failover.
+    :type maxmemory_reserved: str
+    :param maxmemory_delta: Value in megabytes reserved for non-cache usage per shard e.g.
+     failover.
+    :type maxmemory_delta: str
+    :ivar maxclients: The max clients config.
+    :vartype maxclients: str
+    """
+
+    _validation = {
+        'maxclients': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'additional_properties': {'key': '', 'type': '{str}'},
+        'rdb_backup_enabled': {'key': 'rdb-backup-enabled', 'type': 'str'},
+        'rdb_backup_frequency': {'key': 'rdb-backup-frequency', 'type': 'str'},
+        'rdb_backup_max_snapshot_count': {'key': 'rdb-backup-max-snapshot-count', 'type': 'str'},
+        'rdb_storage_connection_string': {'key': 'rdb-storage-connection-string', 'type': 'str'},
+        'aof_storage_connection_string0': {'key': 'aof-storage-connection-string-0', 'type': 'str'},
+        'aof_storage_connection_string1': {'key': 'aof-storage-connection-string-1', 'type': 'str'},
+        'maxfragmentationmemory_reserved': {'key': 'maxfragmentationmemory-reserved', 'type': 'str'},
+        'maxmemory_policy': {'key': 'maxmemory-policy', 'type': 'str'},
+        'maxmemory_reserved': {'key': 'maxmemory-reserved', 'type': 'str'},
+        'maxmemory_delta': {'key': 'maxmemory-delta', 'type': 'str'},
+        'maxclients': {'key': 'maxclients', 'type': 'str'},
+    }
+
+    def __init__(
+        self,
+        **kwargs
+    ):
+        super(RedisCommonPropertiesRedisConfiguration, self).__init__(**kwargs)
+        self.additional_properties = kwargs.get('additional_properties', None)
+        self.rdb_backup_enabled = kwargs.get('rdb_backup_enabled', None)
+        self.rdb_backup_frequency = kwargs.get('rdb_backup_frequency', None)
+        self.rdb_backup_max_snapshot_count = kwargs.get('rdb_backup_max_snapshot_count', None)
+        self.rdb_storage_connection_string = kwargs.get('rdb_storage_connection_string', None)
+        self.aof_storage_connection_string0 = kwargs.get('aof_storage_connection_string0', None)
+        self.aof_storage_connection_string1 = kwargs.get('aof_storage_connection_string1', None)
+        self.maxfragmentationmemory_reserved = kwargs.get('maxfragmentationmemory_reserved', None)
+        self.maxmemory_policy = kwargs.get('maxmemory_policy', None)
+        self.maxmemory_reserved = kwargs.get('maxmemory_reserved', None)
+        self.maxmemory_delta = kwargs.get('maxmemory_delta', None)
+        self.maxclients = None
+
+
 class RedisCreateParameters(msrest.serialization.Model):
     """Parameters supplied to the Create Redis operation.
 
@@ -676,7 +751,7 @@ class RedisCreateParameters(msrest.serialization.Model):
     :param redis_configuration: All Redis Settings. Few possible keys:
      rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value
      etc.
-    :type redis_configuration: dict[str, str]
+    :type redis_configuration: ~azure.mgmt.redis.models.RedisCommonPropertiesRedisConfiguration
     :param redis_version: Redis version. Only major version will be used in PUT/PATCH request with
      current valid values: (4, 6).
     :type redis_version: str
@@ -720,7 +795,7 @@ class RedisCreateParameters(msrest.serialization.Model):
         'zones': {'key': 'zones', 'type': '[str]'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'redis_configuration': {'key': 'properties.redisConfiguration', 'type': '{str}'},
+        'redis_configuration': {'key': 'properties.redisConfiguration', 'type': 'RedisCommonPropertiesRedisConfiguration'},
         'redis_version': {'key': 'properties.redisVersion', 'type': 'str'},
         'enable_non_ssl_port': {'key': 'properties.enableNonSslPort', 'type': 'bool'},
         'replicas_per_master': {'key': 'properties.replicasPerMaster', 'type': 'int'},
@@ -764,7 +839,7 @@ class RedisCreateProperties(RedisCommonProperties):
     :param redis_configuration: All Redis Settings. Few possible keys:
      rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value
      etc.
-    :type redis_configuration: dict[str, str]
+    :type redis_configuration: ~azure.mgmt.redis.models.RedisCommonPropertiesRedisConfiguration
     :param redis_version: Redis version. Only major version will be used in PUT/PATCH request with
      current valid values: (4, 6).
     :type redis_version: str
@@ -804,7 +879,7 @@ class RedisCreateProperties(RedisCommonProperties):
     }
 
     _attribute_map = {
-        'redis_configuration': {'key': 'redisConfiguration', 'type': '{str}'},
+        'redis_configuration': {'key': 'redisConfiguration', 'type': 'RedisCommonPropertiesRedisConfiguration'},
         'redis_version': {'key': 'redisVersion', 'type': 'str'},
         'enable_non_ssl_port': {'key': 'enableNonSslPort', 'type': 'bool'},
         'replicas_per_master': {'key': 'replicasPerMaster', 'type': 'int'},
@@ -1349,7 +1424,7 @@ class RedisProperties(RedisCreateProperties):
     :param redis_configuration: All Redis Settings. Few possible keys:
      rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value
      etc.
-    :type redis_configuration: dict[str, str]
+    :type redis_configuration: ~azure.mgmt.redis.models.RedisCommonPropertiesRedisConfiguration
     :param redis_version: Redis version. Only major version will be used in PUT/PATCH request with
      current valid values: (4, 6).
     :type redis_version: str
@@ -1417,7 +1492,7 @@ class RedisProperties(RedisCreateProperties):
     }
 
     _attribute_map = {
-        'redis_configuration': {'key': 'redisConfiguration', 'type': '{str}'},
+        'redis_configuration': {'key': 'redisConfiguration', 'type': 'RedisCommonPropertiesRedisConfiguration'},
         'redis_version': {'key': 'redisVersion', 'type': 'str'},
         'enable_non_ssl_port': {'key': 'enableNonSslPort', 'type': 'bool'},
         'replicas_per_master': {'key': 'replicasPerMaster', 'type': 'int'},
@@ -1578,7 +1653,7 @@ class RedisResource(TrackedResource):
     :param redis_configuration: All Redis Settings. Few possible keys:
      rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value
      etc.
-    :type redis_configuration: dict[str, str]
+    :type redis_configuration: ~azure.mgmt.redis.models.RedisCommonPropertiesRedisConfiguration
     :param redis_version: Redis version. Only major version will be used in PUT/PATCH request with
      current valid values: (4, 6).
     :type redis_version: str
@@ -1656,7 +1731,7 @@ class RedisResource(TrackedResource):
         'tags': {'key': 'tags', 'type': '{str}'},
         'location': {'key': 'location', 'type': 'str'},
         'zones': {'key': 'zones', 'type': '[str]'},
-        'redis_configuration': {'key': 'properties.redisConfiguration', 'type': '{str}'},
+        'redis_configuration': {'key': 'properties.redisConfiguration', 'type': 'RedisCommonPropertiesRedisConfiguration'},
         'redis_version': {'key': 'properties.redisVersion', 'type': 'str'},
         'enable_non_ssl_port': {'key': 'properties.enableNonSslPort', 'type': 'bool'},
         'replicas_per_master': {'key': 'properties.replicasPerMaster', 'type': 'int'},
@@ -1714,7 +1789,7 @@ class RedisUpdateParameters(msrest.serialization.Model):
     :param redis_configuration: All Redis Settings. Few possible keys:
      rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value
      etc.
-    :type redis_configuration: dict[str, str]
+    :type redis_configuration: ~azure.mgmt.redis.models.RedisCommonPropertiesRedisConfiguration
     :param redis_version: Redis version. Only major version will be used in PUT/PATCH request with
      current valid values: (4, 6).
     :type redis_version: str
@@ -1742,7 +1817,7 @@ class RedisUpdateParameters(msrest.serialization.Model):
 
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
-        'redis_configuration': {'key': 'properties.redisConfiguration', 'type': '{str}'},
+        'redis_configuration': {'key': 'properties.redisConfiguration', 'type': 'RedisCommonPropertiesRedisConfiguration'},
         'redis_version': {'key': 'properties.redisVersion', 'type': 'str'},
         'enable_non_ssl_port': {'key': 'properties.enableNonSslPort', 'type': 'bool'},
         'replicas_per_master': {'key': 'properties.replicasPerMaster', 'type': 'int'},
@@ -1778,7 +1853,7 @@ class RedisUpdateProperties(RedisCommonProperties):
     :param redis_configuration: All Redis Settings. Few possible keys:
      rdb-backup-enabled,rdb-storage-connection-string,rdb-backup-frequency,maxmemory-delta,maxmemory-policy,notify-keyspace-events,maxmemory-samples,slowlog-log-slower-than,slowlog-max-len,list-max-ziplist-entries,list-max-ziplist-value,hash-max-ziplist-entries,hash-max-ziplist-value,set-max-intset-entries,zset-max-ziplist-entries,zset-max-ziplist-value
      etc.
-    :type redis_configuration: dict[str, str]
+    :type redis_configuration: ~azure.mgmt.redis.models.RedisCommonPropertiesRedisConfiguration
     :param redis_version: Redis version. Only major version will be used in PUT/PATCH request with
      current valid values: (4, 6).
     :type redis_version: str
@@ -1805,7 +1880,7 @@ class RedisUpdateProperties(RedisCommonProperties):
     """
 
     _attribute_map = {
-        'redis_configuration': {'key': 'redisConfiguration', 'type': '{str}'},
+        'redis_configuration': {'key': 'redisConfiguration', 'type': 'RedisCommonPropertiesRedisConfiguration'},
         'redis_version': {'key': 'redisVersion', 'type': 'str'},
         'enable_non_ssl_port': {'key': 'enableNonSslPort', 'type': 'bool'},
         'replicas_per_master': {'key': 'replicasPerMaster', 'type': 'int'},