diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/api_management_client.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/api_management_client.py
index 8fbad986b5e9..d801ba354280 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/api_management_client.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/api_management_client.py
@@ -25,7 +25,6 @@
 from .operations.api_policy_operations import ApiPolicyOperations
 from .operations.api_schema_operations import ApiSchemaOperations
 from .operations.api_diagnostic_operations import ApiDiagnosticOperations
-from .operations.api_diagnostic_logger_operations import ApiDiagnosticLoggerOperations
 from .operations.api_issue_operations import ApiIssueOperations
 from .operations.api_issue_comment_operations import ApiIssueCommentOperations
 from .operations.api_issue_attachment_operations import ApiIssueAttachmentOperations
@@ -35,7 +34,6 @@
 from .operations.api_management_operations import ApiManagementOperations
 from .operations.api_management_service_operations import ApiManagementServiceOperations
 from .operations.diagnostic_operations import DiagnosticOperations
-from .operations.diagnostic_logger_operations import DiagnosticLoggerOperations
 from .operations.email_template_operations import EmailTemplateOperations
 from .operations.group_operations import GroupOperations
 from .operations.group_user_operations import GroupUserOperations
@@ -139,8 +137,6 @@ class ApiManagementClient(SDKClient):
     :vartype api_schema: azure.mgmt.apimanagement.operations.ApiSchemaOperations
     :ivar api_diagnostic: ApiDiagnostic operations
     :vartype api_diagnostic: azure.mgmt.apimanagement.operations.ApiDiagnosticOperations
-    :ivar api_diagnostic_logger: ApiDiagnosticLogger operations
-    :vartype api_diagnostic_logger: azure.mgmt.apimanagement.operations.ApiDiagnosticLoggerOperations
     :ivar api_issue: ApiIssue operations
     :vartype api_issue: azure.mgmt.apimanagement.operations.ApiIssueOperations
     :ivar api_issue_comment: ApiIssueComment operations
@@ -159,8 +155,6 @@ class ApiManagementClient(SDKClient):
     :vartype api_management_service: azure.mgmt.apimanagement.operations.ApiManagementServiceOperations
     :ivar diagnostic: Diagnostic operations
     :vartype diagnostic: azure.mgmt.apimanagement.operations.DiagnosticOperations
-    :ivar diagnostic_logger: DiagnosticLogger operations
-    :vartype diagnostic_logger: azure.mgmt.apimanagement.operations.DiagnosticLoggerOperations
     :ivar email_template: EmailTemplate operations
     :vartype email_template: azure.mgmt.apimanagement.operations.EmailTemplateOperations
     :ivar group: Group operations
@@ -251,7 +245,7 @@ def __init__(
         super(ApiManagementClient, 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 = '2018-01-01'
+        self.api_version = '2018-06-01-preview'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
@@ -279,8 +273,6 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.api_diagnostic = ApiDiagnosticOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.api_diagnostic_logger = ApiDiagnosticLoggerOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.api_issue = ApiIssueOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.api_issue_comment = ApiIssueCommentOperations(
@@ -299,8 +291,6 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.diagnostic = DiagnosticOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.diagnostic_logger = DiagnosticLoggerOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.email_template = EmailTemplateOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.group = GroupOperations(
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/__init__.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/__init__.py
index 99bc8a8aedc1..d73cb1b6d680 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/__init__.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/__init__.py
@@ -11,6 +11,7 @@
 
 try:
     from .error_field_contract_py3 import ErrorFieldContract
+    from .error_response_body_py3 import ErrorResponseBody
     from .error_response_py3 import ErrorResponse, ErrorResponseException
     from .policy_contract_py3 import PolicyContract
     from .policy_collection_py3 import PolicyCollection
@@ -43,7 +44,10 @@
     from .issue_contract_py3 import IssueContract
     from .issue_comment_contract_py3 import IssueCommentContract
     from .issue_attachment_contract_py3 import IssueAttachmentContract
-    from .logger_contract_py3 import LoggerContract
+    from .body_diagnostic_settings_py3 import BodyDiagnosticSettings
+    from .http_message_diagnostic_py3 import HttpMessageDiagnostic
+    from .pipeline_diagnostic_settings_py3 import PipelineDiagnosticSettings
+    from .sampling_settings_py3 import SamplingSettings
     from .diagnostic_contract_py3 import DiagnosticContract
     from .product_entity_base_parameters_py3 import ProductEntityBaseParameters
     from .product_tag_resource_contract_properties_py3 import ProductTagResourceContractProperties
@@ -103,6 +107,7 @@
     from .identity_provider_contract_py3 import IdentityProviderContract
     from .identity_provider_update_parameters_py3 import IdentityProviderUpdateParameters
     from .identity_provider_base_parameters_py3 import IdentityProviderBaseParameters
+    from .logger_contract_py3 import LoggerContract
     from .logger_update_contract_py3 import LoggerUpdateContract
     from .recipients_contract_properties_py3 import RecipientsContractProperties
     from .notification_contract_py3 import NotificationContract
@@ -155,6 +160,7 @@
     from .api_version_set_update_parameters_py3 import ApiVersionSetUpdateParameters
 except (SyntaxError, ImportError):
     from .error_field_contract import ErrorFieldContract
+    from .error_response_body import ErrorResponseBody
     from .error_response import ErrorResponse, ErrorResponseException
     from .policy_contract import PolicyContract
     from .policy_collection import PolicyCollection
@@ -187,7 +193,10 @@
     from .issue_contract import IssueContract
     from .issue_comment_contract import IssueCommentContract
     from .issue_attachment_contract import IssueAttachmentContract
-    from .logger_contract import LoggerContract
+    from .body_diagnostic_settings import BodyDiagnosticSettings
+    from .http_message_diagnostic import HttpMessageDiagnostic
+    from .pipeline_diagnostic_settings import PipelineDiagnosticSettings
+    from .sampling_settings import SamplingSettings
     from .diagnostic_contract import DiagnosticContract
     from .product_entity_base_parameters import ProductEntityBaseParameters
     from .product_tag_resource_contract_properties import ProductTagResourceContractProperties
@@ -247,6 +256,7 @@
     from .identity_provider_contract import IdentityProviderContract
     from .identity_provider_update_parameters import IdentityProviderUpdateParameters
     from .identity_provider_base_parameters import IdentityProviderBaseParameters
+    from .logger_contract import LoggerContract
     from .logger_update_contract import LoggerUpdateContract
     from .recipients_contract_properties import RecipientsContractProperties
     from .notification_contract import NotificationContract
@@ -306,7 +316,6 @@
 from .product_contract_paged import ProductContractPaged
 from .schema_contract_paged import SchemaContractPaged
 from .diagnostic_contract_paged import DiagnosticContractPaged
-from .logger_contract_paged import LoggerContractPaged
 from .issue_contract_paged import IssueContractPaged
 from .issue_comment_contract_paged import IssueCommentContractPaged
 from .issue_attachment_contract_paged import IssueAttachmentContractPaged
@@ -319,6 +328,7 @@
 from .group_contract_paged import GroupContractPaged
 from .user_contract_paged import UserContractPaged
 from .identity_provider_contract_paged import IdentityProviderContractPaged
+from .logger_contract_paged import LoggerContractPaged
 from .notification_contract_paged import NotificationContractPaged
 from .openid_connect_provider_contract_paged import OpenidConnectProviderContractPaged
 from .subscription_contract_paged import SubscriptionContractPaged
@@ -336,7 +346,8 @@
     SoapApiType,
     ApiType,
     State,
-    LoggerType,
+    SamplingType,
+    AlwaysLog,
     ProductState,
     GrantType,
     AuthorizationMethod,
@@ -351,6 +362,7 @@
     Confirmation,
     UserState,
     IdentityProviderType,
+    LoggerType,
     ConnectivityStatusType,
     SubscriptionState,
     AsyncOperationStatus,
@@ -364,6 +376,7 @@
 
 __all__ = [
     'ErrorFieldContract',
+    'ErrorResponseBody',
     'ErrorResponse', 'ErrorResponseException',
     'PolicyContract',
     'PolicyCollection',
@@ -396,7 +409,10 @@
     'IssueContract',
     'IssueCommentContract',
     'IssueAttachmentContract',
-    'LoggerContract',
+    'BodyDiagnosticSettings',
+    'HttpMessageDiagnostic',
+    'PipelineDiagnosticSettings',
+    'SamplingSettings',
     'DiagnosticContract',
     'ProductEntityBaseParameters',
     'ProductTagResourceContractProperties',
@@ -456,6 +472,7 @@
     'IdentityProviderContract',
     'IdentityProviderUpdateParameters',
     'IdentityProviderBaseParameters',
+    'LoggerContract',
     'LoggerUpdateContract',
     'RecipientsContractProperties',
     'NotificationContract',
@@ -515,7 +532,6 @@
     'ProductContractPaged',
     'SchemaContractPaged',
     'DiagnosticContractPaged',
-    'LoggerContractPaged',
     'IssueContractPaged',
     'IssueCommentContractPaged',
     'IssueAttachmentContractPaged',
@@ -528,6 +544,7 @@
     'GroupContractPaged',
     'UserContractPaged',
     'IdentityProviderContractPaged',
+    'LoggerContractPaged',
     'NotificationContractPaged',
     'OpenidConnectProviderContractPaged',
     'SubscriptionContractPaged',
@@ -544,7 +561,8 @@
     'SoapApiType',
     'ApiType',
     'State',
-    'LoggerType',
+    'SamplingType',
+    'AlwaysLog',
     'ProductState',
     'GrantType',
     'AuthorizationMethod',
@@ -559,6 +577,7 @@
     'Confirmation',
     'UserState',
     'IdentityProviderType',
+    'LoggerType',
     'ConnectivityStatusType',
     'SubscriptionState',
     'AsyncOperationStatus',
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_properties_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_properties_py3.py
index 3f2e351e60da..44ed25fdfa92 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_properties_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_properties_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .api_entity_base_contract import ApiEntityBaseContract
+from .api_entity_base_contract_py3 import ApiEntityBaseContract
 
 
 class ApiContractProperties(ApiEntityBaseContract):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_py3.py
index 6bce137bf551..bc3225217717 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class ApiContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_client_enums.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_client_enums.py
index 3cffd1387ec5..f52ede0050c3 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_client_enums.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_client_enums.py
@@ -57,10 +57,14 @@ class State(str, Enum):
     closed = "closed"  #: The issue was closed.
 
 
-class LoggerType(str, Enum):
+class SamplingType(str, Enum):
 
-    azure_event_hub = "azureEventHub"  #: Azure Event Hub as log destination.
-    application_insights = "applicationInsights"  #: Azure Application Insights as log destination.
+    fixed = "fixed"  #: Fixed-rate sampling.
+
+
+class AlwaysLog(str, Enum):
+
+    all_errors = "allErrors"  #: Always log all erroneous request regardless of sampling settings.
 
 
 class ProductState(str, Enum):
@@ -168,6 +172,12 @@ class IdentityProviderType(str, Enum):
     aad_b2_c = "aadB2C"  #: Azure Active Directory B2C as Identity provider.
 
 
+class LoggerType(str, Enum):
+
+    azure_event_hub = "azureEventHub"  #: Azure Event Hub as log destination.
+    application_insights = "applicationInsights"  #: Azure Application Insights as log destination.
+
+
 class ConnectivityStatusType(str, Enum):
 
     initializing = "initializing"
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py
index d7c3b940a615..cc53a9605959 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .apim_resource import ApimResource
+from .apim_resource_py3 import ApimResource
 
 
 class ApiManagementServiceResource(ApimResource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py
index 611acfe79b52..60f3f6b21a24 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_management_service_update_parameters_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .apim_resource import ApimResource
+from .apim_resource_py3 import ApimResource
 
 
 class ApiManagementServiceUpdateParameters(ApimResource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_release_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_release_contract_py3.py
index 505fddf8ca67..445e2e9ea5c7 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_release_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_release_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class ApiReleaseContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_tag_resource_contract_properties_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_tag_resource_contract_properties_py3.py
index 89fc914e2ed9..3673089c3be8 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_tag_resource_contract_properties_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_tag_resource_contract_properties_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .api_entity_base_contract import ApiEntityBaseContract
+from .api_entity_base_contract_py3 import ApiEntityBaseContract
 
 
 class ApiTagResourceContractProperties(ApiEntityBaseContract):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_version_set_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_version_set_contract_py3.py
index 53e5e813b7d3..151e5bec6bf8 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_version_set_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/api_version_set_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class ApiVersionSetContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_contract_py3.py
index 12f0102bb0fb..a8ccc68ee9ca 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class AuthorizationServerContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_update_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_update_contract_py3.py
index 48cf98d0c3a5..d6b6e2357000 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_update_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/authorization_server_update_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class AuthorizationServerUpdateContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_contract_py3.py
index 034927260453..bb2138c77a9e 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class BackendContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_reconnect_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_reconnect_contract_py3.py
index f871cad6948d..315aae1f4287 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_reconnect_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/backend_reconnect_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class BackendReconnectContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/body_diagnostic_settings.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/body_diagnostic_settings.py
new file mode 100644
index 000000000000..b0f9021fbada
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/body_diagnostic_settings.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class BodyDiagnosticSettings(Model):
+    """Body logging settings.
+
+    :param bytes: Number of request body bytes to log.
+    :type bytes: int
+    """
+
+    _validation = {
+        'bytes': {'maximum': 8192},
+    }
+
+    _attribute_map = {
+        'bytes': {'key': 'bytes', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BodyDiagnosticSettings, self).__init__(**kwargs)
+        self.bytes = kwargs.get('bytes', None)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/body_diagnostic_settings_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/body_diagnostic_settings_py3.py
new file mode 100644
index 000000000000..4192e4a3dc58
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/body_diagnostic_settings_py3.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class BodyDiagnosticSettings(Model):
+    """Body logging settings.
+
+    :param bytes: Number of request body bytes to log.
+    :type bytes: int
+    """
+
+    _validation = {
+        'bytes': {'maximum': 8192},
+    }
+
+    _attribute_map = {
+        'bytes': {'key': 'bytes', 'type': 'int'},
+    }
+
+    def __init__(self, *, bytes: int=None, **kwargs) -> None:
+        super(BodyDiagnosticSettings, self).__init__(**kwargs)
+        self.bytes = bytes
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/certificate_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/certificate_contract_py3.py
index 86efedbe9e68..464100179414 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/certificate_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/certificate_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class CertificateContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract.py
index 323523836bbc..dd8d2db36a1c 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract.py
@@ -26,25 +26,44 @@ class DiagnosticContract(Resource):
     :vartype name: str
     :ivar type: Resource type for API Management resource.
     :vartype type: str
-    :param enabled: Required. Indicates whether a diagnostic should receive
-     data or not.
-    :type enabled: bool
+    :param always_log: Specifies for what type of messages sampling settings
+     should not apply. Possible values include: 'allErrors'
+    :type always_log: str or ~azure.mgmt.apimanagement.models.AlwaysLog
+    :param logger_id: Required. Resource Id of a target logger.
+    :type logger_id: str
+    :param sampling: Sampling settings for Diagnostic.
+    :type sampling: ~azure.mgmt.apimanagement.models.SamplingSettings
+    :param frontend: Diagnostic settings for incoming/outcoming HTTP messages
+     to the Gateway.
+    :type frontend:
+     ~azure.mgmt.apimanagement.models.PipelineDiagnosticSettings
+    :param backend: Diagnostic settings for incoming/outcoming HTTP messages
+     to the Backend
+    :type backend: ~azure.mgmt.apimanagement.models.PipelineDiagnosticSettings
     """
 
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'enabled': {'required': True},
+        'logger_id': {'required': True},
     }
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
-        'enabled': {'key': 'properties.enabled', 'type': 'bool'},
+        'always_log': {'key': 'properties.alwaysLog', 'type': 'str'},
+        'logger_id': {'key': 'properties.loggerId', 'type': 'str'},
+        'sampling': {'key': 'properties.sampling', 'type': 'SamplingSettings'},
+        'frontend': {'key': 'properties.frontend', 'type': 'PipelineDiagnosticSettings'},
+        'backend': {'key': 'properties.backend', 'type': 'PipelineDiagnosticSettings'},
     }
 
     def __init__(self, **kwargs):
         super(DiagnosticContract, self).__init__(**kwargs)
-        self.enabled = kwargs.get('enabled', None)
+        self.always_log = kwargs.get('always_log', None)
+        self.logger_id = kwargs.get('logger_id', None)
+        self.sampling = kwargs.get('sampling', None)
+        self.frontend = kwargs.get('frontend', None)
+        self.backend = kwargs.get('backend', None)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract_py3.py
index d99b08f47534..a6dbcbfe3318 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/diagnostic_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class DiagnosticContract(Resource):
@@ -26,25 +26,44 @@ class DiagnosticContract(Resource):
     :vartype name: str
     :ivar type: Resource type for API Management resource.
     :vartype type: str
-    :param enabled: Required. Indicates whether a diagnostic should receive
-     data or not.
-    :type enabled: bool
+    :param always_log: Specifies for what type of messages sampling settings
+     should not apply. Possible values include: 'allErrors'
+    :type always_log: str or ~azure.mgmt.apimanagement.models.AlwaysLog
+    :param logger_id: Required. Resource Id of a target logger.
+    :type logger_id: str
+    :param sampling: Sampling settings for Diagnostic.
+    :type sampling: ~azure.mgmt.apimanagement.models.SamplingSettings
+    :param frontend: Diagnostic settings for incoming/outcoming HTTP messages
+     to the Gateway.
+    :type frontend:
+     ~azure.mgmt.apimanagement.models.PipelineDiagnosticSettings
+    :param backend: Diagnostic settings for incoming/outcoming HTTP messages
+     to the Backend
+    :type backend: ~azure.mgmt.apimanagement.models.PipelineDiagnosticSettings
     """
 
     _validation = {
         'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
-        'enabled': {'required': True},
+        'logger_id': {'required': True},
     }
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
         'name': {'key': 'name', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
-        'enabled': {'key': 'properties.enabled', 'type': 'bool'},
+        'always_log': {'key': 'properties.alwaysLog', 'type': 'str'},
+        'logger_id': {'key': 'properties.loggerId', 'type': 'str'},
+        'sampling': {'key': 'properties.sampling', 'type': 'SamplingSettings'},
+        'frontend': {'key': 'properties.frontend', 'type': 'PipelineDiagnosticSettings'},
+        'backend': {'key': 'properties.backend', 'type': 'PipelineDiagnosticSettings'},
     }
 
-    def __init__(self, *, enabled: bool, **kwargs) -> None:
+    def __init__(self, *, logger_id: str, always_log=None, sampling=None, frontend=None, backend=None, **kwargs) -> None:
         super(DiagnosticContract, self).__init__(**kwargs)
-        self.enabled = enabled
+        self.always_log = always_log
+        self.logger_id = logger_id
+        self.sampling = sampling
+        self.frontend = frontend
+        self.backend = backend
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/email_template_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/email_template_contract_py3.py
index 19a2117a761c..3d3fcd217589 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/email_template_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/email_template_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class EmailTemplateContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response.py
index 039c9aa4cb28..cd6591f007db 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response.py
@@ -14,7 +14,7 @@
 
 
 class ErrorResponse(Model):
-    """Error Body contract.
+    """Error Response.
 
     :param code: Service-defined error code. This code serves as a sub-status
      for the HTTP error code specified in the response.
@@ -27,9 +27,9 @@ class ErrorResponse(Model):
     """
 
     _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-        'details': {'key': 'details', 'type': '[ErrorFieldContract]'},
+        'code': {'key': 'error.code', 'type': 'str'},
+        'message': {'key': 'error.message', 'type': 'str'},
+        'details': {'key': 'error.details', 'type': '[ErrorFieldContract]'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_body.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_body.py
new file mode 100644
index 000000000000..80fd246c2f30
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_body.py
@@ -0,0 +1,38 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ErrorResponseBody(Model):
+    """Error Body contract.
+
+    :param code: Service-defined error code. This code serves as a sub-status
+     for the HTTP error code specified in the response.
+    :type code: str
+    :param message: Human-readable representation of the error.
+    :type message: str
+    :param details: The list of invalid fields send in request, in case of
+     validation error.
+    :type details: list[~azure.mgmt.apimanagement.models.ErrorFieldContract]
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+        'details': {'key': 'details', 'type': '[ErrorFieldContract]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ErrorResponseBody, self).__init__(**kwargs)
+        self.code = kwargs.get('code', None)
+        self.message = kwargs.get('message', None)
+        self.details = kwargs.get('details', None)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_body_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_body_py3.py
new file mode 100644
index 000000000000..1c8dedf4ed1b
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_body_py3.py
@@ -0,0 +1,38 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class ErrorResponseBody(Model):
+    """Error Body contract.
+
+    :param code: Service-defined error code. This code serves as a sub-status
+     for the HTTP error code specified in the response.
+    :type code: str
+    :param message: Human-readable representation of the error.
+    :type message: str
+    :param details: The list of invalid fields send in request, in case of
+     validation error.
+    :type details: list[~azure.mgmt.apimanagement.models.ErrorFieldContract]
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+        'details': {'key': 'details', 'type': '[ErrorFieldContract]'},
+    }
+
+    def __init__(self, *, code: str=None, message: str=None, details=None, **kwargs) -> None:
+        super(ErrorResponseBody, self).__init__(**kwargs)
+        self.code = code
+        self.message = message
+        self.details = details
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_py3.py
index 1fa961c53dcf..682261f414ec 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/error_response_py3.py
@@ -14,7 +14,7 @@
 
 
 class ErrorResponse(Model):
-    """Error Body contract.
+    """Error Response.
 
     :param code: Service-defined error code. This code serves as a sub-status
      for the HTTP error code specified in the response.
@@ -27,9 +27,9 @@ class ErrorResponse(Model):
     """
 
     _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-        'details': {'key': 'details', 'type': '[ErrorFieldContract]'},
+        'code': {'key': 'error.code', 'type': 'str'},
+        'message': {'key': 'error.message', 'type': 'str'},
+        'details': {'key': 'error.details', 'type': '[ErrorFieldContract]'},
     }
 
     def __init__(self, *, code: str=None, message: str=None, details=None, **kwargs) -> None:
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/group_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/group_contract_py3.py
index ff03e70f625f..89d02fafe9fa 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/group_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/group_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class GroupContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/http_message_diagnostic.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/http_message_diagnostic.py
new file mode 100644
index 000000000000..2c2651f31bb8
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/http_message_diagnostic.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class HttpMessageDiagnostic(Model):
+    """Http message diagnostic settings.
+
+    :param headers: Array of HTTP Headers to log.
+    :type headers: list[str]
+    :param body: Body logging settings.
+    :type body: ~azure.mgmt.apimanagement.models.BodyDiagnosticSettings
+    """
+
+    _attribute_map = {
+        'headers': {'key': 'headers', 'type': '[str]'},
+        'body': {'key': 'body', 'type': 'BodyDiagnosticSettings'},
+    }
+
+    def __init__(self, **kwargs):
+        super(HttpMessageDiagnostic, self).__init__(**kwargs)
+        self.headers = kwargs.get('headers', None)
+        self.body = kwargs.get('body', None)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/http_message_diagnostic_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/http_message_diagnostic_py3.py
new file mode 100644
index 000000000000..28171eee4cd7
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/http_message_diagnostic_py3.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class HttpMessageDiagnostic(Model):
+    """Http message diagnostic settings.
+
+    :param headers: Array of HTTP Headers to log.
+    :type headers: list[str]
+    :param body: Body logging settings.
+    :type body: ~azure.mgmt.apimanagement.models.BodyDiagnosticSettings
+    """
+
+    _attribute_map = {
+        'headers': {'key': 'headers', 'type': '[str]'},
+        'body': {'key': 'body', 'type': 'BodyDiagnosticSettings'},
+    }
+
+    def __init__(self, *, headers=None, body=None, **kwargs) -> None:
+        super(HttpMessageDiagnostic, self).__init__(**kwargs)
+        self.headers = headers
+        self.body = body
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/identity_provider_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/identity_provider_contract_py3.py
index 0e98fd010e43..d96b8e34df59 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/identity_provider_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/identity_provider_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class IdentityProviderContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_attachment_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_attachment_contract_py3.py
index 0e45bbcc4296..6eda14e9e009 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_attachment_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_attachment_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class IssueAttachmentContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_comment_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_comment_contract_py3.py
index 9c73ecc0950b..06b355047a92 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_comment_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_comment_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class IssueCommentContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_contract_py3.py
index a3dee3306e3f..fb9605cf3507 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/issue_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class IssueContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract.py
index d73d8fba23ec..16213cac73bb 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract.py
@@ -38,6 +38,9 @@ class LoggerContract(Resource):
     :param is_buffered: Whether records are buffered in the logger before
      publishing. Default is assumed to be true.
     :type is_buffered: bool
+    :param resource_id: Azure Resource Id of a log target (either Azure Event
+     Hub resource or Azure Application Insights resource).
+    :type resource_id: str
     """
 
     _validation = {
@@ -57,6 +60,7 @@ class LoggerContract(Resource):
         'description': {'key': 'properties.description', 'type': 'str'},
         'credentials': {'key': 'properties.credentials', 'type': '{str}'},
         'is_buffered': {'key': 'properties.isBuffered', 'type': 'bool'},
+        'resource_id': {'key': 'properties.resourceId', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
@@ -65,3 +69,4 @@ def __init__(self, **kwargs):
         self.description = kwargs.get('description', None)
         self.credentials = kwargs.get('credentials', None)
         self.is_buffered = kwargs.get('is_buffered', None)
+        self.resource_id = kwargs.get('resource_id', None)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract_py3.py
index 7a00a541d06e..59ceb33e5ea3 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/logger_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class LoggerContract(Resource):
@@ -38,6 +38,9 @@ class LoggerContract(Resource):
     :param is_buffered: Whether records are buffered in the logger before
      publishing. Default is assumed to be true.
     :type is_buffered: bool
+    :param resource_id: Azure Resource Id of a log target (either Azure Event
+     Hub resource or Azure Application Insights resource).
+    :type resource_id: str
     """
 
     _validation = {
@@ -57,11 +60,13 @@ class LoggerContract(Resource):
         'description': {'key': 'properties.description', 'type': 'str'},
         'credentials': {'key': 'properties.credentials', 'type': '{str}'},
         'is_buffered': {'key': 'properties.isBuffered', 'type': 'bool'},
+        'resource_id': {'key': 'properties.resourceId', 'type': 'str'},
     }
 
-    def __init__(self, *, logger_type, credentials, description: str=None, is_buffered: bool=None, **kwargs) -> None:
+    def __init__(self, *, logger_type, credentials, description: str=None, is_buffered: bool=None, resource_id: str=None, **kwargs) -> None:
         super(LoggerContract, self).__init__(**kwargs)
         self.logger_type = logger_type
         self.description = description
         self.credentials = credentials
         self.is_buffered = is_buffered
+        self.resource_id = resource_id
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/notification_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/notification_contract_py3.py
index 7c65700cd81a..bcc72b618ddf 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/notification_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/notification_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class NotificationContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/openid_connect_provider_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/openid_connect_provider_contract_py3.py
index b6ce0c8e9304..cbbc85bde124 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/openid_connect_provider_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/openid_connect_provider_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class OpenidConnectProviderContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_contract_py3.py
index 3bf40436598c..197b2f410f8d 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class OperationContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_result_contract.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_result_contract.py
index 14e39327b281..736344faab29 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_result_contract.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_result_contract.py
@@ -34,7 +34,7 @@ class OperationResultContract(Model):
     :param result_info: Optional result info.
     :type result_info: str
     :param error: Error Body Contract
-    :type error: ~azure.mgmt.apimanagement.models.ErrorResponse
+    :type error: ~azure.mgmt.apimanagement.models.ErrorResponseBody
     :ivar action_log: This property if only provided as part of the
      TenantConfiguration_Validate operation. It contains the log the entities
      which will be updated/created/deleted as part of the
@@ -53,7 +53,7 @@ class OperationResultContract(Model):
         'started': {'key': 'started', 'type': 'iso-8601'},
         'updated': {'key': 'updated', 'type': 'iso-8601'},
         'result_info': {'key': 'resultInfo', 'type': 'str'},
-        'error': {'key': 'error', 'type': 'ErrorResponse'},
+        'error': {'key': 'error', 'type': 'ErrorResponseBody'},
         'action_log': {'key': 'actionLog', 'type': '[OperationResultLogItemContract]'},
     }
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_result_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_result_contract_py3.py
index ec429753d4db..0694c535ae2b 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_result_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/operation_result_contract_py3.py
@@ -34,7 +34,7 @@ class OperationResultContract(Model):
     :param result_info: Optional result info.
     :type result_info: str
     :param error: Error Body Contract
-    :type error: ~azure.mgmt.apimanagement.models.ErrorResponse
+    :type error: ~azure.mgmt.apimanagement.models.ErrorResponseBody
     :ivar action_log: This property if only provided as part of the
      TenantConfiguration_Validate operation. It contains the log the entities
      which will be updated/created/deleted as part of the
@@ -53,7 +53,7 @@ class OperationResultContract(Model):
         'started': {'key': 'started', 'type': 'iso-8601'},
         'updated': {'key': 'updated', 'type': 'iso-8601'},
         'result_info': {'key': 'resultInfo', 'type': 'str'},
-        'error': {'key': 'error', 'type': 'ErrorResponse'},
+        'error': {'key': 'error', 'type': 'ErrorResponseBody'},
         'action_log': {'key': 'actionLog', 'type': '[OperationResultLogItemContract]'},
     }
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/pipeline_diagnostic_settings.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/pipeline_diagnostic_settings.py
new file mode 100644
index 000000000000..8f7fc4ad6f59
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/pipeline_diagnostic_settings.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class PipelineDiagnosticSettings(Model):
+    """Diagnostic settings for incoming/outcoming HTTP messages to the Gateway.
+
+    :param request: Diagnostic settings for request.
+    :type request: ~azure.mgmt.apimanagement.models.HttpMessageDiagnostic
+    :param response: Diagnostic settings for response.
+    :type response: ~azure.mgmt.apimanagement.models.HttpMessageDiagnostic
+    """
+
+    _attribute_map = {
+        'request': {'key': 'request', 'type': 'HttpMessageDiagnostic'},
+        'response': {'key': 'response', 'type': 'HttpMessageDiagnostic'},
+    }
+
+    def __init__(self, **kwargs):
+        super(PipelineDiagnosticSettings, self).__init__(**kwargs)
+        self.request = kwargs.get('request', None)
+        self.response = kwargs.get('response', None)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/pipeline_diagnostic_settings_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/pipeline_diagnostic_settings_py3.py
new file mode 100644
index 000000000000..df30f03b166d
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/pipeline_diagnostic_settings_py3.py
@@ -0,0 +1,32 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class PipelineDiagnosticSettings(Model):
+    """Diagnostic settings for incoming/outcoming HTTP messages to the Gateway.
+
+    :param request: Diagnostic settings for request.
+    :type request: ~azure.mgmt.apimanagement.models.HttpMessageDiagnostic
+    :param response: Diagnostic settings for response.
+    :type response: ~azure.mgmt.apimanagement.models.HttpMessageDiagnostic
+    """
+
+    _attribute_map = {
+        'request': {'key': 'request', 'type': 'HttpMessageDiagnostic'},
+        'response': {'key': 'response', 'type': 'HttpMessageDiagnostic'},
+    }
+
+    def __init__(self, *, request=None, response=None, **kwargs) -> None:
+        super(PipelineDiagnosticSettings, self).__init__(**kwargs)
+        self.request = request
+        self.response = response
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/policy_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/policy_contract_py3.py
index 1c1842d9d2a3..51b99639b6d4 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/policy_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/policy_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PolicyContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_delegation_settings_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_delegation_settings_py3.py
index 37ac024765ce..3aa96ae6ff5a 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_delegation_settings_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_delegation_settings_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PortalDelegationSettings(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signin_settings_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signin_settings_py3.py
index 7e507a23ad32..5f7a08a5a7f9 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signin_settings_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signin_settings_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PortalSigninSettings(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signup_settings_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signup_settings_py3.py
index 14ed9919c000..46eb461e53ff 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signup_settings_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/portal_signup_settings_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PortalSignupSettings(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract.py
index 82bde48700b9..c25ec9bde595 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract.py
@@ -48,7 +48,7 @@ class ProductContract(Resource):
      subscriptionRequired property is present and has a value of false.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
-     have to this product at the same time. Set to null or omit to allow
+     have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
      subscriptionRequired property is present and has a value of false.
     :type subscriptions_limit: int
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract_py3.py
index 1eb6a68eb3c1..2183cdb4de8a 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class ProductContract(Resource):
@@ -48,7 +48,7 @@ class ProductContract(Resource):
      subscriptionRequired property is present and has a value of false.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
-     have to this product at the same time. Set to null or omit to allow
+     have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
      subscriptionRequired property is present and has a value of false.
     :type subscriptions_limit: int
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_entity_base_parameters.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_entity_base_parameters.py
index 25ab8d74a8c1..4e1f97bc6694 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_entity_base_parameters.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_entity_base_parameters.py
@@ -37,7 +37,7 @@ class ProductEntityBaseParameters(Model):
      subscriptionRequired property is present and has a value of false.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
-     have to this product at the same time. Set to null or omit to allow
+     have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
      subscriptionRequired property is present and has a value of false.
     :type subscriptions_limit: int
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_entity_base_parameters_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_entity_base_parameters_py3.py
index df6476ffa2cd..5574461683ea 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_entity_base_parameters_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_entity_base_parameters_py3.py
@@ -37,7 +37,7 @@ class ProductEntityBaseParameters(Model):
      subscriptionRequired property is present and has a value of false.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
-     have to this product at the same time. Set to null or omit to allow
+     have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
      subscriptionRequired property is present and has a value of false.
     :type subscriptions_limit: int
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties.py
index ee62ee30fd43..0b32a2c9df40 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties.py
@@ -39,7 +39,7 @@ class ProductTagResourceContractProperties(ProductEntityBaseParameters):
      subscriptionRequired property is present and has a value of false.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
-     have to this product at the same time. Set to null or omit to allow
+     have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
      subscriptionRequired property is present and has a value of false.
     :type subscriptions_limit: int
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties_py3.py
index 16fbd3bf17d4..ecb7fef20809 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_tag_resource_contract_properties_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .product_entity_base_parameters import ProductEntityBaseParameters
+from .product_entity_base_parameters_py3 import ProductEntityBaseParameters
 
 
 class ProductTagResourceContractProperties(ProductEntityBaseParameters):
@@ -39,7 +39,7 @@ class ProductTagResourceContractProperties(ProductEntityBaseParameters):
      subscriptionRequired property is present and has a value of false.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
-     have to this product at the same time. Set to null or omit to allow
+     have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
      subscriptionRequired property is present and has a value of false.
     :type subscriptions_limit: int
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_update_parameters.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_update_parameters.py
index 3d71fde94ca9..ce8e0d73d728 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_update_parameters.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_update_parameters.py
@@ -37,7 +37,7 @@ class ProductUpdateParameters(Model):
      subscriptionRequired property is present and has a value of false.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
-     have to this product at the same time. Set to null or omit to allow
+     have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
      subscriptionRequired property is present and has a value of false.
     :type subscriptions_limit: int
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_update_parameters_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_update_parameters_py3.py
index 76d097f2f94c..9154962e697d 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_update_parameters_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/product_update_parameters_py3.py
@@ -37,7 +37,7 @@ class ProductUpdateParameters(Model):
      subscriptionRequired property is present and has a value of false.
     :type approval_required: bool
     :param subscriptions_limit: Whether the number of subscriptions a user can
-     have to this product at the same time. Set to null or omit to allow
+     have to this product at the same time. Set to null or omit to allow
      unlimited per user subscriptions. Can be present only if
      subscriptionRequired property is present and has a value of false.
     :type subscriptions_limit: int
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/property_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/property_contract_py3.py
index 516b40892228..36a779b263c2 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/property_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/property_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class PropertyContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_email_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_email_contract_py3.py
index 0cb59412102c..175381652c07 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_email_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_email_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class RecipientEmailContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_user_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_user_contract_py3.py
index b9202491358f..a3112c65a24d 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_user_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/recipient_user_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class RecipientUserContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/sampling_settings.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/sampling_settings.py
new file mode 100644
index 000000000000..c773f5b593b1
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/sampling_settings.py
@@ -0,0 +1,36 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class SamplingSettings(Model):
+    """Sampling settings for Diagnostic.
+
+    :param sampling_type: Sampling type. Possible values include: 'fixed'
+    :type sampling_type: str or ~azure.mgmt.apimanagement.models.SamplingType
+    :param percentage: Rate of sampling for fixed-rate sampling.
+    :type percentage: float
+    """
+
+    _validation = {
+        'percentage': {'maximum': 100, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'sampling_type': {'key': 'samplingType', 'type': 'str'},
+        'percentage': {'key': 'percentage', 'type': 'float'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SamplingSettings, self).__init__(**kwargs)
+        self.sampling_type = kwargs.get('sampling_type', None)
+        self.percentage = kwargs.get('percentage', None)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/sampling_settings_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/sampling_settings_py3.py
new file mode 100644
index 000000000000..544dbda52a7f
--- /dev/null
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/sampling_settings_py3.py
@@ -0,0 +1,36 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class SamplingSettings(Model):
+    """Sampling settings for Diagnostic.
+
+    :param sampling_type: Sampling type. Possible values include: 'fixed'
+    :type sampling_type: str or ~azure.mgmt.apimanagement.models.SamplingType
+    :param percentage: Rate of sampling for fixed-rate sampling.
+    :type percentage: float
+    """
+
+    _validation = {
+        'percentage': {'maximum': 100, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'sampling_type': {'key': 'samplingType', 'type': 'str'},
+        'percentage': {'key': 'percentage', 'type': 'float'},
+    }
+
+    def __init__(self, *, sampling_type=None, percentage: float=None, **kwargs) -> None:
+        super(SamplingSettings, self).__init__(**kwargs)
+        self.sampling_type = sampling_type
+        self.percentage = percentage
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/schema_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/schema_contract_py3.py
index 509f4fc9b37e..552e09ef7db0 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/schema_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/schema_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class SchemaContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/subscription_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/subscription_contract_py3.py
index 334da97ad5d0..11147bb64947 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/subscription_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/subscription_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class SubscriptionContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_contract_py3.py
index fb91c3eb73ce..175c0410c173 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class TagContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_description_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_description_contract_py3.py
index 12d7707c2adb..4ae8bda6437a 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_description_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/tag_description_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class TagDescriptionContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_contract_py3.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_contract_py3.py
index 72ac42c66f20..b1069e94e4c7 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_contract_py3.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/models/user_contract_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class UserContract(Resource):
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/__init__.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/__init__.py
index 68983b74f26e..41c9a8d60767 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/__init__.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/__init__.py
@@ -21,7 +21,6 @@
 from .api_policy_operations import ApiPolicyOperations
 from .api_schema_operations import ApiSchemaOperations
 from .api_diagnostic_operations import ApiDiagnosticOperations
-from .api_diagnostic_logger_operations import ApiDiagnosticLoggerOperations
 from .api_issue_operations import ApiIssueOperations
 from .api_issue_comment_operations import ApiIssueCommentOperations
 from .api_issue_attachment_operations import ApiIssueAttachmentOperations
@@ -31,7 +30,6 @@
 from .api_management_operations import ApiManagementOperations
 from .api_management_service_operations import ApiManagementServiceOperations
 from .diagnostic_operations import DiagnosticOperations
-from .diagnostic_logger_operations import DiagnosticLoggerOperations
 from .email_template_operations import EmailTemplateOperations
 from .group_operations import GroupOperations
 from .group_user_operations import GroupUserOperations
@@ -82,7 +80,6 @@
     'ApiPolicyOperations',
     'ApiSchemaOperations',
     'ApiDiagnosticOperations',
-    'ApiDiagnosticLoggerOperations',
     'ApiIssueOperations',
     'ApiIssueCommentOperations',
     'ApiIssueAttachmentOperations',
@@ -92,7 +89,6 @@
     'ApiManagementOperations',
     'ApiManagementServiceOperations',
     'DiagnosticOperations',
-    'DiagnosticLoggerOperations',
     'EmailTemplateOperations',
     'GroupOperations',
     'GroupUserOperations',
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_diagnostic_logger_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_diagnostic_logger_operations.py
deleted file mode 100644
index 79125ba73383..000000000000
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_diagnostic_logger_operations.py
+++ /dev/null
@@ -1,341 +0,0 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-#
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is
-# regenerated.
-# --------------------------------------------------------------------------
-
-import uuid
-from msrest.pipeline import ClientRawResponse
-
-from .. import models
-
-
-class ApiDiagnosticLoggerOperations(object):
-    """ApiDiagnosticLoggerOperations operations.
-
-    :param client: Client for service requests.
-    :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. Constant value: "2018-01-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-01-01"
-
-        self.config = config
-
-    def list_by_service(
-            self, resource_group_name, service_name, api_id, diagnostic_id, filter=None, top=None, skip=None, custom_headers=None, raw=False, **operation_config):
-        """Lists all loggers assosiated with the specified Diagnostic of an API.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param service_name: The name of the API Management service.
-        :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
-        :type api_id: str
-        :param diagnostic_id: Diagnostic identifier. Must be unique in the
-         current API Management service instance.
-        :type diagnostic_id: str
-        :param filter: | Field       | Supported operators    | Supported
-         functions               |
-         |-------------|------------------------|-----------------------------------|
-         | id          | ge, le, eq, ne, gt, lt | substringof, startswith,
-         endswith |
-         | type        | eq                     |
-         |
-        :type filter: str
-        :param top: Number of records to return.
-        :type top: int
-        :param skip: Number of records to skip.
-        :type skip: int
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: An iterator like instance of LoggerContract
-        :rtype:
-         ~azure.mgmt.apimanagement.models.LoggerContractPaged[~azure.mgmt.apimanagement.models.LoggerContract]
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
-        """
-        def internal_paging(next_link=None, raw=False):
-
-            if not next_link:
-                # Construct URL
-                url = self.list_by_service.metadata['url']
-                path_format_arguments = {
-                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-                    'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-                    'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-                    'diagnosticId': self._serialize.url("diagnostic_id", diagnostic_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)')
-                }
-                url = self._client.format_url(url, **path_format_arguments)
-
-                # Construct parameters
-                query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-                if filter is not None:
-                    query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
-                if top is not None:
-                    query_parameters['$top'] = self._serialize.query("top", top, 'int', minimum=1)
-                if skip is not None:
-                    query_parameters['$skip'] = self._serialize.query("skip", skip, 'int', minimum=0)
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
-            if self.config.generate_client_request_id:
-                header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
-            if custom_headers:
-                header_parameters.update(custom_headers)
-            if self.config.accept_language is not None:
-                header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
-            # Construct and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
-
-            if response.status_code not in [200]:
-                raise models.ErrorResponseException(self._deserialize, response)
-
-            return response
-
-        # Deserialize response
-        deserialized = models.LoggerContractPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.LoggerContractPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_service.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}/loggers'}
-
-    def check_entity_exists(
-            self, resource_group_name, service_name, api_id, diagnostic_id, loggerid, custom_headers=None, raw=False, **operation_config):
-        """Checks that logger entity specified by identifier is associated with
-        the diagnostics entity.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param service_name: The name of the API Management service.
-        :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
-        :type api_id: str
-        :param diagnostic_id: Diagnostic identifier. Must be unique in the
-         current API Management service instance.
-        :type diagnostic_id: str
-        :param loggerid: Logger identifier. Must be unique in the API
-         Management service instance.
-        :type loggerid: str
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: bool or ClientRawResponse if raw=true
-        :rtype: bool or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
-        """
-        # Construct URL
-        url = self.check_entity_exists.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'diagnosticId': self._serialize.url("diagnostic_id", diagnostic_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'loggerid': self._serialize.url("loggerid", loggerid, 'str', max_length=80, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
-        }
-        url = self._client.format_url(url, **path_format_arguments)
-
-        # Construct parameters
-        query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
-        if self.config.generate_client_request_id:
-            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
-        if custom_headers:
-            header_parameters.update(custom_headers)
-        if self.config.accept_language is not None:
-            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
-        # Construct and send request
-        request = self._client.head(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
-
-        if response.status_code not in [204, 404]:
-            raise models.ErrorResponseException(self._deserialize, response)
-
-        deserialized = (response.status_code == 204)
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-        return deserialized
-    check_entity_exists.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}/loggers/{loggerid}'}
-
-    def create_or_update(
-            self, resource_group_name, service_name, api_id, diagnostic_id, loggerid, custom_headers=None, raw=False, **operation_config):
-        """Attaches a logger to a dignostic for an API.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param service_name: The name of the API Management service.
-        :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
-        :type api_id: str
-        :param diagnostic_id: Diagnostic identifier. Must be unique in the
-         current API Management service instance.
-        :type diagnostic_id: str
-        :param loggerid: Logger identifier. Must be unique in the API
-         Management service instance.
-        :type loggerid: str
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: LoggerContract or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.apimanagement.models.LoggerContract or
-         ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
-        """
-        # Construct URL
-        url = self.create_or_update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'diagnosticId': self._serialize.url("diagnostic_id", diagnostic_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'loggerid': self._serialize.url("loggerid", loggerid, 'str', max_length=80, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
-        }
-        url = self._client.format_url(url, **path_format_arguments)
-
-        # Construct parameters
-        query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
-        if self.config.generate_client_request_id:
-            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
-        if custom_headers:
-            header_parameters.update(custom_headers)
-        if self.config.accept_language is not None:
-            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
-        # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
-
-        if response.status_code not in [200, 201]:
-            raise models.ErrorResponseException(self._deserialize, response)
-
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('LoggerContract', response)
-        if response.status_code == 201:
-            deserialized = self._deserialize('LoggerContract', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}/loggers/{loggerid}'}
-
-    def delete(
-            self, resource_group_name, service_name, api_id, diagnostic_id, loggerid, custom_headers=None, raw=False, **operation_config):
-        """Deletes the specified Logger from Diagnostic for an API.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param service_name: The name of the API Management service.
-        :type service_name: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
-        :type api_id: str
-        :param diagnostic_id: Diagnostic identifier. Must be unique in the
-         current API Management service instance.
-        :type diagnostic_id: str
-        :param loggerid: Logger identifier. Must be unique in the API
-         Management service instance.
-        :type loggerid: str
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: None or ClientRawResponse if raw=true
-        :rtype: None or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
-        """
-        # Construct URL
-        url = self.delete.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'diagnosticId': self._serialize.url("diagnostic_id", diagnostic_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'loggerid': self._serialize.url("loggerid", loggerid, 'str', max_length=80, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
-        }
-        url = self._client.format_url(url, **path_format_arguments)
-
-        # Construct parameters
-        query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
-        if self.config.generate_client_request_id:
-            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
-        if custom_headers:
-            header_parameters.update(custom_headers)
-        if self.config.accept_language is not None:
-            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
-        # Construct and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
-
-        if response.status_code not in [200, 204]:
-            raise models.ErrorResponseException(self._deserialize, response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(None, response)
-            return client_raw_response
-    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}/loggers/{loggerid}'}
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_diagnostic_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_diagnostic_operations.py
index bd5a10c2842b..2357cec9319f 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_diagnostic_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_diagnostic_operations.py
@@ -22,7 +22,7 @@ class ApiDiagnosticOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
@@ -267,7 +267,7 @@ def get(
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}'}
 
     def create_or_update(
-            self, resource_group_name, service_name, api_id, diagnostic_id, enabled, if_match=None, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, service_name, api_id, diagnostic_id, parameters, if_match=None, custom_headers=None, raw=False, **operation_config):
         """Creates a new Diagnostic for an API or updates an existing one.
 
         :param resource_group_name: The name of the resource group.
@@ -280,9 +280,8 @@ def create_or_update(
         :param diagnostic_id: Diagnostic identifier. Must be unique in the
          current API Management service instance.
         :type diagnostic_id: str
-        :param enabled: Indicates whether a diagnostic should receive data or
-         not.
-        :type enabled: bool
+        :param parameters: Create parameters.
+        :type parameters: ~azure.mgmt.apimanagement.models.DiagnosticContract
         :param if_match: ETag of the Entity. Not required when creating an
          entity, but required when updating an entity.
         :type if_match: str
@@ -297,8 +296,6 @@ def create_or_update(
         :raises:
          :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
         """
-        parameters = models.DiagnosticContract(enabled=enabled)
-
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
@@ -352,7 +349,7 @@ def create_or_update(
     create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}/diagnostics/{diagnosticId}'}
 
     def update(
-            self, resource_group_name, service_name, api_id, diagnostic_id, if_match, enabled, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, service_name, api_id, diagnostic_id, parameters, if_match, custom_headers=None, raw=False, **operation_config):
         """Updates the details of the Diagnostic for an API specified by its
         identifier.
 
@@ -366,13 +363,12 @@ def update(
         :param diagnostic_id: Diagnostic identifier. Must be unique in the
          current API Management service instance.
         :type diagnostic_id: str
+        :param parameters: Diagnostic Update parameters.
+        :type parameters: ~azure.mgmt.apimanagement.models.DiagnosticContract
         :param if_match: ETag of the Entity. ETag should match the current
          entity state from the header response of the GET request or it should
          be * for unconditional update.
         :type if_match: str
-        :param enabled: Indicates whether a diagnostic should receive data or
-         not.
-        :type enabled: bool
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -383,8 +379,6 @@ def update(
         :raises:
          :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
         """
-        parameters = models.DiagnosticContract(enabled=enabled)
-
         # Construct URL
         url = self.update.metadata['url']
         path_format_arguments = {
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_export_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_export_operations.py
index d6041f4f8b45..4c1e5c758d0b 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_export_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_export_operations.py
@@ -23,7 +23,7 @@ class ApiExportOperations(object):
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
     :ivar export: Query parameter required to export the API details. Constant value: "true".
-    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._serialize = serializer
         self._deserialize = deserializer
         self.export = "true"
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_attachment_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_attachment_operations.py
index df95c6de2d29..f51cc5d297ab 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_attachment_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_attachment_operations.py
@@ -22,7 +22,7 @@ class ApiIssueAttachmentOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_comment_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_comment_operations.py
index 317905662afc..f81afdcffcf6 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_comment_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_comment_operations.py
@@ -22,7 +22,7 @@ class ApiIssueCommentOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_operations.py
index 30fc13dc028a..01f01a86be5e 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_issue_operations.py
@@ -22,7 +22,7 @@ class ApiIssueOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_operations.py
index 9d40ef2e8a98..c608fe53334d 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_operations.py
@@ -23,7 +23,7 @@ class ApiManagementOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_service_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_service_operations.py
index 66dec053aa83..4615626b7111 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_service_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_management_service_operations.py
@@ -25,7 +25,7 @@ class ApiManagementServiceOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_operations.py
index a59fa1394d30..a42325c9750c 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_operations.py
@@ -22,7 +22,7 @@ class ApiOperationOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_policy_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_policy_operations.py
index bfbe2795c2a1..95e925a1ddea 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_policy_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operation_policy_operations.py
@@ -22,7 +22,7 @@ class ApiOperationPolicyOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     :ivar policy_id: The identifier of the Policy. Constant value: "policy".
     """
 
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
         self.policy_id = "policy"
 
         self.config = config
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operations.py
index 9c173b97b08b..ddc64e09d2dc 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_operations.py
@@ -23,7 +23,7 @@ class ApiOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_policy_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_policy_operations.py
index 4018aa1288c3..be2dd054df5e 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_policy_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_policy_operations.py
@@ -22,7 +22,7 @@ class ApiPolicyOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     :ivar policy_id: The identifier of the Policy. Constant value: "policy".
     """
 
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
         self.policy_id = "policy"
 
         self.config = config
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_product_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_product_operations.py
index 8efea01ad3d6..0085ad0890b2 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_product_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_product_operations.py
@@ -22,7 +22,7 @@ class ApiProductOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_release_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_release_operations.py
index d914619fd2e3..92624475616e 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_release_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_release_operations.py
@@ -22,7 +22,7 @@ class ApiReleaseOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_revisions_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_revisions_operations.py
index 3081080e2019..7073744c5b91 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_revisions_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_revisions_operations.py
@@ -22,7 +22,7 @@ class ApiRevisionsOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_schema_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_schema_operations.py
index 582a4af5dcbc..cb86d583fc74 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_schema_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_schema_operations.py
@@ -22,7 +22,7 @@ class ApiSchemaOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_version_set_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_version_set_operations.py
index e7352723575c..a6eeffadd1d4 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_version_set_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/api_version_set_operations.py
@@ -22,7 +22,7 @@ class ApiVersionSetOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/authorization_server_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/authorization_server_operations.py
index f94da13b79ac..4db949a4669d 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/authorization_server_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/authorization_server_operations.py
@@ -23,7 +23,7 @@ class AuthorizationServerOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/backend_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/backend_operations.py
index abddb993cc8f..6355d88c9863 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/backend_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/backend_operations.py
@@ -22,7 +22,7 @@ class BackendOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/certificate_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/certificate_operations.py
index 07608d49b540..27c875a4c3a9 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/certificate_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/certificate_operations.py
@@ -22,7 +22,7 @@ class CertificateOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/delegation_settings_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/delegation_settings_operations.py
index fc9cbb639cf2..27110978a7c5 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/delegation_settings_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/delegation_settings_operations.py
@@ -23,7 +23,7 @@ class DelegationSettingsOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/diagnostic_logger_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/diagnostic_logger_operations.py
deleted file mode 100644
index ed7f4a054413..000000000000
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/diagnostic_logger_operations.py
+++ /dev/null
@@ -1,326 +0,0 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-#
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is
-# regenerated.
-# --------------------------------------------------------------------------
-
-import uuid
-from msrest.pipeline import ClientRawResponse
-
-from .. import models
-
-
-class DiagnosticLoggerOperations(object):
-    """DiagnosticLoggerOperations operations.
-
-    :param client: Client for service requests.
-    :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. Constant value: "2018-01-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-01-01"
-
-        self.config = config
-
-    def list_by_service(
-            self, resource_group_name, service_name, diagnostic_id, filter=None, top=None, skip=None, custom_headers=None, raw=False, **operation_config):
-        """Lists all loggers assosiated with the specified Diagnostic of the API
-        Management service instance.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param service_name: The name of the API Management service.
-        :type service_name: str
-        :param diagnostic_id: Diagnostic identifier. Must be unique in the
-         current API Management service instance.
-        :type diagnostic_id: str
-        :param filter: | Field       | Supported operators    | Supported
-         functions               |
-         |-------------|------------------------|-----------------------------------|
-         | id          | ge, le, eq, ne, gt, lt | substringof, startswith,
-         endswith |
-         | type        | eq                     |
-         |
-        :type filter: str
-        :param top: Number of records to return.
-        :type top: int
-        :param skip: Number of records to skip.
-        :type skip: int
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: An iterator like instance of LoggerContract
-        :rtype:
-         ~azure.mgmt.apimanagement.models.LoggerContractPaged[~azure.mgmt.apimanagement.models.LoggerContract]
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
-        """
-        def internal_paging(next_link=None, raw=False):
-
-            if not next_link:
-                # Construct URL
-                url = self.list_by_service.metadata['url']
-                path_format_arguments = {
-                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-                    'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-                    'diagnosticId': self._serialize.url("diagnostic_id", diagnostic_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)')
-                }
-                url = self._client.format_url(url, **path_format_arguments)
-
-                # Construct parameters
-                query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-                if filter is not None:
-                    query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
-                if top is not None:
-                    query_parameters['$top'] = self._serialize.query("top", top, 'int', minimum=1)
-                if skip is not None:
-                    query_parameters['$skip'] = self._serialize.query("skip", skip, 'int', minimum=0)
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
-            if self.config.generate_client_request_id:
-                header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
-            if custom_headers:
-                header_parameters.update(custom_headers)
-            if self.config.accept_language is not None:
-                header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
-            # Construct and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
-
-            if response.status_code not in [200]:
-                raise models.ErrorResponseException(self._deserialize, response)
-
-            return response
-
-        # Deserialize response
-        deserialized = models.LoggerContractPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.LoggerContractPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_service.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}/loggers'}
-
-    def check_entity_exists(
-            self, resource_group_name, service_name, diagnostic_id, loggerid, custom_headers=None, raw=False, **operation_config):
-        """Checks that logger entity specified by identifier is associated with
-        the diagnostics entity.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param service_name: The name of the API Management service.
-        :type service_name: str
-        :param diagnostic_id: Diagnostic identifier. Must be unique in the
-         current API Management service instance.
-        :type diagnostic_id: str
-        :param loggerid: Logger identifier. Must be unique in the API
-         Management service instance.
-        :type loggerid: str
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: bool or ClientRawResponse if raw=true
-        :rtype: bool or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
-        """
-        # Construct URL
-        url = self.check_entity_exists.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'diagnosticId': self._serialize.url("diagnostic_id", diagnostic_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'loggerid': self._serialize.url("loggerid", loggerid, 'str', max_length=80, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
-        }
-        url = self._client.format_url(url, **path_format_arguments)
-
-        # Construct parameters
-        query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
-        if self.config.generate_client_request_id:
-            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
-        if custom_headers:
-            header_parameters.update(custom_headers)
-        if self.config.accept_language is not None:
-            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
-        # Construct and send request
-        request = self._client.head(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
-
-        if response.status_code not in [204, 404]:
-            raise models.ErrorResponseException(self._deserialize, response)
-
-        deserialized = (response.status_code == 204)
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-        return deserialized
-    check_entity_exists.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}/loggers/{loggerid}'}
-
-    def create_or_update(
-            self, resource_group_name, service_name, diagnostic_id, loggerid, custom_headers=None, raw=False, **operation_config):
-        """Attaches a logger to a dignostic.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param service_name: The name of the API Management service.
-        :type service_name: str
-        :param diagnostic_id: Diagnostic identifier. Must be unique in the
-         current API Management service instance.
-        :type diagnostic_id: str
-        :param loggerid: Logger identifier. Must be unique in the API
-         Management service instance.
-        :type loggerid: str
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: LoggerContract or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.apimanagement.models.LoggerContract or
-         ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
-        """
-        # Construct URL
-        url = self.create_or_update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'diagnosticId': self._serialize.url("diagnostic_id", diagnostic_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'loggerid': self._serialize.url("loggerid", loggerid, 'str', max_length=80, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
-        }
-        url = self._client.format_url(url, **path_format_arguments)
-
-        # Construct parameters
-        query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
-        if self.config.generate_client_request_id:
-            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
-        if custom_headers:
-            header_parameters.update(custom_headers)
-        if self.config.accept_language is not None:
-            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
-        # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
-
-        if response.status_code not in [200, 201]:
-            raise models.ErrorResponseException(self._deserialize, response)
-
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('LoggerContract', response)
-        if response.status_code == 201:
-            deserialized = self._deserialize('LoggerContract', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}/loggers/{loggerid}'}
-
-    def delete(
-            self, resource_group_name, service_name, diagnostic_id, loggerid, custom_headers=None, raw=False, **operation_config):
-        """Deletes the specified Logger from Diagnostic.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param service_name: The name of the API Management service.
-        :type service_name: str
-        :param diagnostic_id: Diagnostic identifier. Must be unique in the
-         current API Management service instance.
-        :type diagnostic_id: str
-        :param loggerid: Logger identifier. Must be unique in the API
-         Management service instance.
-        :type loggerid: str
-        :param dict custom_headers: headers that will be added to the request
-        :param bool raw: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: None or ClientRawResponse if raw=true
-        :rtype: None or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
-        """
-        # Construct URL
-        url = self.delete.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
-            'diagnosticId': self._serialize.url("diagnostic_id", diagnostic_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'loggerid': self._serialize.url("loggerid", loggerid, 'str', max_length=80, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
-        }
-        url = self._client.format_url(url, **path_format_arguments)
-
-        # Construct parameters
-        query_parameters = {}
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
-        if self.config.generate_client_request_id:
-            header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
-        if custom_headers:
-            header_parameters.update(custom_headers)
-        if self.config.accept_language is not None:
-            header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
-
-        # Construct and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
-
-        if response.status_code not in [200, 204]:
-            raise models.ErrorResponseException(self._deserialize, response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(None, response)
-            return client_raw_response
-    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}/loggers/{loggerid}'}
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/diagnostic_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/diagnostic_operations.py
index 47b432c1f944..165ccacc3033 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/diagnostic_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/diagnostic_operations.py
@@ -22,7 +22,7 @@ class DiagnosticOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
@@ -254,7 +254,7 @@ def get(
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}'}
 
     def create_or_update(
-            self, resource_group_name, service_name, diagnostic_id, enabled, if_match=None, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, service_name, diagnostic_id, parameters, if_match=None, custom_headers=None, raw=False, **operation_config):
         """Creates a new Diagnostic or updates an existing one.
 
         :param resource_group_name: The name of the resource group.
@@ -264,9 +264,8 @@ def create_or_update(
         :param diagnostic_id: Diagnostic identifier. Must be unique in the
          current API Management service instance.
         :type diagnostic_id: str
-        :param enabled: Indicates whether a diagnostic should receive data or
-         not.
-        :type enabled: bool
+        :param parameters: Create parameters.
+        :type parameters: ~azure.mgmt.apimanagement.models.DiagnosticContract
         :param if_match: ETag of the Entity. Not required when creating an
          entity, but required when updating an entity.
         :type if_match: str
@@ -281,8 +280,6 @@ def create_or_update(
         :raises:
          :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
         """
-        parameters = models.DiagnosticContract(enabled=enabled)
-
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
@@ -335,7 +332,7 @@ def create_or_update(
     create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/diagnostics/{diagnosticId}'}
 
     def update(
-            self, resource_group_name, service_name, diagnostic_id, if_match, enabled, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, service_name, diagnostic_id, parameters, if_match, custom_headers=None, raw=False, **operation_config):
         """Updates the details of the Diagnostic specified by its identifier.
 
         :param resource_group_name: The name of the resource group.
@@ -345,13 +342,12 @@ def update(
         :param diagnostic_id: Diagnostic identifier. Must be unique in the
          current API Management service instance.
         :type diagnostic_id: str
+        :param parameters: Diagnostic Update parameters.
+        :type parameters: ~azure.mgmt.apimanagement.models.DiagnosticContract
         :param if_match: ETag of the Entity. ETag should match the current
          entity state from the header response of the GET request or it should
          be * for unconditional update.
         :type if_match: str
-        :param enabled: Indicates whether a diagnostic should receive data or
-         not.
-        :type enabled: bool
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -362,8 +358,6 @@ def update(
         :raises:
          :class:`ErrorResponseException<azure.mgmt.apimanagement.models.ErrorResponseException>`
         """
-        parameters = models.DiagnosticContract(enabled=enabled)
-
         # Construct URL
         url = self.update.metadata['url']
         path_format_arguments = {
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/email_template_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/email_template_operations.py
index 0e3ef0fbd91d..258c21b45361 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/email_template_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/email_template_operations.py
@@ -23,7 +23,7 @@ class EmailTemplateOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/group_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/group_operations.py
index cf7381a5f73b..efa94e09af7c 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/group_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/group_operations.py
@@ -23,7 +23,7 @@ class GroupOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/group_user_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/group_user_operations.py
index 08811eba0ae3..49e0ab12a770 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/group_user_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/group_user_operations.py
@@ -22,7 +22,7 @@ class GroupUserOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/identity_provider_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/identity_provider_operations.py
index c2de5e944025..9765d5c1ab3f 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/identity_provider_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/identity_provider_operations.py
@@ -22,7 +22,7 @@ class IdentityProviderOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/logger_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/logger_operations.py
index 44011c829d91..1c4de5d39585 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/logger_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/logger_operations.py
@@ -22,7 +22,7 @@ class LoggerOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/network_status_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/network_status_operations.py
index e1bb254c2a31..8118f1942aea 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/network_status_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/network_status_operations.py
@@ -22,7 +22,7 @@ class NetworkStatusOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_operations.py
index 566af539e5a2..563ec5774919 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_operations.py
@@ -23,7 +23,7 @@ class NotificationOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_email_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_email_operations.py
index ca3eb28c0603..dd8f717a6202 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_email_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_email_operations.py
@@ -22,7 +22,7 @@ class NotificationRecipientEmailOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_user_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_user_operations.py
index 24abb3b97c66..7c907f8c76f0 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_user_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/notification_recipient_user_operations.py
@@ -22,7 +22,7 @@ class NotificationRecipientUserOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/open_id_connect_provider_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/open_id_connect_provider_operations.py
index 972f8638a628..e949efdaa9f7 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/open_id_connect_provider_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/open_id_connect_provider_operations.py
@@ -23,7 +23,7 @@ class OpenIdConnectProviderOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/operation_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/operation_operations.py
index eb4cd4c49f36..81478986b811 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/operation_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/operation_operations.py
@@ -23,7 +23,7 @@ class OperationOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/policy_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/policy_operations.py
index f418849b26d0..773e01651961 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/policy_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/policy_operations.py
@@ -23,7 +23,7 @@ class PolicyOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     :ivar policy_id: The identifier of the Policy. Constant value: "policy".
     """
 
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
         self.policy_id = "policy"
 
         self.config = config
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/policy_snippets_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/policy_snippets_operations.py
index 4ff1a86eec73..9380418915a6 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/policy_snippets_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/policy_snippets_operations.py
@@ -23,7 +23,7 @@ class PolicySnippetsOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_api_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_api_operations.py
index 45c63fb4f995..63f0b8f20032 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_api_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_api_operations.py
@@ -22,7 +22,7 @@ class ProductApiOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
@@ -146,8 +146,9 @@ def check_entity_exists(
         :param product_id: Product identifier. Must be unique in the current
          API Management service instance.
         :type product_id: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -165,7 +166,7 @@ def check_entity_exists(
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
             'productId': self._serialize.url("product_id", product_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -209,8 +210,9 @@ def create_or_update(
         :param product_id: Product identifier. Must be unique in the current
          API Management service instance.
         :type product_id: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -229,7 +231,7 @@ def create_or_update(
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
             'productId': self._serialize.url("product_id", product_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -280,8 +282,9 @@ def delete(
         :param product_id: Product identifier. Must be unique in the current
          API Management service instance.
         :type product_id: str
-        :param api_id: API identifier. Must be unique in the current API
-         Management service instance.
+        :param api_id: API revision identifier. Must be unique in the current
+         API Management service instance. Non-current revision has ;rev=n as a
+         suffix where n is the revision number.
         :type api_id: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -299,7 +302,7 @@ def delete(
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
             'serviceName': self._serialize.url("service_name", service_name, 'str', max_length=50, min_length=1, pattern=r'^[a-zA-Z](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$'),
             'productId': self._serialize.url("product_id", product_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
-            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=80, min_length=1, pattern=r'(^[\w]+$)|(^[\w][\w\-]+[\w]$)'),
+            'apiId': self._serialize.url("api_id", api_id, 'str', max_length=256, min_length=1, pattern=r'^[^*#&+:<>?]+$'),
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_group_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_group_operations.py
index 9140736b7569..eeeb39b636ce 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_group_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_group_operations.py
@@ -22,7 +22,7 @@ class ProductGroupOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_operations.py
index 6d4a99060f0e..c2026a311706 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_operations.py
@@ -22,7 +22,7 @@ class ProductOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_policy_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_policy_operations.py
index 667f1e30ee36..100a8806797d 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_policy_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_policy_operations.py
@@ -22,7 +22,7 @@ class ProductPolicyOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     :ivar policy_id: The identifier of the Policy. Constant value: "policy".
     """
 
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
         self.policy_id = "policy"
 
         self.config = config
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_subscriptions_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_subscriptions_operations.py
index 465d62c1bfa9..4e6b9574df41 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_subscriptions_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/product_subscriptions_operations.py
@@ -22,7 +22,7 @@ class ProductSubscriptionsOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/property_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/property_operations.py
index a9dc5ef44fa4..f3c9b8d9f22a 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/property_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/property_operations.py
@@ -23,7 +23,7 @@ class PropertyOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/quota_by_counter_keys_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/quota_by_counter_keys_operations.py
index bc54f6217d8a..3e2ee7b60914 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/quota_by_counter_keys_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/quota_by_counter_keys_operations.py
@@ -22,7 +22,7 @@ class QuotaByCounterKeysOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/quota_by_period_keys_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/quota_by_period_keys_operations.py
index ee9c5c1bfc82..23f78eb13cfe 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/quota_by_period_keys_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/quota_by_period_keys_operations.py
@@ -22,7 +22,7 @@ class QuotaByPeriodKeysOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/regions_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/regions_operations.py
index e1d073e10af7..b0672e9c710b 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/regions_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/regions_operations.py
@@ -23,7 +23,7 @@ class RegionsOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/reports_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/reports_operations.py
index f8aba4048a74..678ea3f9d923 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/reports_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/reports_operations.py
@@ -23,7 +23,7 @@ class ReportsOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/sign_in_settings_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/sign_in_settings_operations.py
index a1eee88bc069..82e46e630493 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/sign_in_settings_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/sign_in_settings_operations.py
@@ -23,7 +23,7 @@ class SignInSettingsOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/sign_up_settings_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/sign_up_settings_operations.py
index 97c5d90ec45a..b7bf1579514c 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/sign_up_settings_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/sign_up_settings_operations.py
@@ -23,7 +23,7 @@ class SignUpSettingsOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/subscription_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/subscription_operations.py
index e07edfd81fd7..e64c8b48562c 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/subscription_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/subscription_operations.py
@@ -22,7 +22,7 @@ class SubscriptionOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_description_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_description_operations.py
index f1ac22de336f..3136bc593041 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_description_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_description_operations.py
@@ -22,7 +22,7 @@ class TagDescriptionOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_operations.py
index 8890d3d907f2..01ef792a7308 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_operations.py
@@ -23,7 +23,7 @@ class TagOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_resource_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_resource_operations.py
index f870c52e3f2b..4171680914c0 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_resource_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tag_resource_operations.py
@@ -23,7 +23,7 @@ class TagResourceOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_access_git_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_access_git_operations.py
index dd6aee9db023..c319e5e4abd2 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_access_git_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_access_git_operations.py
@@ -22,7 +22,7 @@ class TenantAccessGitOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     :ivar access_name: The identifier of the Access configuration. Constant value: "access".
     """
 
@@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
         self.access_name = "access"
 
         self.config = config
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_access_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_access_operations.py
index 688ab94a2bb3..c71905e01731 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_access_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_access_operations.py
@@ -23,7 +23,7 @@ class TenantAccessOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     :ivar access_name: The identifier of the Access configuration. Constant value: "access".
     """
 
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
         self.access_name = "access"
 
         self.config = config
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_configuration_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_configuration_operations.py
index 42f8f322f8e9..8d9540d3fbdc 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_configuration_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/tenant_configuration_operations.py
@@ -25,7 +25,7 @@ class TenantConfigurationOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     :ivar configuration_name: The identifier of the Git Configuration Operation. Constant value: "configuration".
     """
 
@@ -36,7 +36,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
         self.configuration_name = "configuration"
 
         self.config = config
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_group_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_group_operations.py
index 7df3219adb2f..9cf82bf05751 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_group_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_group_operations.py
@@ -22,7 +22,7 @@ class UserGroupOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_identities_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_identities_operations.py
index 47b38db92ee8..92e6753a9145 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_identities_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_identities_operations.py
@@ -22,7 +22,7 @@ class UserIdentitiesOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_operations.py
index 85f2c1619de9..603fcb102470 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_operations.py
@@ -22,7 +22,7 @@ class UserOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_subscription_operations.py b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_subscription_operations.py
index 4b0efda6e060..e7db795ec249 100644
--- a/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_subscription_operations.py
+++ b/azure-mgmt-apimanagement/azure/mgmt/apimanagement/operations/user_subscription_operations.py
@@ -22,7 +22,7 @@ class UserSubscriptionOperations(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. Constant value: "2018-01-01".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2018-06-01-preview".
     """
 
     models = models
@@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2018-01-01"
+        self.api_version = "2018-06-01-preview"
 
         self.config = config