diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/_cdn_management_client.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/_cdn_management_client.py
index aadd85e922cd..68a714f72eb5 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/_cdn_management_client.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/_cdn_management_client.py
@@ -56,17 +56,22 @@ class CdnManagementClient(CdnManagementClientOperationsMixin, SDKClient):
      object<msrestazure.azure_active_directory>`
     :param subscription_id: Azure Subscription ID.
     :type subscription_id: str
+    :param subscription_id1: Azure Subscription ID.
+    :type subscription_id1: str
+    :param api_version1: Version of the API to be used with the client
+     request. Current version is 2017-04-02.
+    :type api_version1: str
     :param str base_url: Service URL
     """
 
     def __init__(
-            self, credentials, subscription_id, base_url=None):
+            self, credentials, subscription_id, subscription_id1, api_version1, base_url=None):
 
-        self.config = CdnManagementClientConfiguration(credentials, subscription_id, base_url)
+        self.config = CdnManagementClientConfiguration(credentials, subscription_id, subscription_id1, api_version1, base_url)
         super(CdnManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2019-06-15-preview'
+        self.api_version = '2019-06-15'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/_configuration.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/_configuration.py
index 425d52e81a87..2562e3f64a69 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/_configuration.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/_configuration.py
@@ -23,16 +23,25 @@ class CdnManagementClientConfiguration(AzureConfiguration):
      object<msrestazure.azure_active_directory>`
     :param subscription_id: Azure Subscription ID.
     :type subscription_id: str
+    :param subscription_id1: Azure Subscription ID.
+    :type subscription_id1: str
+    :param api_version1: Version of the API to be used with the client
+     request. Current version is 2017-04-02.
+    :type api_version1: str
     :param str base_url: Service URL
     """
 
     def __init__(
-            self, credentials, subscription_id, base_url=None):
+            self, credentials, subscription_id, subscription_id1, api_version1, base_url=None):
 
         if credentials is None:
             raise ValueError("Parameter 'credentials' must not be None.")
         if subscription_id is None:
             raise ValueError("Parameter 'subscription_id' must not be None.")
+        if subscription_id1 is None:
+            raise ValueError("Parameter 'subscription_id1' must not be None.")
+        if api_version1 is None:
+            raise ValueError("Parameter 'api_version1' must not be None.")
         if not base_url:
             base_url = 'https://management.azure.com'
 
@@ -46,3 +55,5 @@ def __init__(
 
         self.credentials = credentials
         self.subscription_id = subscription_id
+        self.subscription_id1 = subscription_id1
+        self.api_version1 = api_version1
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_cdn_management_client_enums.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_cdn_management_client_enums.py
index b69fc68b6e47..d67eac24ae46 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_cdn_management_client_enums.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_cdn_management_client_enums.py
@@ -314,7 +314,7 @@ class CustomRuleEnabledState(str, Enum):
 class MatchVariable(str, Enum):
 
     remote_addr = "RemoteAddr"
-    country = "Country"
+    socket_addr = "SocketAddr"
     request_method = "RequestMethod"
     request_header = "RequestHeader"
     request_uri = "RequestUri"
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models.py
index 940b401edd27..d21103838b4e 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models.py
@@ -2292,12 +2292,12 @@ class MatchCondition(Model):
     All required parameters must be populated in order to send to Azure.
 
     :param match_variable: Required. Match variable to compare against.
-     Possible values include: 'RemoteAddr', 'Country', 'RequestMethod',
+     Possible values include: 'RemoteAddr', 'SocketAddr', 'RequestMethod',
      'RequestHeader', 'RequestUri', 'QueryString', 'RequestBody', 'Cookies',
      'PostArgs'
     :type match_variable: str or ~azure.mgmt.cdn.models.MatchVariable
     :param selector: Selector can used to match a specific key for
-     QueryString, RequestUri, RequestHeaders or RequestBody.
+     QueryString, Cookies, RequestHeader or PostArgs.
     :type selector: str
     :param operator: Required. Describes operator to be matched. Possible
      values include: 'Any', 'IPMatch', 'GeoMatch', 'Equal', 'Contains',
@@ -2523,7 +2523,6 @@ class PolicySettings(Model):
     """
 
     _validation = {
-        'default_custom_block_response_status_code': {'maximum': 599, 'minimum': 200},
         'default_custom_block_response_body': {'pattern': r'^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$'},
     }
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models_py3.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models_py3.py
index f544cd6f0a88..ef364716f4c9 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models_py3.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/models/_models_py3.py
@@ -2292,12 +2292,12 @@ class MatchCondition(Model):
     All required parameters must be populated in order to send to Azure.
 
     :param match_variable: Required. Match variable to compare against.
-     Possible values include: 'RemoteAddr', 'Country', 'RequestMethod',
+     Possible values include: 'RemoteAddr', 'SocketAddr', 'RequestMethod',
      'RequestHeader', 'RequestUri', 'QueryString', 'RequestBody', 'Cookies',
      'PostArgs'
     :type match_variable: str or ~azure.mgmt.cdn.models.MatchVariable
     :param selector: Selector can used to match a specific key for
-     QueryString, RequestUri, RequestHeaders or RequestBody.
+     QueryString, Cookies, RequestHeader or PostArgs.
     :type selector: str
     :param operator: Required. Describes operator to be matched. Possible
      values include: 'Any', 'IPMatch', 'GeoMatch', 'Equal', 'Contains',
@@ -2523,7 +2523,6 @@ class PolicySettings(Model):
     """
 
     _validation = {
-        'default_custom_block_response_status_code': {'maximum': 599, 'minimum': 200},
         'default_custom_block_response_body': {'pattern': r'^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$'},
     }
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_custom_domains_operations.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_custom_domains_operations.py
index 7062f3872b4d..73a195260374 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_custom_domains_operations.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_custom_domains_operations.py
@@ -26,7 +26,7 @@ class CustomDomainsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15-preview".
+    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15".
     """
 
     models = models
@@ -36,7 +36,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2019-06-15-preview"
+        self.api_version = "2019-06-15"
 
         self.config = config
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_edge_nodes_operations.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_edge_nodes_operations.py
index 55813844da35..cf20e0b2a65c 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_edge_nodes_operations.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_edge_nodes_operations.py
@@ -24,7 +24,7 @@ class EdgeNodesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15-preview".
+    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2019-06-15-preview"
+        self.api_version = "2019-06-15"
 
         self.config = config
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_endpoints_operations.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_endpoints_operations.py
index db2f79eeea3b..97df8e811d74 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_endpoints_operations.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_endpoints_operations.py
@@ -26,7 +26,7 @@ class EndpointsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15-preview".
+    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15".
     """
 
     models = models
@@ -36,7 +36,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2019-06-15-preview"
+        self.api_version = "2019-06-15"
 
         self.config = config
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_managed_rule_sets_operations.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_managed_rule_sets_operations.py
index 548d3c4e12f3..d968a3b04f46 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_managed_rule_sets_operations.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_managed_rule_sets_operations.py
@@ -24,7 +24,7 @@ class ManagedRuleSetsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15-preview".
+    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2019-06-15-preview"
+        self.api_version = "2019-06-15"
 
         self.config = config
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_operations.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_operations.py
index 11d4db705f67..7e535a9ea4ac 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_operations.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_operations.py
@@ -24,7 +24,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: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15-preview".
+    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2019-06-15-preview"
+        self.api_version = "2019-06-15"
 
         self.config = config
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_origins_operations.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_origins_operations.py
index 9e197af88faf..5da25d90dff5 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_origins_operations.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_origins_operations.py
@@ -26,7 +26,7 @@ class OriginsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15-preview".
+    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15".
     """
 
     models = models
@@ -36,7 +36,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2019-06-15-preview"
+        self.api_version = "2019-06-15"
 
         self.config = config
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_policies_operations.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_policies_operations.py
index 38877e1801b7..4a895d20b2a5 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_policies_operations.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_policies_operations.py
@@ -27,7 +27,7 @@ class PoliciesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15-preview".
+    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15".
     """
 
     models = models
@@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2019-06-15-preview"
+        self.api_version = "2019-06-15"
 
         self.config = config
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_profiles_operations.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_profiles_operations.py
index 72fafc7245fe..cc96580a931a 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_profiles_operations.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_profiles_operations.py
@@ -26,7 +26,7 @@ class ProfilesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15-preview".
+    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15".
     """
 
     models = models
@@ -36,7 +36,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2019-06-15-preview"
+        self.api_version = "2019-06-15"
 
         self.config = config
 
diff --git a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_resource_usage_operations.py b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_resource_usage_operations.py
index 654a4f3a72b8..7ce5f9fbc1ba 100644
--- a/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_resource_usage_operations.py
+++ b/sdk/cdn/azure-mgmt-cdn/azure/mgmt/cdn/operations/_resource_usage_operations.py
@@ -24,7 +24,7 @@ class ResourceUsageOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15-preview".
+    :ivar api_version: Version of the API to be used with the client request. Current version is 2017-04-02. Constant value: "2019-06-15".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2019-06-15-preview"
+        self.api_version = "2019-06-15"
 
         self.config = config