diff --git a/sdk/redis/azure-mgmt-redis/_meta.json b/sdk/redis/azure-mgmt-redis/_meta.json
index a4149df0f50b..64aee7187495 100644
--- a/sdk/redis/azure-mgmt-redis/_meta.json
+++ b/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": "39c257c1f81cc90cb4842f0c9dde8e8f68a3a397",
   "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"
 }
\ No newline at end of file
diff --git a/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/_version.py b/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/_version.py
index fa8e008c199f..dc6920075e88 100644
--- a/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/_version.py
+++ b/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"
diff --git a/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/__init__.py b/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/__init__.py
index 6e9b784a8c55..999364f335da 100644
--- a/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/__init__.py
+++ b/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',
diff --git a/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/_models.py b/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/_models.py
index c46da32e08de..adb6e69470fb 100644
--- a/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/_models.py
+++ b/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
@@ -630,12 +630,12 @@ class RedisCommonProperties(msrest.serialization.Model):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     """
 
     _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'},
@@ -653,13 +653,88 @@ def __init__(
         super(RedisCommonProperties, self).__init__(**kwargs)
         self.redis_configuration = kwargs.get('redis_configuration', None)
         self.redis_version = kwargs.get('redis_version', None)
-        self.enable_non_ssl_port = kwargs.get('enable_non_ssl_port', None)
+        self.enable_non_ssl_port = kwargs.get('enable_non_ssl_port', False)
         self.replicas_per_master = kwargs.get('replicas_per_master', None)
         self.replicas_per_primary = kwargs.get('replicas_per_primary', None)
         self.tenant_settings = kwargs.get('tenant_settings', None)
         self.shard_count = kwargs.get('shard_count', None)
         self.minimum_tls_version = kwargs.get('minimum_tls_version', None)
-        self.public_network_access = kwargs.get('public_network_access', None)
+        self.public_network_access = kwargs.get('public_network_access', "Enabled")
+
+
+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):
@@ -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
@@ -696,7 +771,7 @@ class RedisCreateParameters(msrest.serialization.Model):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: Required. The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -704,8 +779,8 @@ class RedisCreateParameters(msrest.serialization.Model):
      cache in. Example format:
      /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/Microsoft.{Network|ClassicNetwork}/VirtualNetworks/vnet1/subnets/subnet1.
     :type subnet_id: str
-    :param static_ip: Static IP address. Required when deploying a Redis cache inside an existing
-     Azure Virtual Network.
+    :param static_ip: Static IP address. Optionally, may be specified when deploying a Redis cache
+     inside an existing Azure Virtual Network; auto assigned by default.
     :type static_ip: 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'},
@@ -744,13 +819,13 @@ def __init__(
         self.tags = kwargs.get('tags', None)
         self.redis_configuration = kwargs.get('redis_configuration', None)
         self.redis_version = kwargs.get('redis_version', None)
-        self.enable_non_ssl_port = kwargs.get('enable_non_ssl_port', None)
+        self.enable_non_ssl_port = kwargs.get('enable_non_ssl_port', False)
         self.replicas_per_master = kwargs.get('replicas_per_master', None)
         self.replicas_per_primary = kwargs.get('replicas_per_primary', None)
         self.tenant_settings = kwargs.get('tenant_settings', None)
         self.shard_count = kwargs.get('shard_count', None)
         self.minimum_tls_version = kwargs.get('minimum_tls_version', None)
-        self.public_network_access = kwargs.get('public_network_access', None)
+        self.public_network_access = kwargs.get('public_network_access', "Enabled")
         self.sku = kwargs['sku']
         self.subnet_id = kwargs.get('subnet_id', None)
         self.static_ip = kwargs.get('static_ip', None)
@@ -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
@@ -784,7 +859,7 @@ class RedisCreateProperties(RedisCommonProperties):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: Required. The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -792,8 +867,8 @@ class RedisCreateProperties(RedisCommonProperties):
      cache in. Example format:
      /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/Microsoft.{Network|ClassicNetwork}/VirtualNetworks/vnet1/subnets/subnet1.
     :type subnet_id: str
-    :param static_ip: Static IP address. Required when deploying a Redis cache inside an existing
-     Azure Virtual Network.
+    :param static_ip: Static IP address. Optionally, may be specified when deploying a Redis cache
+     inside an existing Azure Virtual Network; auto assigned by default.
     :type static_ip: 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
@@ -1369,7 +1444,7 @@ class RedisProperties(RedisCreateProperties):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: Required. The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -1377,8 +1452,8 @@ class RedisProperties(RedisCreateProperties):
      cache in. Example format:
      /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/Microsoft.{Network|ClassicNetwork}/VirtualNetworks/vnet1/subnets/subnet1.
     :type subnet_id: str
-    :param static_ip: Static IP address. Required when deploying a Redis cache inside an existing
-     Azure Virtual Network.
+    :param static_ip: Static IP address. Optionally, may be specified when deploying a Redis cache
+     inside an existing Azure Virtual Network; auto assigned by default.
     :type static_ip: str
     :ivar provisioning_state: Redis instance provisioning status. Possible values include:
      "Creating", "Deleting", "Disabled", "Failed", "Linking", "Provisioning",
@@ -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
@@ -1598,7 +1673,7 @@ class RedisResource(TrackedResource):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: Required. The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -1606,8 +1681,8 @@ class RedisResource(TrackedResource):
      cache in. Example format:
      /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/Microsoft.{Network|ClassicNetwork}/VirtualNetworks/vnet1/subnets/subnet1.
     :type subnet_id: str
-    :param static_ip: Static IP address. Required when deploying a Redis cache inside an existing
-     Azure Virtual Network.
+    :param static_ip: Static IP address. Optionally, may be specified when deploying a Redis cache
+     inside an existing Azure Virtual Network; auto assigned by default.
     :type static_ip: str
     :ivar provisioning_state: Redis instance provisioning status. Possible values include:
      "Creating", "Deleting", "Disabled", "Failed", "Linking", "Provisioning",
@@ -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'},
@@ -1686,13 +1761,13 @@ def __init__(
         self.zones = kwargs.get('zones', None)
         self.redis_configuration = kwargs.get('redis_configuration', None)
         self.redis_version = kwargs.get('redis_version', None)
-        self.enable_non_ssl_port = kwargs.get('enable_non_ssl_port', None)
+        self.enable_non_ssl_port = kwargs.get('enable_non_ssl_port', False)
         self.replicas_per_master = kwargs.get('replicas_per_master', None)
         self.replicas_per_primary = kwargs.get('replicas_per_primary', None)
         self.tenant_settings = kwargs.get('tenant_settings', None)
         self.shard_count = kwargs.get('shard_count', None)
         self.minimum_tls_version = kwargs.get('minimum_tls_version', None)
-        self.public_network_access = kwargs.get('public_network_access', None)
+        self.public_network_access = kwargs.get('public_network_access', "Enabled")
         self.sku = kwargs['sku']
         self.subnet_id = kwargs.get('subnet_id', None)
         self.static_ip = kwargs.get('static_ip', None)
@@ -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
@@ -1734,7 +1809,7 @@ class RedisUpdateParameters(msrest.serialization.Model):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -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'},
@@ -1762,13 +1837,13 @@ def __init__(
         self.tags = kwargs.get('tags', None)
         self.redis_configuration = kwargs.get('redis_configuration', None)
         self.redis_version = kwargs.get('redis_version', None)
-        self.enable_non_ssl_port = kwargs.get('enable_non_ssl_port', None)
+        self.enable_non_ssl_port = kwargs.get('enable_non_ssl_port', False)
         self.replicas_per_master = kwargs.get('replicas_per_master', None)
         self.replicas_per_primary = kwargs.get('replicas_per_primary', None)
         self.tenant_settings = kwargs.get('tenant_settings', None)
         self.shard_count = kwargs.get('shard_count', None)
         self.minimum_tls_version = kwargs.get('minimum_tls_version', None)
-        self.public_network_access = kwargs.get('public_network_access', None)
+        self.public_network_access = kwargs.get('public_network_access', "Enabled")
         self.sku = kwargs.get('sku', None)
 
 
@@ -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
@@ -1798,14 +1873,14 @@ class RedisUpdateProperties(RedisCommonProperties):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
     """
 
     _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'},
diff --git a/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/_models_py3.py b/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/_models_py3.py
index ea5d67ca55be..3b45b308fe0a 100644
--- a/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/_models_py3.py
+++ b/sdk/redis/azure-mgmt-redis/azure/mgmt/redis/models/_models_py3.py
@@ -652,7 +652,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
@@ -672,12 +672,12 @@ class RedisCommonProperties(msrest.serialization.Model):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     """
 
     _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'},
@@ -691,15 +691,15 @@ class RedisCommonProperties(msrest.serialization.Model):
     def __init__(
         self,
         *,
-        redis_configuration: Optional[Dict[str, str]] = None,
+        redis_configuration: Optional["RedisCommonPropertiesRedisConfiguration"] = None,
         redis_version: Optional[str] = None,
-        enable_non_ssl_port: Optional[bool] = None,
+        enable_non_ssl_port: Optional[bool] = False,
         replicas_per_master: Optional[int] = None,
         replicas_per_primary: Optional[int] = None,
         tenant_settings: Optional[Dict[str, str]] = None,
         shard_count: Optional[int] = None,
         minimum_tls_version: Optional[Union[str, "TlsVersion"]] = None,
-        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = None,
+        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = "Enabled",
         **kwargs
     ):
         super(RedisCommonProperties, self).__init__(**kwargs)
@@ -714,6 +714,93 @@ def __init__(
         self.public_network_access = public_network_access
 
 
+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,
+        *,
+        additional_properties: Optional[Dict[str, str]] = None,
+        rdb_backup_enabled: Optional[str] = None,
+        rdb_backup_frequency: Optional[str] = None,
+        rdb_backup_max_snapshot_count: Optional[str] = None,
+        rdb_storage_connection_string: Optional[str] = None,
+        aof_storage_connection_string0: Optional[str] = None,
+        aof_storage_connection_string1: Optional[str] = None,
+        maxfragmentationmemory_reserved: Optional[str] = None,
+        maxmemory_policy: Optional[str] = None,
+        maxmemory_reserved: Optional[str] = None,
+        maxmemory_delta: Optional[str] = None,
+        **kwargs
+    ):
+        super(RedisCommonPropertiesRedisConfiguration, self).__init__(**kwargs)
+        self.additional_properties = additional_properties
+        self.rdb_backup_enabled = rdb_backup_enabled
+        self.rdb_backup_frequency = rdb_backup_frequency
+        self.rdb_backup_max_snapshot_count = rdb_backup_max_snapshot_count
+        self.rdb_storage_connection_string = rdb_storage_connection_string
+        self.aof_storage_connection_string0 = aof_storage_connection_string0
+        self.aof_storage_connection_string1 = aof_storage_connection_string1
+        self.maxfragmentationmemory_reserved = maxfragmentationmemory_reserved
+        self.maxmemory_policy = maxmemory_policy
+        self.maxmemory_reserved = maxmemory_reserved
+        self.maxmemory_delta = maxmemory_delta
+        self.maxclients = None
+
+
 class RedisCreateParameters(msrest.serialization.Model):
     """Parameters supplied to the Create Redis operation.
 
@@ -728,7 +815,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
@@ -748,7 +835,7 @@ class RedisCreateParameters(msrest.serialization.Model):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: Required. The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -756,8 +843,8 @@ class RedisCreateParameters(msrest.serialization.Model):
      cache in. Example format:
      /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/Microsoft.{Network|ClassicNetwork}/VirtualNetworks/vnet1/subnets/subnet1.
     :type subnet_id: str
-    :param static_ip: Static IP address. Required when deploying a Redis cache inside an existing
-     Azure Virtual Network.
+    :param static_ip: Static IP address. Optionally, may be specified when deploying a Redis cache
+     inside an existing Azure Virtual Network; auto assigned by default.
     :type static_ip: str
     """
 
@@ -772,7 +859,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'},
@@ -793,15 +880,15 @@ def __init__(
         sku: "Sku",
         zones: Optional[List[str]] = None,
         tags: Optional[Dict[str, str]] = None,
-        redis_configuration: Optional[Dict[str, str]] = None,
+        redis_configuration: Optional["RedisCommonPropertiesRedisConfiguration"] = None,
         redis_version: Optional[str] = None,
-        enable_non_ssl_port: Optional[bool] = None,
+        enable_non_ssl_port: Optional[bool] = False,
         replicas_per_master: Optional[int] = None,
         replicas_per_primary: Optional[int] = None,
         tenant_settings: Optional[Dict[str, str]] = None,
         shard_count: Optional[int] = None,
         minimum_tls_version: Optional[Union[str, "TlsVersion"]] = None,
-        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = None,
+        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = "Enabled",
         subnet_id: Optional[str] = None,
         static_ip: Optional[str] = None,
         **kwargs
@@ -832,7 +919,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
@@ -852,7 +939,7 @@ class RedisCreateProperties(RedisCommonProperties):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: Required. The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -860,8 +947,8 @@ class RedisCreateProperties(RedisCommonProperties):
      cache in. Example format:
      /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/Microsoft.{Network|ClassicNetwork}/VirtualNetworks/vnet1/subnets/subnet1.
     :type subnet_id: str
-    :param static_ip: Static IP address. Required when deploying a Redis cache inside an existing
-     Azure Virtual Network.
+    :param static_ip: Static IP address. Optionally, may be specified when deploying a Redis cache
+     inside an existing Azure Virtual Network; auto assigned by default.
     :type static_ip: str
     """
 
@@ -872,7 +959,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'},
@@ -890,15 +977,15 @@ def __init__(
         self,
         *,
         sku: "Sku",
-        redis_configuration: Optional[Dict[str, str]] = None,
+        redis_configuration: Optional["RedisCommonPropertiesRedisConfiguration"] = None,
         redis_version: Optional[str] = None,
-        enable_non_ssl_port: Optional[bool] = None,
+        enable_non_ssl_port: Optional[bool] = False,
         replicas_per_master: Optional[int] = None,
         replicas_per_primary: Optional[int] = None,
         tenant_settings: Optional[Dict[str, str]] = None,
         shard_count: Optional[int] = None,
         minimum_tls_version: Optional[Union[str, "TlsVersion"]] = None,
-        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = None,
+        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = "Enabled",
         subnet_id: Optional[str] = None,
         static_ip: Optional[str] = None,
         **kwargs
@@ -1462,7 +1549,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
@@ -1482,7 +1569,7 @@ class RedisProperties(RedisCreateProperties):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: Required. The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -1490,8 +1577,8 @@ class RedisProperties(RedisCreateProperties):
      cache in. Example format:
      /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/Microsoft.{Network|ClassicNetwork}/VirtualNetworks/vnet1/subnets/subnet1.
     :type subnet_id: str
-    :param static_ip: Static IP address. Required when deploying a Redis cache inside an existing
-     Azure Virtual Network.
+    :param static_ip: Static IP address. Optionally, may be specified when deploying a Redis cache
+     inside an existing Azure Virtual Network; auto assigned by default.
     :type static_ip: str
     :ivar provisioning_state: Redis instance provisioning status. Possible values include:
      "Creating", "Deleting", "Disabled", "Failed", "Linking", "Provisioning",
@@ -1530,7 +1617,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'},
@@ -1556,15 +1643,15 @@ def __init__(
         self,
         *,
         sku: "Sku",
-        redis_configuration: Optional[Dict[str, str]] = None,
+        redis_configuration: Optional["RedisCommonPropertiesRedisConfiguration"] = None,
         redis_version: Optional[str] = None,
-        enable_non_ssl_port: Optional[bool] = None,
+        enable_non_ssl_port: Optional[bool] = False,
         replicas_per_master: Optional[int] = None,
         replicas_per_primary: Optional[int] = None,
         tenant_settings: Optional[Dict[str, str]] = None,
         shard_count: Optional[int] = None,
         minimum_tls_version: Optional[Union[str, "TlsVersion"]] = None,
-        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = None,
+        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = "Enabled",
         subnet_id: Optional[str] = None,
         static_ip: Optional[str] = None,
         **kwargs
@@ -1713,7 +1800,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
@@ -1733,7 +1820,7 @@ class RedisResource(TrackedResource):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: Required. The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -1741,8 +1828,8 @@ class RedisResource(TrackedResource):
      cache in. Example format:
      /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/Microsoft.{Network|ClassicNetwork}/VirtualNetworks/vnet1/subnets/subnet1.
     :type subnet_id: str
-    :param static_ip: Static IP address. Required when deploying a Redis cache inside an existing
-     Azure Virtual Network.
+    :param static_ip: Static IP address. Optionally, may be specified when deploying a Redis cache
+     inside an existing Azure Virtual Network; auto assigned by default.
     :type static_ip: str
     :ivar provisioning_state: Redis instance provisioning status. Possible values include:
      "Creating", "Deleting", "Disabled", "Failed", "Linking", "Provisioning",
@@ -1791,7 +1878,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'},
@@ -1820,15 +1907,15 @@ def __init__(
         sku: "Sku",
         tags: Optional[Dict[str, str]] = None,
         zones: Optional[List[str]] = None,
-        redis_configuration: Optional[Dict[str, str]] = None,
+        redis_configuration: Optional["RedisCommonPropertiesRedisConfiguration"] = None,
         redis_version: Optional[str] = None,
-        enable_non_ssl_port: Optional[bool] = None,
+        enable_non_ssl_port: Optional[bool] = False,
         replicas_per_master: Optional[int] = None,
         replicas_per_primary: Optional[int] = None,
         tenant_settings: Optional[Dict[str, str]] = None,
         shard_count: Optional[int] = None,
         minimum_tls_version: Optional[Union[str, "TlsVersion"]] = None,
-        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = None,
+        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = "Enabled",
         subnet_id: Optional[str] = None,
         static_ip: Optional[str] = None,
         **kwargs
@@ -1865,7 +1952,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
@@ -1885,7 +1972,7 @@ class RedisUpdateParameters(msrest.serialization.Model):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
@@ -1893,7 +1980,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'},
@@ -1909,15 +1996,15 @@ def __init__(
         self,
         *,
         tags: Optional[Dict[str, str]] = None,
-        redis_configuration: Optional[Dict[str, str]] = None,
+        redis_configuration: Optional["RedisCommonPropertiesRedisConfiguration"] = None,
         redis_version: Optional[str] = None,
-        enable_non_ssl_port: Optional[bool] = None,
+        enable_non_ssl_port: Optional[bool] = False,
         replicas_per_master: Optional[int] = None,
         replicas_per_primary: Optional[int] = None,
         tenant_settings: Optional[Dict[str, str]] = None,
         shard_count: Optional[int] = None,
         minimum_tls_version: Optional[Union[str, "TlsVersion"]] = None,
-        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = None,
+        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = "Enabled",
         sku: Optional["Sku"] = None,
         **kwargs
     ):
@@ -1941,7 +2028,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
@@ -1961,14 +2048,14 @@ class RedisUpdateProperties(RedisCommonProperties):
     :param public_network_access: Whether or not public endpoint access is allowed for this cache.
      Value is optional but if passed in, must be 'Enabled' or 'Disabled'. If 'Disabled', private
      endpoints are the exclusive access method. Default value is 'Enabled'. Possible values include:
-     "Enabled", "Disabled".
+     "Enabled", "Disabled". Default value: "Enabled".
     :type public_network_access: str or ~azure.mgmt.redis.models.PublicNetworkAccess
     :param sku: The SKU of the Redis cache to deploy.
     :type sku: ~azure.mgmt.redis.models.Sku
     """
 
     _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'},
@@ -1983,15 +2070,15 @@ class RedisUpdateProperties(RedisCommonProperties):
     def __init__(
         self,
         *,
-        redis_configuration: Optional[Dict[str, str]] = None,
+        redis_configuration: Optional["RedisCommonPropertiesRedisConfiguration"] = None,
         redis_version: Optional[str] = None,
-        enable_non_ssl_port: Optional[bool] = None,
+        enable_non_ssl_port: Optional[bool] = False,
         replicas_per_master: Optional[int] = None,
         replicas_per_primary: Optional[int] = None,
         tenant_settings: Optional[Dict[str, str]] = None,
         shard_count: Optional[int] = None,
         minimum_tls_version: Optional[Union[str, "TlsVersion"]] = None,
-        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = None,
+        public_network_access: Optional[Union[str, "PublicNetworkAccess"]] = "Enabled",
         sku: Optional["Sku"] = None,
         **kwargs
     ):