[AutoPR apimanagement/resource-manager] [API Management] New Api version introduced along with new contracts for the Diagnostics resource

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(

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',

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):

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):

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"

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):

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):

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):

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):

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):

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):

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):

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):

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):

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)