From 7a9ef977cb9779eabbbd654dad26285c1961db89 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Tue, 19 Jun 2018 13:20:19 -0700
Subject: [PATCH 01/12] Generated from 95a292d7110d9797050ecf6a7305199ae4fe2d1a
 (#2777)

Adding in description of available filter options
---
 .../azure/mgmt/logic/operations/agreements_operations.py    | 3 ++-
 .../azure/mgmt/logic/operations/maps_operations.py          | 3 ++-
 .../azure/mgmt/logic/operations/partners_operations.py      | 3 ++-
 .../azure/mgmt/logic/operations/schemas_operations.py       | 3 ++-
 .../azure/mgmt/logic/operations/sessions_operations.py      | 3 ++-
 .../logic/operations/workflow_run_actions_operations.py     | 3 ++-
 .../azure/mgmt/logic/operations/workflow_runs_operations.py | 3 ++-
 .../operations/workflow_trigger_histories_operations.py     | 3 ++-
 .../azure/mgmt/logic/operations/workflows_operations.py     | 6 ++++--
 azure-mgmt-logic/azure/mgmt/logic/version.py                | 2 +-
 10 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py
index 865610bc4e8b..03d89033138f 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py
@@ -47,7 +47,8 @@ def list_by_integration_accounts(
         :type integration_account_name: str
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: AgreementType.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py
index 555e97bdf0e9..f27bb5c54dba 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py
@@ -47,7 +47,8 @@ def list_by_integration_accounts(
         :type integration_account_name: str
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: MapType.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py
index 4000d7a2cd2e..5b615d959d1b 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py
@@ -47,7 +47,8 @@ def list_by_integration_accounts(
         :type integration_account_name: str
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: PartnerType.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py
index 49970966db56..d57ffe172b6a 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py
@@ -47,7 +47,8 @@ def list_by_integration_accounts(
         :type integration_account_name: str
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: SchemaType.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py
index dce104362e52..d186907e1129 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py
@@ -46,7 +46,8 @@ def list_by_integration_accounts(
         :type integration_account_name: str
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: ChangedTime.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py
index 12b74f6eb764..e5eb778148e9 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py
@@ -49,7 +49,8 @@ def list(
         :type run_name: str
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: Status.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py
index 4e2a94efb342..168e31cf15c3 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py
@@ -47,7 +47,8 @@ def list(
         :type workflow_name: str
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: Status, StartTime, and ClientTrackingId.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py
index 2a4d74d93221..bc4f301a6e75 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py
@@ -49,7 +49,8 @@ def list(
         :type trigger_name: str
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: Status, StartTime, and ClientTrackingId.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py
index 297d0375d8a8..e310620f6701 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py
@@ -43,7 +43,8 @@ def list_by_subscription(
 
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: State, Trigger, and ReferencedResourceId.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -118,7 +119,8 @@ def list_by_resource_group(
         :type resource_group_name: str
         :param top: The number of items to be included in the result.
         :type top: int
-        :param filter: The filter to apply on the operation.
+        :param filter: The filter to apply on the operation. Options for
+         filters include: State, Trigger, and ReferencedResourceId.
         :type filter: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/azure-mgmt-logic/azure/mgmt/logic/version.py b/azure-mgmt-logic/azure/mgmt/logic/version.py
index 7f225c6aab41..b2fd3a7ffa39 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/version.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "3.0.0"
+VERSION = "2016-06-01"
 

From 7b6f693691dcc9eccfab311d443e9f161f79be23 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Thu, 9 Aug 2018 13:06:49 -0700
Subject: [PATCH 02/12] Generated from 67a236748ca1406e2afe69d99f39a1c1bb7167c9
 (#3118)

Fix for extra / on the end of the triggers endpoint
---
 .../mgmt/logic/logic_management_client.py     |  7 +-
 .../logic/operations/agreements_operations.py | 30 +++----
 .../operations/certificates_operations.py     | 24 +++---
 ...tegration_account_assemblies_operations.py | 30 +++----
 ...account_batch_configurations_operations.py | 24 +++---
 .../integration_accounts_operations.py        | 60 ++++++-------
 .../mgmt/logic/operations/maps_operations.py  | 30 +++----
 .../logic/operations/partners_operations.py   | 30 +++----
 .../logic/operations/schemas_operations.py    | 30 +++----
 .../logic/operations/sessions_operations.py   | 24 +++---
 ...kflow_run_action_repetitions_operations.py | 20 ++---
 ...un_action_scoped_repetitions_operations.py | 12 +--
 .../workflow_run_actions_operations.py        | 20 ++---
 .../operations/workflow_run_operations.py     |  6 +-
 .../operations/workflow_runs_operations.py    | 18 ++--
 .../workflow_trigger_histories_operations.py  | 18 ++--
 .../workflow_triggers_operations.py           | 42 +++++----
 .../workflow_versions_operations.py           | 19 ++---
 .../logic/operations/workflows_operations.py  | 85 +++++++++----------
 19 files changed, 243 insertions(+), 286 deletions(-)

diff --git a/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py b/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py
index 1546c6d7fffd..e896d3ec1d1b 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py
@@ -199,7 +199,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -208,9 +208,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 raise models.ErrorResponseException(self._deserialize, response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py
index 03d89033138f..6dc731f93279 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py
@@ -86,7 +86,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -95,9 +95,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -153,7 +152,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -162,8 +161,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -220,6 +219,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -232,9 +232,8 @@ def create_or_update(
         body_content = self._serialize.body(agreement, 'IntegrationAccountAgreement')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -290,7 +289,6 @@ def delete(
 
         # 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:
@@ -299,8 +297,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             exp = CloudError(response)
@@ -355,6 +353,7 @@ def list_content_callback_url(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -367,9 +366,8 @@ def list_content_callback_url(
         body_content = self._serialize.body(list_content_callback_url1, 'GetCallbackUrlParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/certificates_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/certificates_operations.py
index 615cbe579cec..32c7a0199b9e 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/certificates_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/certificates_operations.py
@@ -81,7 +81,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -90,9 +90,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -149,7 +148,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -158,8 +157,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -218,6 +217,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -230,9 +230,8 @@ def create_or_update(
         body_content = self._serialize.body(certificate, 'IntegrationAccountCertificate')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -288,7 +287,6 @@ def delete(
 
         # 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:
@@ -297,8 +295,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_assemblies_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_assemblies_operations.py
index ebfb06ee9381..40812ebc146a 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_assemblies_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_assemblies_operations.py
@@ -77,7 +77,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -86,9 +86,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -144,7 +143,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -153,8 +152,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -211,6 +210,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -223,9 +223,8 @@ def create_or_update(
         body_content = self._serialize.body(assembly_artifact, 'AssemblyDefinition')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -281,7 +280,6 @@ def delete(
 
         # 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:
@@ -290,8 +288,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             exp = CloudError(response)
@@ -339,7 +337,7 @@ def list_content_callback_url(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -348,8 +346,8 @@ def list_content_callback_url(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_batch_configurations_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_batch_configurations_operations.py
index 297b62c6bf2b..7d08646f77de 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_batch_configurations_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_batch_configurations_operations.py
@@ -77,7 +77,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -86,9 +86,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -144,7 +143,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -153,8 +152,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -211,6 +210,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -223,9 +223,8 @@ def create_or_update(
         body_content = self._serialize.body(batch_configuration, 'BatchConfiguration')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -281,7 +280,6 @@ def delete(
 
         # 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:
@@ -290,8 +288,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_accounts_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_accounts_operations.py
index 692acc1e3dd6..166c7e285bb3 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_accounts_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_accounts_operations.py
@@ -75,7 +75,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -84,9 +84,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -147,7 +146,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -156,9 +155,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -211,7 +209,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -220,8 +218,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -275,6 +273,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -287,9 +286,8 @@ def create_or_update(
         body_content = self._serialize.body(integration_account, 'IntegrationAccount')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -345,6 +343,7 @@ def update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -357,9 +356,8 @@ def update(
         body_content = self._serialize.body(integration_account, 'IntegrationAccount')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.patch(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -410,7 +408,6 @@ def delete(
 
         # 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:
@@ -419,8 +416,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             exp = CloudError(response)
@@ -472,6 +469,7 @@ def get_callback_url(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -484,9 +482,8 @@ def get_callback_url(
         body_content = self._serialize.body(parameters, 'GetCallbackUrlParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -551,6 +548,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
+            header_parameters['Accept'] = 'application/json'
             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())
@@ -563,9 +561,8 @@ def internal_paging(next_link=None, raw=False):
             body_content = self._serialize.body(list_key_vault_keys1, 'ListKeyVaultKeysDefinition')
 
             # Construct and send request
-            request = self._client.post(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, body_content, stream=False, **operation_config)
+            request = self._client.post(url, query_parameters, header_parameters, body_content)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -632,9 +629,8 @@ def log_tracking_events(
         body_content = self._serialize.body(log_tracking_events, 'TrackingEventsDefinition')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -684,6 +680,7 @@ def regenerate_access_key(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -696,9 +693,8 @@ def regenerate_access_key(
         body_content = self._serialize.body(regenerate_access_key1, 'RegenerateActionParameter')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py
index f27bb5c54dba..1357b1d6eb9d 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py
@@ -86,7 +86,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -95,9 +95,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -153,7 +152,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -162,8 +161,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -220,6 +219,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -232,9 +232,8 @@ def create_or_update(
         body_content = self._serialize.body(map, 'IntegrationAccountMap')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -290,7 +289,6 @@ def delete(
 
         # 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:
@@ -299,8 +297,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             exp = CloudError(response)
@@ -355,6 +353,7 @@ def list_content_callback_url(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -367,9 +366,8 @@ def list_content_callback_url(
         body_content = self._serialize.body(list_content_callback_url1, 'GetCallbackUrlParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py
index 5b615d959d1b..50a5372dc3ed 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py
@@ -86,7 +86,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -95,9 +95,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -153,7 +152,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -162,8 +161,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -220,6 +219,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -232,9 +232,8 @@ def create_or_update(
         body_content = self._serialize.body(partner, 'IntegrationAccountPartner')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -290,7 +289,6 @@ def delete(
 
         # 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:
@@ -299,8 +297,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             exp = CloudError(response)
@@ -355,6 +353,7 @@ def list_content_callback_url(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -367,9 +366,8 @@ def list_content_callback_url(
         body_content = self._serialize.body(list_content_callback_url1, 'GetCallbackUrlParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py
index d57ffe172b6a..dae06f1d59bc 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py
@@ -86,7 +86,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -95,9 +95,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -153,7 +152,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -162,8 +161,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -220,6 +219,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -232,9 +232,8 @@ def create_or_update(
         body_content = self._serialize.body(schema, 'IntegrationAccountSchema')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -290,7 +289,6 @@ def delete(
 
         # 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:
@@ -299,8 +297,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             exp = CloudError(response)
@@ -355,6 +353,7 @@ def list_content_callback_url(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -367,9 +366,8 @@ def list_content_callback_url(
         body_content = self._serialize.body(list_content_callback_url1, 'GetCallbackUrlParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py
index d186907e1129..2acf631d159a 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py
@@ -86,7 +86,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -95,9 +95,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 raise models.ErrorResponseException(self._deserialize, response)
@@ -152,7 +151,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -161,8 +160,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             raise models.ErrorResponseException(self._deserialize, response)
@@ -218,6 +217,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -230,9 +230,8 @@ def create_or_update(
         body_content = self._serialize.body(session, 'IntegrationAccountSession')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             raise models.ErrorResponseException(self._deserialize, response)
@@ -287,7 +286,6 @@ def delete(
 
         # 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:
@@ -296,8 +294,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             raise models.ErrorResponseException(self._deserialize, response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_operations.py
index 8124908c44ab..c6cfe07c4078 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_operations.py
@@ -84,7 +84,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -93,9 +93,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -158,7 +157,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -167,8 +166,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -236,7 +235,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -245,9 +244,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
             # Construct and send request
-            request = self._client.post(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            request = self._client.post(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scoped_repetitions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scoped_repetitions_operations.py
index 9c48bbd0fc19..969f97135252 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scoped_repetitions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scoped_repetitions_operations.py
@@ -78,7 +78,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -87,8 +87,8 @@ def list(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -150,7 +150,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -159,8 +159,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py
index e5eb778148e9..588a818106ad 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py
@@ -89,7 +89,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -98,9 +98,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -159,7 +158,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -168,8 +167,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -234,7 +233,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -243,9 +242,8 @@ def internal_paging(next_link=None, raw=False):
                 header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
             # Construct and send request
-            request = self._client.post(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            request = self._client.post(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_operations.py
index a034b81249e9..f812bf4b3fe1 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_operations.py
@@ -76,7 +76,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -85,8 +85,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py
index 168e31cf15c3..a4b40a30e9fc 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py
@@ -86,7 +86,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -95,9 +95,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -153,7 +152,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -162,8 +161,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -217,7 +216,6 @@ def cancel(
 
         # 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:
@@ -226,8 +224,8 @@ def cancel(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py
index bc4f301a6e75..6c1294ae5c32 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py
@@ -89,7 +89,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -98,9 +98,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -160,7 +159,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -169,8 +168,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -228,7 +227,6 @@ def resubmit(
 
         # 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:
@@ -237,8 +235,8 @@ def resubmit(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [202]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_triggers_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_triggers_operations.py
index 7d84a2859d11..2e0b2194f9a2 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_triggers_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_triggers_operations.py
@@ -85,7 +85,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -94,9 +94,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -114,7 +113,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/triggers/'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/triggers'}
 
     def get(
             self, resource_group_name, workflow_name, trigger_name, custom_headers=None, raw=False, **operation_config):
@@ -152,7 +151,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -161,8 +160,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -216,7 +215,6 @@ def reset(
 
         # 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:
@@ -225,8 +223,8 @@ def reset(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -274,7 +272,6 @@ def run(
 
         # 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:
@@ -283,8 +280,8 @@ def run(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code < 200 or response.status_code >= 300:
             raise HttpOperationError(self._deserialize, response, 'object')
@@ -330,7 +327,7 @@ def get_schema_json(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -339,8 +336,8 @@ def get_schema_json(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -410,9 +407,8 @@ def set_state(
         body_content = self._serialize.body(set_state1, 'SetTriggerStateActionDefinition')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -460,7 +456,7 @@ def list_callback_url(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -469,8 +465,8 @@ def list_callback_url(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_versions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_versions_operations.py
index f6dffba9225b..a98e2f80a77b 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_versions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_versions_operations.py
@@ -81,7 +81,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -90,9 +90,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -148,7 +147,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -157,8 +156,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -225,6 +224,7 @@ def list_callback_url(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -240,9 +240,8 @@ def list_callback_url(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py
index e310620f6701..a08f66a38164 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py
@@ -80,7 +80,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -89,9 +89,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -157,7 +156,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            header_parameters['Accept'] = 'application/json'
             if self.config.generate_client_request_id:
                 header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
             if custom_headers:
@@ -166,9 +165,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
+            request = self._client.get(url, query_parameters, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
                 exp = CloudError(response)
@@ -221,7 +219,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -230,8 +228,8 @@ def get(
             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)
+        request = self._client.get(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -285,6 +283,7 @@ def create_or_update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -297,9 +296,8 @@ def create_or_update(
         body_content = self._serialize.body(workflow, 'Workflow')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.put(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
             exp = CloudError(response)
@@ -355,6 +353,7 @@ def update(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -367,9 +366,8 @@ def update(
         body_content = self._serialize.body(workflow, 'Workflow')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.patch(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -420,7 +418,6 @@ def delete(
 
         # 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:
@@ -429,8 +426,8 @@ def delete(
             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)
+        request = self._client.delete(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
             exp = CloudError(response)
@@ -474,7 +471,6 @@ def disable(
 
         # 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:
@@ -483,8 +479,8 @@ def disable(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -528,7 +524,6 @@ def enable(
 
         # 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:
@@ -537,8 +532,8 @@ def enable(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -586,6 +581,7 @@ def generate_upgraded_definition(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -598,9 +594,8 @@ def generate_upgraded_definition(
         body_content = self._serialize.body(parameters, 'GenerateUpgradedDefinitionParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -659,6 +654,7 @@ def list_callback_url(
 
         # Construct headers
         header_parameters = {}
+        header_parameters['Accept'] = 'application/json'
         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())
@@ -671,9 +667,8 @@ def list_callback_url(
         body_content = self._serialize.body(list_callback_url1, 'GetCallbackUrlParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -724,7 +719,7 @@ def list_swagger(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        header_parameters['Accept'] = 'application/json'
         if self.config.generate_client_request_id:
             header_parameters['x-ms-client-request-id'] = str(uuid.uuid1())
         if custom_headers:
@@ -733,8 +728,8 @@ def list_swagger(
             header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -799,9 +794,8 @@ def move(
         body_content = self._serialize.body(move, 'Workflow')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 202]:
             exp = CloudError(response)
@@ -862,9 +856,8 @@ def regenerate_access_key(
         body_content = self._serialize.body(key_type1, 'RegenerateActionParameter')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -922,9 +915,8 @@ def validate_workflow(
         body_content = self._serialize.body(validate, 'Workflow')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)
@@ -985,9 +977,8 @@ def validate(
         body_content = self._serialize.body(workflow, 'Workflow')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             exp = CloudError(response)

From cd32a990ff5dc7acdd28f99b748ca8a4f0b71477 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Mon, 27 Aug 2018 14:52:51 -0700
Subject: [PATCH 03/12] Generated from 989e7b0c282b2fd93eda33260b929a28ae975cbe
 (#3191)

Remove extra prep files, update the readme
---
 .../mgmt/logic/logic_management_client.py     | 130 ++++++------------
 ...access_key_regenerate_action_definition.py |   2 +-
 ...ss_key_regenerate_action_definition_py3.py |   2 +-
 .../mgmt/logic/models/as2_mdn_settings.py     |   2 +-
 .../mgmt/logic/models/as2_mdn_settings_py3.py |   2 +-
 .../logic/models/as2_validation_settings.py   |   2 +-
 .../models/as2_validation_settings_py3.py     |   2 +-
 .../models/edifact_delimiter_override.py      |   4 +-
 .../models/edifact_delimiter_override_py3.py  |   4 +-
 .../logic/models/edifact_framing_settings.py  |   6 +-
 .../models/edifact_framing_settings_py3.py    |   6 +-
 .../logic/models/edifact_message_filter.py    |   2 +-
 .../models/edifact_message_filter_py3.py      |   2 +-
 .../models/edifact_validation_override.py     |   2 +-
 .../models/edifact_validation_override_py3.py |   2 +-
 .../models/edifact_validation_settings.py     |   2 +-
 .../models/edifact_validation_settings_py3.py |   2 +-
 .../models/get_callback_url_parameters.py     |   2 +-
 .../models/get_callback_url_parameters_py3.py |   2 +-
 .../models/integration_account_agreement.py   |   2 +-
 .../integration_account_agreement_filter.py   |   2 +-
 ...ntegration_account_agreement_filter_py3.py |   2 +-
 .../integration_account_agreement_py3.py      |   2 +-
 .../logic/models/integration_account_map.py   |   4 +-
 .../models/integration_account_map_filter.py  |   5 +-
 .../integration_account_map_filter_py3.py     |   5 +-
 .../models/integration_account_map_py3.py     |   4 +-
 .../models/integration_account_partner.py     |   2 +-
 .../integration_account_partner_filter.py     |   2 +-
 .../integration_account_partner_filter_py3.py |   2 +-
 .../models/integration_account_partner_py3.py |   2 +-
 .../models/integration_account_schema.py      |   2 +-
 .../integration_account_schema_filter.py      |   2 +-
 .../integration_account_schema_filter_py3.py  |   2 +-
 .../models/integration_account_schema_py3.py  |   2 +-
 .../logic/models/integration_account_sku.py   |   4 +-
 .../models/integration_account_sku_py3.py     |   4 +-
 .../models/logic_management_client_enums.py   |   4 +
 .../mgmt/logic/models/operation_result.py     |   2 +-
 .../models/operation_result_properties.py     |   2 +-
 .../models/operation_result_properties_py3.py |   2 +-
 .../mgmt/logic/models/operation_result_py3.py |   2 +-
 .../mgmt/logic/models/recurrence_schedule.py  |   2 +-
 .../models/recurrence_schedule_occurrence.py  |   2 +-
 .../recurrence_schedule_occurrence_py3.py     |   2 +-
 .../logic/models/recurrence_schedule_py3.py   |   2 +-
 .../models/regenerate_action_parameter.py     |   2 +-
 .../models/regenerate_action_parameter_py3.py |   2 +-
 .../azure/mgmt/logic/models/sku.py            |   2 +-
 .../azure/mgmt/logic/models/sku_py3.py        |   2 +-
 .../azure/mgmt/logic/models/tracking_event.py |   4 +-
 .../mgmt/logic/models/tracking_event_py3.py   |   4 +-
 .../models/tracking_events_definition.py      |   2 +-
 .../models/tracking_events_definition_py3.py  |   2 +-
 .../azure/mgmt/logic/models/workflow.py       |   4 +-
 .../mgmt/logic/models/workflow_filter.py      |   2 +-
 .../mgmt/logic/models/workflow_filter_py3.py  |   2 +-
 .../logic/models/workflow_output_parameter.py |   2 +-
 .../models/workflow_output_parameter_py3.py   |   2 +-
 .../mgmt/logic/models/workflow_parameter.py   |   2 +-
 .../logic/models/workflow_parameter_py3.py    |   2 +-
 .../azure/mgmt/logic/models/workflow_py3.py   |   4 +-
 .../azure/mgmt/logic/models/workflow_run.py   |   2 +-
 .../mgmt/logic/models/workflow_run_action.py  |   2 +-
 .../models/workflow_run_action_filter.py      |   2 +-
 .../models/workflow_run_action_filter_py3.py  |   2 +-
 .../logic/models/workflow_run_action_py3.py   |   2 +-
 ...rkflow_run_action_repetition_definition.py |   2 +-
 ...ow_run_action_repetition_definition_py3.py |   2 +-
 .../mgmt/logic/models/workflow_run_filter.py  |   2 +-
 .../logic/models/workflow_run_filter_py3.py   |   2 +-
 .../mgmt/logic/models/workflow_run_py3.py     |   2 +-
 .../mgmt/logic/models/workflow_run_trigger.py |   2 +-
 .../logic/models/workflow_run_trigger_py3.py  |   2 +-
 .../mgmt/logic/models/workflow_trigger.py     |   6 +-
 .../logic/models/workflow_trigger_filter.py   |   2 +-
 .../models/workflow_trigger_filter_py3.py     |   2 +-
 .../logic/models/workflow_trigger_history.py  |   2 +-
 .../models/workflow_trigger_history_filter.py |   2 +-
 .../workflow_trigger_history_filter_py3.py    |   2 +-
 .../models/workflow_trigger_history_py3.py    |   2 +-
 .../mgmt/logic/models/workflow_trigger_py3.py |   6 +-
 .../models/workflow_trigger_recurrence.py     |   2 +-
 .../models/workflow_trigger_recurrence_py3.py |   2 +-
 .../mgmt/logic/models/workflow_version.py     |   2 +-
 .../mgmt/logic/models/workflow_version_py3.py |   2 +-
 .../logic/models/x12_delimiter_overrides.py   |   2 +-
 .../models/x12_delimiter_overrides_py3.py     |   2 +-
 .../logic/models/x12_envelope_override.py     |   4 +-
 .../logic/models/x12_envelope_override_py3.py |   4 +-
 .../logic/models/x12_envelope_settings.py     |   6 +-
 .../logic/models/x12_envelope_settings_py3.py |   6 +-
 .../mgmt/logic/models/x12_framing_settings.py |   4 +-
 .../logic/models/x12_framing_settings_py3.py  |   4 +-
 .../mgmt/logic/models/x12_message_filter.py   |   2 +-
 .../logic/models/x12_message_filter_py3.py    |   2 +-
 .../logic/models/x12_validation_override.py   |   2 +-
 .../models/x12_validation_override_py3.py     |   2 +-
 .../logic/models/x12_validation_settings.py   |   2 +-
 .../models/x12_validation_settings_py3.py     |   2 +-
 .../azure/mgmt/logic/operations/__init__.py   |  32 +++--
 ...egration_account_agreements_operations.py} |  14 +-
 ...tegration_account_assemblies_operations.py |   4 +-
 ...account_batch_configurations_operations.py |   4 +-
 ...ration_account_certificates_operations.py} |  14 +-
 ...=> integration_account_maps_operations.py} |  14 +-
 ...ntegration_account_partners_operations.py} |  14 +-
 ...integration_account_schemas_operations.py} |  14 +-
 ...ntegration_account_sessions_operations.py} |  14 +-
 .../integration_accounts_operations.py        |  10 +-
 .../azure/mgmt/logic/operations/operations.py |  96 +++++++++++++
 ...kflow_run_action_repetitions_operations.py |   4 +-
 ...un_action_scope_repetitions_operations.py} |   8 +-
 .../workflow_run_actions_operations.py        |   4 +-
 .../operations/workflow_run_operations.py     |   4 +-
 .../operations/workflow_runs_operations.py    |   4 +-
 .../workflow_trigger_histories_operations.py  |   4 +-
 .../workflow_triggers_operations.py           |   4 +-
 .../workflow_version_triggers_operations.py   | 122 ++++++++++++++++
 .../workflow_versions_operations.py           |  88 +-----------
 .../logic/operations/workflows_operations.py  |  16 +--
 azure-mgmt-logic/azure/mgmt/logic/version.py  |   2 +-
 122 files changed, 485 insertions(+), 393 deletions(-)
 rename azure-mgmt-logic/azure/mgmt/logic/operations/{agreements_operations.py => integration_account_agreements_operations.py} (97%)
 rename azure-mgmt-logic/azure/mgmt/logic/operations/{certificates_operations.py => integration_account_certificates_operations.py} (96%)
 rename azure-mgmt-logic/azure/mgmt/logic/operations/{maps_operations.py => integration_account_maps_operations.py} (97%)
 rename azure-mgmt-logic/azure/mgmt/logic/operations/{partners_operations.py => integration_account_partners_operations.py} (97%)
 rename azure-mgmt-logic/azure/mgmt/logic/operations/{schemas_operations.py => integration_account_schemas_operations.py} (97%)
 rename azure-mgmt-logic/azure/mgmt/logic/operations/{sessions_operations.py => integration_account_sessions_operations.py} (96%)
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/operations/operations.py
 rename azure-mgmt-logic/azure/mgmt/logic/operations/{workflow_run_action_scoped_repetitions_operations.py => workflow_run_action_scope_repetitions_operations.py} (97%)
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/operations/workflow_version_triggers_operations.py

diff --git a/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py b/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py
index e896d3ec1d1b..5cecf1a882ce 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py
@@ -13,27 +13,26 @@
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
-from msrest.pipeline import ClientRawResponse
-from msrestazure.azure_exceptions import CloudError
-import uuid
 from .operations.workflows_operations import WorkflowsOperations
 from .operations.workflow_versions_operations import WorkflowVersionsOperations
 from .operations.workflow_triggers_operations import WorkflowTriggersOperations
+from .operations.workflow_version_triggers_operations import WorkflowVersionTriggersOperations
 from .operations.workflow_trigger_histories_operations import WorkflowTriggerHistoriesOperations
 from .operations.workflow_runs_operations import WorkflowRunsOperations
 from .operations.workflow_run_actions_operations import WorkflowRunActionsOperations
 from .operations.workflow_run_action_repetitions_operations import WorkflowRunActionRepetitionsOperations
-from .operations.workflow_run_action_scoped_repetitions_operations import WorkflowRunActionScopedRepetitionsOperations
+from .operations.workflow_run_action_scope_repetitions_operations import WorkflowRunActionScopeRepetitionsOperations
 from .operations.workflow_run_operations import WorkflowRunOperations
 from .operations.integration_accounts_operations import IntegrationAccountsOperations
 from .operations.integration_account_assemblies_operations import IntegrationAccountAssembliesOperations
 from .operations.integration_account_batch_configurations_operations import IntegrationAccountBatchConfigurationsOperations
-from .operations.schemas_operations import SchemasOperations
-from .operations.maps_operations import MapsOperations
-from .operations.partners_operations import PartnersOperations
-from .operations.agreements_operations import AgreementsOperations
-from .operations.certificates_operations import CertificatesOperations
-from .operations.sessions_operations import SessionsOperations
+from .operations.integration_account_schemas_operations import IntegrationAccountSchemasOperations
+from .operations.integration_account_maps_operations import IntegrationAccountMapsOperations
+from .operations.integration_account_partners_operations import IntegrationAccountPartnersOperations
+from .operations.integration_account_agreements_operations import IntegrationAccountAgreementsOperations
+from .operations.integration_account_certificates_operations import IntegrationAccountCertificatesOperations
+from .operations.integration_account_sessions_operations import IntegrationAccountSessionsOperations
+from .operations.operations import Operations
 from . import models
 
 
@@ -81,6 +80,8 @@ class LogicManagementClient(SDKClient):
     :vartype workflow_versions: azure.mgmt.logic.operations.WorkflowVersionsOperations
     :ivar workflow_triggers: WorkflowTriggers operations
     :vartype workflow_triggers: azure.mgmt.logic.operations.WorkflowTriggersOperations
+    :ivar workflow_version_triggers: WorkflowVersionTriggers operations
+    :vartype workflow_version_triggers: azure.mgmt.logic.operations.WorkflowVersionTriggersOperations
     :ivar workflow_trigger_histories: WorkflowTriggerHistories operations
     :vartype workflow_trigger_histories: azure.mgmt.logic.operations.WorkflowTriggerHistoriesOperations
     :ivar workflow_runs: WorkflowRuns operations
@@ -89,8 +90,8 @@ class LogicManagementClient(SDKClient):
     :vartype workflow_run_actions: azure.mgmt.logic.operations.WorkflowRunActionsOperations
     :ivar workflow_run_action_repetitions: WorkflowRunActionRepetitions operations
     :vartype workflow_run_action_repetitions: azure.mgmt.logic.operations.WorkflowRunActionRepetitionsOperations
-    :ivar workflow_run_action_scoped_repetitions: WorkflowRunActionScopedRepetitions operations
-    :vartype workflow_run_action_scoped_repetitions: azure.mgmt.logic.operations.WorkflowRunActionScopedRepetitionsOperations
+    :ivar workflow_run_action_scope_repetitions: WorkflowRunActionScopeRepetitions operations
+    :vartype workflow_run_action_scope_repetitions: azure.mgmt.logic.operations.WorkflowRunActionScopeRepetitionsOperations
     :ivar workflow_run_operations: WorkflowRunOperations operations
     :vartype workflow_run_operations: azure.mgmt.logic.operations.WorkflowRunOperations
     :ivar integration_accounts: IntegrationAccounts operations
@@ -99,18 +100,20 @@ class LogicManagementClient(SDKClient):
     :vartype integration_account_assemblies: azure.mgmt.logic.operations.IntegrationAccountAssembliesOperations
     :ivar integration_account_batch_configurations: IntegrationAccountBatchConfigurations operations
     :vartype integration_account_batch_configurations: azure.mgmt.logic.operations.IntegrationAccountBatchConfigurationsOperations
-    :ivar schemas: Schemas operations
-    :vartype schemas: azure.mgmt.logic.operations.SchemasOperations
-    :ivar maps: Maps operations
-    :vartype maps: azure.mgmt.logic.operations.MapsOperations
-    :ivar partners: Partners operations
-    :vartype partners: azure.mgmt.logic.operations.PartnersOperations
-    :ivar agreements: Agreements operations
-    :vartype agreements: azure.mgmt.logic.operations.AgreementsOperations
-    :ivar certificates: Certificates operations
-    :vartype certificates: azure.mgmt.logic.operations.CertificatesOperations
-    :ivar sessions: Sessions operations
-    :vartype sessions: azure.mgmt.logic.operations.SessionsOperations
+    :ivar integration_account_schemas: IntegrationAccountSchemas operations
+    :vartype integration_account_schemas: azure.mgmt.logic.operations.IntegrationAccountSchemasOperations
+    :ivar integration_account_maps: IntegrationAccountMaps operations
+    :vartype integration_account_maps: azure.mgmt.logic.operations.IntegrationAccountMapsOperations
+    :ivar integration_account_partners: IntegrationAccountPartners operations
+    :vartype integration_account_partners: azure.mgmt.logic.operations.IntegrationAccountPartnersOperations
+    :ivar integration_account_agreements: IntegrationAccountAgreements operations
+    :vartype integration_account_agreements: azure.mgmt.logic.operations.IntegrationAccountAgreementsOperations
+    :ivar integration_account_certificates: IntegrationAccountCertificates operations
+    :vartype integration_account_certificates: azure.mgmt.logic.operations.IntegrationAccountCertificatesOperations
+    :ivar integration_account_sessions: IntegrationAccountSessions operations
+    :vartype integration_account_sessions: azure.mgmt.logic.operations.IntegrationAccountSessionsOperations
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.logic.operations.Operations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -127,7 +130,7 @@ def __init__(
         super(LogicManagementClient, 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 = '2016-06-01'
+        self.api_version = '2018-07-01-preview'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
@@ -137,6 +140,8 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.workflow_triggers = WorkflowTriggersOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.workflow_version_triggers = WorkflowVersionTriggersOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.workflow_trigger_histories = WorkflowTriggerHistoriesOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.workflow_runs = WorkflowRunsOperations(
@@ -145,7 +150,7 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.workflow_run_action_repetitions = WorkflowRunActionRepetitionsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.workflow_run_action_scoped_repetitions = WorkflowRunActionScopedRepetitionsOperations(
+        self.workflow_run_action_scope_repetitions = WorkflowRunActionScopeRepetitionsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.workflow_run_operations = WorkflowRunOperations(
             self._client, self.config, self._serialize, self._deserialize)
@@ -155,74 +160,17 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.integration_account_batch_configurations = IntegrationAccountBatchConfigurationsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.schemas = SchemasOperations(
+        self.integration_account_schemas = IntegrationAccountSchemasOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.maps = MapsOperations(
+        self.integration_account_maps = IntegrationAccountMapsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.partners = PartnersOperations(
+        self.integration_account_partners = IntegrationAccountPartnersOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.agreements = AgreementsOperations(
+        self.integration_account_agreements = IntegrationAccountAgreementsOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.certificates = CertificatesOperations(
+        self.integration_account_certificates = IntegrationAccountCertificatesOperations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.sessions = SessionsOperations(
+        self.integration_account_sessions = IntegrationAccountSessionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.operations = Operations(
             self._client, self.config, self._serialize, self._deserialize)
-
-    def list_operations(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all of the available Logic REST API operations.
-
-        :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 Operation
-        :rtype:
-         ~azure.mgmt.logic.models.OperationPaged[~azure.mgmt.logic.models.Operation]
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
-        """
-        def internal_paging(next_link=None, raw=False):
-
-            if not next_link:
-                # Construct URL
-                url = self.list_operations.metadata['url']
-
-                # Construct parameters
-                query_parameters = {}
-                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            header_parameters['Accept'] = 'application/json'
-            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, header_parameters)
-            response = self._client.send(request, stream=False, **operation_config)
-
-            if response.status_code not in [200]:
-                raise models.ErrorResponseException(self._deserialize, response)
-
-            return response
-
-        # Deserialize response
-        deserialized = models.OperationPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.OperationPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_operations.metadata = {'url': '/providers/Microsoft.Logic/operations'}
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py b/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py
index 6f254ed4b412..3f0252392c9f 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py
@@ -27,7 +27,7 @@ class AccessKeyRegenerateActionDefinition(Model):
     }
 
     _attribute_map = {
-        'key_type': {'key': 'keyType', 'type': 'AccessKeyType'},
+        'key_type': {'key': 'keyType', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py
index f6fbd7cc2e32..cbe83e687dda 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py
@@ -27,7 +27,7 @@ class AccessKeyRegenerateActionDefinition(Model):
     }
 
     _attribute_map = {
-        'key_type': {'key': 'keyType', 'type': 'AccessKeyType'},
+        'key_type': {'key': 'keyType', 'type': 'str'},
     }
 
     def __init__(self, *, key_type, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/as2_mdn_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/as2_mdn_settings.py
index fd804f91d8de..98ceea654285 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/as2_mdn_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/as2_mdn_settings.py
@@ -64,7 +64,7 @@ class AS2MdnSettings(Model):
         'sign_outbound_mdn_if_optional': {'key': 'signOutboundMdnIfOptional', 'type': 'bool'},
         'mdn_text': {'key': 'mdnText', 'type': 'str'},
         'send_inbound_mdn_to_message_box': {'key': 'sendInboundMdnToMessageBox', 'type': 'bool'},
-        'mic_hashing_algorithm': {'key': 'micHashingAlgorithm', 'type': 'HashingAlgorithm'},
+        'mic_hashing_algorithm': {'key': 'micHashingAlgorithm', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/as2_mdn_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/as2_mdn_settings_py3.py
index 291be8730abe..f27bc9876db5 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/as2_mdn_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/as2_mdn_settings_py3.py
@@ -64,7 +64,7 @@ class AS2MdnSettings(Model):
         'sign_outbound_mdn_if_optional': {'key': 'signOutboundMdnIfOptional', 'type': 'bool'},
         'mdn_text': {'key': 'mdnText', 'type': 'str'},
         'send_inbound_mdn_to_message_box': {'key': 'sendInboundMdnToMessageBox', 'type': 'bool'},
-        'mic_hashing_algorithm': {'key': 'micHashingAlgorithm', 'type': 'HashingAlgorithm'},
+        'mic_hashing_algorithm': {'key': 'micHashingAlgorithm', 'type': 'str'},
     }
 
     def __init__(self, *, need_mdn: bool, sign_mdn: bool, send_mdn_asynchronously: bool, sign_outbound_mdn_if_optional: bool, send_inbound_mdn_to_message_box: bool, mic_hashing_algorithm, receipt_delivery_url: str=None, disposition_notification_to: str=None, mdn_text: str=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/as2_validation_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/as2_validation_settings.py
index 42acb57ff48a..e5b7aee2eba5 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/as2_validation_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/as2_validation_settings.py
@@ -72,7 +72,7 @@ class AS2ValidationSettings(Model):
         'interchange_duplicates_validity_days': {'key': 'interchangeDuplicatesValidityDays', 'type': 'int'},
         'check_certificate_revocation_list_on_send': {'key': 'checkCertificateRevocationListOnSend', 'type': 'bool'},
         'check_certificate_revocation_list_on_receive': {'key': 'checkCertificateRevocationListOnReceive', 'type': 'bool'},
-        'encryption_algorithm': {'key': 'encryptionAlgorithm', 'type': 'EncryptionAlgorithm'},
+        'encryption_algorithm': {'key': 'encryptionAlgorithm', 'type': 'str'},
         'signing_algorithm': {'key': 'signingAlgorithm', 'type': 'str'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/as2_validation_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/as2_validation_settings_py3.py
index d56c1d9ce95f..05c6a689f528 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/as2_validation_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/as2_validation_settings_py3.py
@@ -72,7 +72,7 @@ class AS2ValidationSettings(Model):
         'interchange_duplicates_validity_days': {'key': 'interchangeDuplicatesValidityDays', 'type': 'int'},
         'check_certificate_revocation_list_on_send': {'key': 'checkCertificateRevocationListOnSend', 'type': 'bool'},
         'check_certificate_revocation_list_on_receive': {'key': 'checkCertificateRevocationListOnReceive', 'type': 'bool'},
-        'encryption_algorithm': {'key': 'encryptionAlgorithm', 'type': 'EncryptionAlgorithm'},
+        'encryption_algorithm': {'key': 'encryptionAlgorithm', 'type': 'str'},
         'signing_algorithm': {'key': 'signingAlgorithm', 'type': 'str'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py
index 9cab599afb9a..ce43ee219d87 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py
@@ -67,8 +67,8 @@ class EdifactDelimiterOverride(Model):
         'component_separator': {'key': 'componentSeparator', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
         'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
-        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
+        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'},
         'release_indicator': {'key': 'releaseIndicator', 'type': 'int'},
         'message_association_assigned_code': {'key': 'messageAssociationAssignedCode', 'type': 'str'},
         'target_namespace': {'key': 'targetNamespace', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py
index 3d35e5e000a6..8c5dc9ad9887 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py
@@ -67,8 +67,8 @@ class EdifactDelimiterOverride(Model):
         'component_separator': {'key': 'componentSeparator', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
         'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
-        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
+        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'},
         'release_indicator': {'key': 'releaseIndicator', 'type': 'int'},
         'message_association_assigned_code': {'key': 'messageAssociationAssignedCode', 'type': 'str'},
         'target_namespace': {'key': 'targetNamespace', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py
index f3e4c22b1e45..c3d9467aedeb 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py
@@ -72,9 +72,9 @@ class EdifactFramingSettings(Model):
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
         'release_indicator': {'key': 'releaseIndicator', 'type': 'int'},
         'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'},
-        'character_set': {'key': 'characterSet', 'type': 'EdifactCharacterSet'},
-        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
+        'character_set': {'key': 'characterSet', 'type': 'str'},
+        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py
index 18db9195a80f..b9de26605360 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py
@@ -72,9 +72,9 @@ class EdifactFramingSettings(Model):
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
         'release_indicator': {'key': 'releaseIndicator', 'type': 'int'},
         'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'},
-        'character_set': {'key': 'characterSet', 'type': 'EdifactCharacterSet'},
-        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
+        'character_set': {'key': 'characterSet', 'type': 'str'},
+        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
     }
 
     def __init__(self, *, protocol_version: int, data_element_separator: int, component_separator: int, segment_terminator: int, release_indicator: int, repetition_separator: int, character_set, decimal_point_indicator, segment_terminator_suffix, service_code_list_directory_version: str=None, character_encoding: str=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_message_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_message_filter.py
index 7eb3d9865ef6..ba86f0922a69 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_message_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_message_filter.py
@@ -28,7 +28,7 @@ class EdifactMessageFilter(Model):
     }
 
     _attribute_map = {
-        'message_filter_type': {'key': 'messageFilterType', 'type': 'MessageFilterType'},
+        'message_filter_type': {'key': 'messageFilterType', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_message_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_message_filter_py3.py
index bcfcfd3c6a44..c4fc6fa62117 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_message_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_message_filter_py3.py
@@ -28,7 +28,7 @@ class EdifactMessageFilter(Model):
     }
 
     _attribute_map = {
-        'message_filter_type': {'key': 'messageFilterType', 'type': 'MessageFilterType'},
+        'message_filter_type': {'key': 'messageFilterType', 'type': 'str'},
     }
 
     def __init__(self, *, message_filter_type, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override.py
index 15044485db2c..129f07f7be21 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override.py
@@ -58,7 +58,7 @@ class EdifactValidationOverride(Model):
         'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
         'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
-        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'TrailingSeparatorPolicy'},
+        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override_py3.py
index e7a62672e8d0..cdd71cc873db 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override_py3.py
@@ -58,7 +58,7 @@ class EdifactValidationOverride(Model):
         'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
         'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
-        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'TrailingSeparatorPolicy'},
+        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings.py
index 3918a817ef43..576986924cb8 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings.py
@@ -74,7 +74,7 @@ class EdifactValidationSettings(Model):
         'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
-        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'TrailingSeparatorPolicy'},
+        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings_py3.py
index 42d2215721ab..e774fdc97808 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings_py3.py
@@ -74,7 +74,7 @@ class EdifactValidationSettings(Model):
         'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
-        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'TrailingSeparatorPolicy'},
+        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
     }
 
     def __init__(self, *, validate_character_set: bool, check_duplicate_interchange_control_number: bool, interchange_control_number_validity_days: int, check_duplicate_group_control_number: bool, check_duplicate_transaction_set_control_number: bool, validate_edi_types: bool, validate_xsd_types: bool, allow_leading_and_trailing_spaces_and_zeroes: bool, trim_leading_and_trailing_spaces_and_zeroes: bool, trailing_separator_policy, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/get_callback_url_parameters.py b/azure-mgmt-logic/azure/mgmt/logic/models/get_callback_url_parameters.py
index 0c5c2dacc767..0f913c0ede41 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/get_callback_url_parameters.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/get_callback_url_parameters.py
@@ -24,7 +24,7 @@ class GetCallbackUrlParameters(Model):
 
     _attribute_map = {
         'not_after': {'key': 'notAfter', 'type': 'iso-8601'},
-        'key_type': {'key': 'keyType', 'type': 'KeyType'},
+        'key_type': {'key': 'keyType', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/get_callback_url_parameters_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/get_callback_url_parameters_py3.py
index 0eb2275adef3..0d9612f0eef0 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/get_callback_url_parameters_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/get_callback_url_parameters_py3.py
@@ -24,7 +24,7 @@ class GetCallbackUrlParameters(Model):
 
     _attribute_map = {
         'not_after': {'key': 'notAfter', 'type': 'iso-8601'},
-        'key_type': {'key': 'keyType', 'type': 'KeyType'},
+        'key_type': {'key': 'keyType', 'type': 'str'},
     }
 
     def __init__(self, *, not_after=None, key_type=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py
index 5fad800c2ade..6d4384aa44a5 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py
@@ -77,7 +77,7 @@ class IntegrationAccountAgreement(Resource):
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
         'metadata': {'key': 'properties.metadata', 'type': 'object'},
-        'agreement_type': {'key': 'properties.agreementType', 'type': 'AgreementType'},
+        'agreement_type': {'key': 'properties.agreementType', 'type': 'str'},
         'host_partner': {'key': 'properties.hostPartner', 'type': 'str'},
         'guest_partner': {'key': 'properties.guestPartner', 'type': 'str'},
         'host_identity': {'key': 'properties.hostIdentity', 'type': 'BusinessIdentity'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py
index ed00ee6cf955..23cee38077a5 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py
@@ -28,7 +28,7 @@ class IntegrationAccountAgreementFilter(Model):
     }
 
     _attribute_map = {
-        'agreement_type': {'key': 'agreementType', 'type': 'AgreementType'},
+        'agreement_type': {'key': 'agreementType', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py
index aa7b65c825aa..691b1f4d5e50 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py
@@ -28,7 +28,7 @@ class IntegrationAccountAgreementFilter(Model):
     }
 
     _attribute_map = {
-        'agreement_type': {'key': 'agreementType', 'type': 'AgreementType'},
+        'agreement_type': {'key': 'agreementType', 'type': 'str'},
     }
 
     def __init__(self, *, agreement_type, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py
index 4f6d7c00bb25..46bddc85dca4 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py
@@ -77,7 +77,7 @@ class IntegrationAccountAgreement(Resource):
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
         'metadata': {'key': 'properties.metadata', 'type': 'object'},
-        'agreement_type': {'key': 'properties.agreementType', 'type': 'AgreementType'},
+        'agreement_type': {'key': 'properties.agreementType', 'type': 'str'},
         'host_partner': {'key': 'properties.hostPartner', 'type': 'str'},
         'guest_partner': {'key': 'properties.guestPartner', 'type': 'str'},
         'host_identity': {'key': 'properties.hostIdentity', 'type': 'BusinessIdentity'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map.py
index eca7358d918e..f5c95f26faec 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map.py
@@ -31,7 +31,7 @@ class IntegrationAccountMap(Resource):
     :param tags: The resource tags.
     :type tags: dict[str, str]
     :param map_type: Required. The map type. Possible values include:
-     'NotSpecified', 'Xslt'
+     'NotSpecified', 'Xslt', 'Xslt20', 'Xslt30', 'Liquid'
     :type map_type: str or ~azure.mgmt.logic.models.MapType
     :param parameters_schema: The parameters schema of integration account
      map.
@@ -67,7 +67,7 @@ class IntegrationAccountMap(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'map_type': {'key': 'properties.mapType', 'type': 'MapType'},
+        'map_type': {'key': 'properties.mapType', 'type': 'str'},
         'parameters_schema': {'key': 'properties.parametersSchema', 'type': 'IntegrationAccountMapPropertiesParametersSchema'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_filter.py
index 0854c1f78a89..f9f3839b8884 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_filter.py
@@ -18,7 +18,8 @@ class IntegrationAccountMapFilter(Model):
     All required parameters must be populated in order to send to Azure.
 
     :param map_type: Required. The map type of integration account map.
-     Possible values include: 'NotSpecified', 'Xslt'
+     Possible values include: 'NotSpecified', 'Xslt', 'Xslt20', 'Xslt30',
+     'Liquid'
     :type map_type: str or ~azure.mgmt.logic.models.MapType
     """
 
@@ -27,7 +28,7 @@ class IntegrationAccountMapFilter(Model):
     }
 
     _attribute_map = {
-        'map_type': {'key': 'mapType', 'type': 'MapType'},
+        'map_type': {'key': 'mapType', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_filter_py3.py
index 94e1aaf938f2..b879d2b24b3a 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_filter_py3.py
@@ -18,7 +18,8 @@ class IntegrationAccountMapFilter(Model):
     All required parameters must be populated in order to send to Azure.
 
     :param map_type: Required. The map type of integration account map.
-     Possible values include: 'NotSpecified', 'Xslt'
+     Possible values include: 'NotSpecified', 'Xslt', 'Xslt20', 'Xslt30',
+     'Liquid'
     :type map_type: str or ~azure.mgmt.logic.models.MapType
     """
 
@@ -27,7 +28,7 @@ class IntegrationAccountMapFilter(Model):
     }
 
     _attribute_map = {
-        'map_type': {'key': 'mapType', 'type': 'MapType'},
+        'map_type': {'key': 'mapType', 'type': 'str'},
     }
 
     def __init__(self, *, map_type, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_py3.py
index 27f4da9281b7..757a21c66c60 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_map_py3.py
@@ -31,7 +31,7 @@ class IntegrationAccountMap(Resource):
     :param tags: The resource tags.
     :type tags: dict[str, str]
     :param map_type: Required. The map type. Possible values include:
-     'NotSpecified', 'Xslt'
+     'NotSpecified', 'Xslt', 'Xslt20', 'Xslt30', 'Liquid'
     :type map_type: str or ~azure.mgmt.logic.models.MapType
     :param parameters_schema: The parameters schema of integration account
      map.
@@ -67,7 +67,7 @@ class IntegrationAccountMap(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'map_type': {'key': 'properties.mapType', 'type': 'MapType'},
+        'map_type': {'key': 'properties.mapType', 'type': 'str'},
         'parameters_schema': {'key': 'properties.parametersSchema', 'type': 'IntegrationAccountMapPropertiesParametersSchema'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner.py
index 27abb6538309..5fa492a380a0 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner.py
@@ -59,7 +59,7 @@ class IntegrationAccountPartner(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'partner_type': {'key': 'properties.partnerType', 'type': 'PartnerType'},
+        'partner_type': {'key': 'properties.partnerType', 'type': 'str'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
         'metadata': {'key': 'properties.metadata', 'type': 'object'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_filter.py
index 97e127714cf1..7f20147bc657 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_filter.py
@@ -27,7 +27,7 @@ class IntegrationAccountPartnerFilter(Model):
     }
 
     _attribute_map = {
-        'partner_type': {'key': 'partnerType', 'type': 'PartnerType'},
+        'partner_type': {'key': 'partnerType', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_filter_py3.py
index e96805f485b6..52cb68a5c8c4 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_filter_py3.py
@@ -27,7 +27,7 @@ class IntegrationAccountPartnerFilter(Model):
     }
 
     _attribute_map = {
-        'partner_type': {'key': 'partnerType', 'type': 'PartnerType'},
+        'partner_type': {'key': 'partnerType', 'type': 'str'},
     }
 
     def __init__(self, *, partner_type, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_py3.py
index 7c6af813aa42..358e7d1caed7 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_partner_py3.py
@@ -59,7 +59,7 @@ class IntegrationAccountPartner(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'partner_type': {'key': 'properties.partnerType', 'type': 'PartnerType'},
+        'partner_type': {'key': 'properties.partnerType', 'type': 'str'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
         'metadata': {'key': 'properties.metadata', 'type': 'object'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema.py
index e528830cdb2e..96d988a5c8b2 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema.py
@@ -69,7 +69,7 @@ class IntegrationAccountSchema(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'schema_type': {'key': 'properties.schemaType', 'type': 'SchemaType'},
+        'schema_type': {'key': 'properties.schemaType', 'type': 'str'},
         'target_namespace': {'key': 'properties.targetNamespace', 'type': 'str'},
         'document_name': {'key': 'properties.documentName', 'type': 'str'},
         'file_name': {'key': 'properties.fileName', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_filter.py
index 96d624e2ac45..12ee48fa602b 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_filter.py
@@ -27,7 +27,7 @@ class IntegrationAccountSchemaFilter(Model):
     }
 
     _attribute_map = {
-        'schema_type': {'key': 'schemaType', 'type': 'SchemaType'},
+        'schema_type': {'key': 'schemaType', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_filter_py3.py
index 17303ce6eac2..249f96cb661e 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_filter_py3.py
@@ -27,7 +27,7 @@ class IntegrationAccountSchemaFilter(Model):
     }
 
     _attribute_map = {
-        'schema_type': {'key': 'schemaType', 'type': 'SchemaType'},
+        'schema_type': {'key': 'schemaType', 'type': 'str'},
     }
 
     def __init__(self, *, schema_type, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_py3.py
index e6b6b3bcd072..179271f3c2b3 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_schema_py3.py
@@ -69,7 +69,7 @@ class IntegrationAccountSchema(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'schema_type': {'key': 'properties.schemaType', 'type': 'SchemaType'},
+        'schema_type': {'key': 'properties.schemaType', 'type': 'str'},
         'target_namespace': {'key': 'properties.targetNamespace', 'type': 'str'},
         'document_name': {'key': 'properties.documentName', 'type': 'str'},
         'file_name': {'key': 'properties.fileName', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_sku.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_sku.py
index 9701f9b19f3e..7d87a9605159 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_sku.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_sku.py
@@ -18,7 +18,7 @@ class IntegrationAccountSku(Model):
     All required parameters must be populated in order to send to Azure.
 
     :param name: Required. The sku name. Possible values include:
-     'NotSpecified', 'Free', 'Standard'
+     'NotSpecified', 'Free', 'Basic', 'Standard'
     :type name: str or ~azure.mgmt.logic.models.IntegrationAccountSkuName
     """
 
@@ -27,7 +27,7 @@ class IntegrationAccountSku(Model):
     }
 
     _attribute_map = {
-        'name': {'key': 'name', 'type': 'IntegrationAccountSkuName'},
+        'name': {'key': 'name', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_sku_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_sku_py3.py
index a7eeab01946b..9a3d01071902 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_sku_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_sku_py3.py
@@ -18,7 +18,7 @@ class IntegrationAccountSku(Model):
     All required parameters must be populated in order to send to Azure.
 
     :param name: Required. The sku name. Possible values include:
-     'NotSpecified', 'Free', 'Standard'
+     'NotSpecified', 'Free', 'Basic', 'Standard'
     :type name: str or ~azure.mgmt.logic.models.IntegrationAccountSkuName
     """
 
@@ -27,7 +27,7 @@ class IntegrationAccountSku(Model):
     }
 
     _attribute_map = {
-        'name': {'key': 'name', 'type': 'IntegrationAccountSkuName'},
+        'name': {'key': 'name', 'type': 'str'},
     }
 
     def __init__(self, *, name, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py b/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py
index 285aeb025198..402d02db10f6 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py
@@ -151,6 +151,7 @@ class IntegrationAccountSkuName(str, Enum):
 
     not_specified = "NotSpecified"
     free = "Free"
+    basic = "Basic"
     standard = "Standard"
 
 
@@ -164,6 +165,9 @@ class MapType(str, Enum):
 
     not_specified = "NotSpecified"
     xslt = "Xslt"
+    xslt20 = "Xslt20"
+    xslt30 = "Xslt30"
+    liquid = "Liquid"
 
 
 class PartnerType(str, Enum):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/operation_result.py b/azure-mgmt-logic/azure/mgmt/logic/models/operation_result.py
index 6906151ab408..9461b110569b 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/operation_result.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/operation_result.py
@@ -64,7 +64,7 @@ class OperationResult(OperationResultProperties):
         'start_time': {'key': 'startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'endTime', 'type': 'iso-8601'},
         'correlation': {'key': 'correlation', 'type': 'RunActionCorrelation'},
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
         'code': {'key': 'code', 'type': 'str'},
         'error': {'key': 'error', 'type': 'object'},
         'tracking_id': {'key': 'trackingId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_properties.py b/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_properties.py
index 9e65b94ae7b9..5a61d0c31ce5 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_properties.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_properties.py
@@ -36,7 +36,7 @@ class OperationResultProperties(Model):
         'start_time': {'key': 'startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'endTime', 'type': 'iso-8601'},
         'correlation': {'key': 'correlation', 'type': 'RunActionCorrelation'},
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
         'code': {'key': 'code', 'type': 'str'},
         'error': {'key': 'error', 'type': 'object'},
     }
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_properties_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_properties_py3.py
index 33aa9fdbebcf..41f30d58eae8 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_properties_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_properties_py3.py
@@ -36,7 +36,7 @@ class OperationResultProperties(Model):
         'start_time': {'key': 'startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'endTime', 'type': 'iso-8601'},
         'correlation': {'key': 'correlation', 'type': 'RunActionCorrelation'},
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
         'code': {'key': 'code', 'type': 'str'},
         'error': {'key': 'error', 'type': 'object'},
     }
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_py3.py
index f853db10b4e6..ef58ac973b49 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/operation_result_py3.py
@@ -64,7 +64,7 @@ class OperationResult(OperationResultProperties):
         'start_time': {'key': 'startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'endTime', 'type': 'iso-8601'},
         'correlation': {'key': 'correlation', 'type': 'RunActionCorrelation'},
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
         'code': {'key': 'code', 'type': 'str'},
         'error': {'key': 'error', 'type': 'object'},
         'tracking_id': {'key': 'trackingId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py
index 7fdfd3fb5d71..4a0c226bfc3e 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py
@@ -31,7 +31,7 @@ class RecurrenceSchedule(Model):
     _attribute_map = {
         'minutes': {'key': 'minutes', 'type': '[int]'},
         'hours': {'key': 'hours', 'type': '[int]'},
-        'week_days': {'key': 'weekDays', 'type': '[DaysOfWeek]'},
+        'week_days': {'key': 'weekDays', 'type': '[str]'},
         'month_days': {'key': 'monthDays', 'type': '[int]'},
         'monthly_occurrences': {'key': 'monthlyOccurrences', 'type': '[RecurrenceScheduleOccurrence]'},
     }
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py
index b32dbc67e712..71308e754c50 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py
@@ -23,7 +23,7 @@ class RecurrenceScheduleOccurrence(Model):
     """
 
     _attribute_map = {
-        'day': {'key': 'day', 'type': 'DayOfWeek'},
+        'day': {'key': 'day', 'type': 'str'},
         'occurrence': {'key': 'occurrence', 'type': 'int'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py
index 1bdaee939cc9..65a779eec3e8 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py
@@ -23,7 +23,7 @@ class RecurrenceScheduleOccurrence(Model):
     """
 
     _attribute_map = {
-        'day': {'key': 'day', 'type': 'DayOfWeek'},
+        'day': {'key': 'day', 'type': 'str'},
         'occurrence': {'key': 'occurrence', 'type': 'int'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py
index 68c42503da65..08b5d5d7df10 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py
@@ -31,7 +31,7 @@ class RecurrenceSchedule(Model):
     _attribute_map = {
         'minutes': {'key': 'minutes', 'type': '[int]'},
         'hours': {'key': 'hours', 'type': '[int]'},
-        'week_days': {'key': 'weekDays', 'type': '[DaysOfWeek]'},
+        'week_days': {'key': 'weekDays', 'type': '[str]'},
         'month_days': {'key': 'monthDays', 'type': '[int]'},
         'monthly_occurrences': {'key': 'monthlyOccurrences', 'type': '[RecurrenceScheduleOccurrence]'},
     }
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/regenerate_action_parameter.py b/azure-mgmt-logic/azure/mgmt/logic/models/regenerate_action_parameter.py
index 3538c5b92b6c..8eeb3ee018fe 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/regenerate_action_parameter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/regenerate_action_parameter.py
@@ -21,7 +21,7 @@ class RegenerateActionParameter(Model):
     """
 
     _attribute_map = {
-        'key_type': {'key': 'keyType', 'type': 'KeyType'},
+        'key_type': {'key': 'keyType', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/regenerate_action_parameter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/regenerate_action_parameter_py3.py
index 3594196789eb..5539f5f516f2 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/regenerate_action_parameter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/regenerate_action_parameter_py3.py
@@ -21,7 +21,7 @@ class RegenerateActionParameter(Model):
     """
 
     _attribute_map = {
-        'key_type': {'key': 'keyType', 'type': 'KeyType'},
+        'key_type': {'key': 'keyType', 'type': 'str'},
     }
 
     def __init__(self, *, key_type=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/sku.py b/azure-mgmt-logic/azure/mgmt/logic/models/sku.py
index 6f430383280c..6fb044da22b3 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/sku.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/sku.py
@@ -29,7 +29,7 @@ class Sku(Model):
     }
 
     _attribute_map = {
-        'name': {'key': 'name', 'type': 'SkuName'},
+        'name': {'key': 'name', 'type': 'str'},
         'plan': {'key': 'plan', 'type': 'ResourceReference'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/sku_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/sku_py3.py
index 750447b6cdc2..f8dfc5c7f277 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/sku_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/sku_py3.py
@@ -29,7 +29,7 @@ class Sku(Model):
     }
 
     _attribute_map = {
-        'name': {'key': 'name', 'type': 'SkuName'},
+        'name': {'key': 'name', 'type': 'str'},
         'plan': {'key': 'plan', 'type': 'ResourceReference'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py
index 0148f09bddf3..56d123ddfd51 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py
@@ -42,9 +42,9 @@ class TrackingEvent(Model):
     }
 
     _attribute_map = {
-        'event_level': {'key': 'eventLevel', 'type': 'EventLevel'},
+        'event_level': {'key': 'eventLevel', 'type': 'str'},
         'event_time': {'key': 'eventTime', 'type': 'iso-8601'},
-        'record_type': {'key': 'recordType', 'type': 'TrackingRecordType'},
+        'record_type': {'key': 'recordType', 'type': 'str'},
         'error': {'key': 'error', 'type': 'TrackingEventErrorInfo'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py
index ba57b9107f57..472692e6d6f1 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py
@@ -42,9 +42,9 @@ class TrackingEvent(Model):
     }
 
     _attribute_map = {
-        'event_level': {'key': 'eventLevel', 'type': 'EventLevel'},
+        'event_level': {'key': 'eventLevel', 'type': 'str'},
         'event_time': {'key': 'eventTime', 'type': 'iso-8601'},
-        'record_type': {'key': 'recordType', 'type': 'TrackingRecordType'},
+        'record_type': {'key': 'recordType', 'type': 'str'},
         'error': {'key': 'error', 'type': 'TrackingEventErrorInfo'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_events_definition.py b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_events_definition.py
index 7ac2420546cc..5a6dbfdc7261 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_events_definition.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_events_definition.py
@@ -34,7 +34,7 @@ class TrackingEventsDefinition(Model):
 
     _attribute_map = {
         'source_type': {'key': 'sourceType', 'type': 'str'},
-        'track_events_options': {'key': 'trackEventsOptions', 'type': 'TrackEventsOperationOptions'},
+        'track_events_options': {'key': 'trackEventsOptions', 'type': 'str'},
         'events': {'key': 'events', 'type': '[TrackingEvent]'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_events_definition_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_events_definition_py3.py
index 97819d3dc968..daa5205fdcab 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_events_definition_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_events_definition_py3.py
@@ -34,7 +34,7 @@ class TrackingEventsDefinition(Model):
 
     _attribute_map = {
         'source_type': {'key': 'sourceType', 'type': 'str'},
-        'track_events_options': {'key': 'trackEventsOptions', 'type': 'TrackEventsOperationOptions'},
+        'track_events_options': {'key': 'trackEventsOptions', 'type': 'str'},
         'events': {'key': 'events', 'type': '[TrackingEvent]'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow.py
index 6ba75fdbaead..3eb751a61197 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow.py
@@ -73,10 +73,10 @@ class Workflow(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'WorkflowProvisioningState'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
-        'state': {'key': 'properties.state', 'type': 'WorkflowState'},
+        'state': {'key': 'properties.state', 'type': 'str'},
         'version': {'key': 'properties.version', 'type': 'str'},
         'access_endpoint': {'key': 'properties.accessEndpoint', 'type': 'str'},
         'sku': {'key': 'properties.sku', 'type': 'Sku'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_filter.py
index 0175b536c69b..549db586e998 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_filter.py
@@ -21,7 +21,7 @@ class WorkflowFilter(Model):
     """
 
     _attribute_map = {
-        'state': {'key': 'state', 'type': 'WorkflowState'},
+        'state': {'key': 'state', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_filter_py3.py
index 7efc6c47d063..d6198d9cebd5 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_filter_py3.py
@@ -21,7 +21,7 @@ class WorkflowFilter(Model):
     """
 
     _attribute_map = {
-        'state': {'key': 'state', 'type': 'WorkflowState'},
+        'state': {'key': 'state', 'type': 'str'},
     }
 
     def __init__(self, *, state=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_output_parameter.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_output_parameter.py
index cb568ef000f2..e2fb9dd653f9 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_output_parameter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_output_parameter.py
@@ -36,7 +36,7 @@ class WorkflowOutputParameter(WorkflowParameter):
     }
 
     _attribute_map = {
-        'type': {'key': 'type', 'type': 'ParameterType'},
+        'type': {'key': 'type', 'type': 'str'},
         'value': {'key': 'value', 'type': 'object'},
         'metadata': {'key': 'metadata', 'type': 'object'},
         'description': {'key': 'description', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_output_parameter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_output_parameter_py3.py
index 56d6c1a336f5..3888935a41b6 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_output_parameter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_output_parameter_py3.py
@@ -36,7 +36,7 @@ class WorkflowOutputParameter(WorkflowParameter):
     }
 
     _attribute_map = {
-        'type': {'key': 'type', 'type': 'ParameterType'},
+        'type': {'key': 'type', 'type': 'str'},
         'value': {'key': 'value', 'type': 'object'},
         'metadata': {'key': 'metadata', 'type': 'object'},
         'description': {'key': 'description', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_parameter.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_parameter.py
index 14c6c49ec41f..a8324aa0e4cf 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_parameter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_parameter.py
@@ -27,7 +27,7 @@ class WorkflowParameter(Model):
     """
 
     _attribute_map = {
-        'type': {'key': 'type', 'type': 'ParameterType'},
+        'type': {'key': 'type', 'type': 'str'},
         'value': {'key': 'value', 'type': 'object'},
         'metadata': {'key': 'metadata', 'type': 'object'},
         'description': {'key': 'description', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_parameter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_parameter_py3.py
index f40a0753d708..3520713bd806 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_parameter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_parameter_py3.py
@@ -27,7 +27,7 @@ class WorkflowParameter(Model):
     """
 
     _attribute_map = {
-        'type': {'key': 'type', 'type': 'ParameterType'},
+        'type': {'key': 'type', 'type': 'str'},
         'value': {'key': 'value', 'type': 'object'},
         'metadata': {'key': 'metadata', 'type': 'object'},
         'description': {'key': 'description', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_py3.py
index 2183f7ec9e8e..426874912e25 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_py3.py
@@ -73,10 +73,10 @@ class Workflow(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'WorkflowProvisioningState'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
-        'state': {'key': 'properties.state', 'type': 'WorkflowState'},
+        'state': {'key': 'properties.state', 'type': 'str'},
         'version': {'key': 'properties.version', 'type': 'str'},
         'access_endpoint': {'key': 'properties.accessEndpoint', 'type': 'str'},
         'sku': {'key': 'properties.sku', 'type': 'Sku'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run.py
index 29b942f78095..b50625d98578 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run.py
@@ -75,7 +75,7 @@ class WorkflowRun(SubResource):
         'wait_end_time': {'key': 'properties.waitEndTime', 'type': 'iso-8601'},
         'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'code': {'key': 'properties.code', 'type': 'str'},
         'error': {'key': 'properties.error', 'type': 'object'},
         'correlation_id': {'key': 'properties.correlationId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action.py
index 109e7abd552a..da538a7febbc 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action.py
@@ -69,7 +69,7 @@ class WorkflowRunAction(SubResource):
         'id': {'key': 'id', 'type': 'str'},
         'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'code': {'key': 'properties.code', 'type': 'str'},
         'error': {'key': 'properties.error', 'type': 'object'},
         'tracking_id': {'key': 'properties.trackingId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_filter.py
index ae0f4aea8ea1..a8f4cb3b42a2 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_filter.py
@@ -23,7 +23,7 @@ class WorkflowRunActionFilter(Model):
     """
 
     _attribute_map = {
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_filter_py3.py
index a2bdf89cd7f1..4be8cc72a7ae 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_filter_py3.py
@@ -23,7 +23,7 @@ class WorkflowRunActionFilter(Model):
     """
 
     _attribute_map = {
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
     }
 
     def __init__(self, *, status=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_py3.py
index c2bdbc2c31ef..55f6f04efd36 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_py3.py
@@ -69,7 +69,7 @@ class WorkflowRunAction(SubResource):
         'id': {'key': 'id', 'type': 'str'},
         'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'code': {'key': 'properties.code', 'type': 'str'},
         'error': {'key': 'properties.error', 'type': 'object'},
         'tracking_id': {'key': 'properties.trackingId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_repetition_definition.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_repetition_definition.py
index 0c66a57624a2..9641f4bf5efd 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_repetition_definition.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_repetition_definition.py
@@ -84,7 +84,7 @@ class WorkflowRunActionRepetitionDefinition(Resource):
         'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
         'correlation': {'key': 'properties.correlation', 'type': 'RunActionCorrelation'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'code': {'key': 'properties.code', 'type': 'str'},
         'error': {'key': 'properties.error', 'type': 'object'},
         'tracking_id': {'key': 'properties.trackingId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_repetition_definition_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_repetition_definition_py3.py
index d2f922d27aef..292223cb763a 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_repetition_definition_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_action_repetition_definition_py3.py
@@ -84,7 +84,7 @@ class WorkflowRunActionRepetitionDefinition(Resource):
         'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
         'correlation': {'key': 'properties.correlation', 'type': 'RunActionCorrelation'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'code': {'key': 'properties.code', 'type': 'str'},
         'error': {'key': 'properties.error', 'type': 'object'},
         'tracking_id': {'key': 'properties.trackingId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_filter.py
index 99f92563b4a8..0aef8eda5ff0 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_filter.py
@@ -23,7 +23,7 @@ class WorkflowRunFilter(Model):
     """
 
     _attribute_map = {
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_filter_py3.py
index b118d686766e..b79a254ff7a8 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_filter_py3.py
@@ -23,7 +23,7 @@ class WorkflowRunFilter(Model):
     """
 
     _attribute_map = {
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
     }
 
     def __init__(self, *, status=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_py3.py
index 4346f0b4550a..25325bb406a0 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_py3.py
@@ -75,7 +75,7 @@ class WorkflowRun(SubResource):
         'wait_end_time': {'key': 'properties.waitEndTime', 'type': 'iso-8601'},
         'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'code': {'key': 'properties.code', 'type': 'str'},
         'error': {'key': 'properties.error', 'type': 'object'},
         'correlation_id': {'key': 'properties.correlationId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_trigger.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_trigger.py
index 5601c36ac0ed..5d72f0d0377c 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_trigger.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_trigger.py
@@ -78,7 +78,7 @@ class WorkflowRunTrigger(Model):
         'tracking_id': {'key': 'trackingId', 'type': 'str'},
         'correlation': {'key': 'correlation', 'type': 'Correlation'},
         'code': {'key': 'code', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
         'error': {'key': 'error', 'type': 'object'},
         'tracked_properties': {'key': 'trackedProperties', 'type': 'object'},
     }
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_trigger_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_trigger_py3.py
index eae9e8073abb..2e6c960a2317 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_trigger_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_run_trigger_py3.py
@@ -78,7 +78,7 @@ class WorkflowRunTrigger(Model):
         'tracking_id': {'key': 'trackingId', 'type': 'str'},
         'correlation': {'key': 'correlation', 'type': 'Correlation'},
         'code': {'key': 'code', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
         'error': {'key': 'error', 'type': 'object'},
         'tracked_properties': {'key': 'trackedProperties', 'type': 'object'},
     }
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger.py
index 2555cd97ca74..830aac41563e 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger.py
@@ -69,11 +69,11 @@ class WorkflowTrigger(SubResource):
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'WorkflowTriggerProvisioningState'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
-        'state': {'key': 'properties.state', 'type': 'WorkflowState'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'state': {'key': 'properties.state', 'type': 'str'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'last_execution_time': {'key': 'properties.lastExecutionTime', 'type': 'iso-8601'},
         'next_execution_time': {'key': 'properties.nextExecutionTime', 'type': 'iso-8601'},
         'recurrence': {'key': 'properties.recurrence', 'type': 'WorkflowTriggerRecurrence'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_filter.py
index 7ea79307eccf..b0236b37e19b 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_filter.py
@@ -21,7 +21,7 @@ class WorkflowTriggerFilter(Model):
     """
 
     _attribute_map = {
-        'state': {'key': 'state', 'type': 'WorkflowState'},
+        'state': {'key': 'state', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_filter_py3.py
index 2a321508bebb..9948517c3183 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_filter_py3.py
@@ -21,7 +21,7 @@ class WorkflowTriggerFilter(Model):
     """
 
     _attribute_map = {
-        'state': {'key': 'state', 'type': 'WorkflowState'},
+        'state': {'key': 'state', 'type': 'str'},
     }
 
     def __init__(self, *, state=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history.py
index 1ff54dbeaf1b..5e69498a6711 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history.py
@@ -70,7 +70,7 @@ class WorkflowTriggerHistory(SubResource):
         'id': {'key': 'id', 'type': 'str'},
         'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'code': {'key': 'properties.code', 'type': 'str'},
         'error': {'key': 'properties.error', 'type': 'object'},
         'tracking_id': {'key': 'properties.trackingId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_filter.py
index 082b1dfd11bf..0445f68dd948 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_filter.py
@@ -23,7 +23,7 @@ class WorkflowTriggerHistoryFilter(Model):
     """
 
     _attribute_map = {
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_filter_py3.py
index e696821bfff2..1159f3f1d618 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_filter_py3.py
@@ -23,7 +23,7 @@ class WorkflowTriggerHistoryFilter(Model):
     """
 
     _attribute_map = {
-        'status': {'key': 'status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'status', 'type': 'str'},
     }
 
     def __init__(self, *, status=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_py3.py
index 315faa696b02..60b7bc386d0a 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_history_py3.py
@@ -70,7 +70,7 @@ class WorkflowTriggerHistory(SubResource):
         'id': {'key': 'id', 'type': 'str'},
         'start_time': {'key': 'properties.startTime', 'type': 'iso-8601'},
         'end_time': {'key': 'properties.endTime', 'type': 'iso-8601'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'code': {'key': 'properties.code', 'type': 'str'},
         'error': {'key': 'properties.error', 'type': 'object'},
         'tracking_id': {'key': 'properties.trackingId', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_py3.py
index 361c7a1a45a2..ee0caecb66a2 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_py3.py
@@ -69,11 +69,11 @@ class WorkflowTrigger(SubResource):
 
     _attribute_map = {
         'id': {'key': 'id', 'type': 'str'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'WorkflowTriggerProvisioningState'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
-        'state': {'key': 'properties.state', 'type': 'WorkflowState'},
-        'status': {'key': 'properties.status', 'type': 'WorkflowStatus'},
+        'state': {'key': 'properties.state', 'type': 'str'},
+        'status': {'key': 'properties.status', 'type': 'str'},
         'last_execution_time': {'key': 'properties.lastExecutionTime', 'type': 'iso-8601'},
         'next_execution_time': {'key': 'properties.nextExecutionTime', 'type': 'iso-8601'},
         'recurrence': {'key': 'properties.recurrence', 'type': 'WorkflowTriggerRecurrence'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_recurrence.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_recurrence.py
index 36bc585fbfff..cb1b56e5f228 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_recurrence.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_recurrence.py
@@ -31,7 +31,7 @@ class WorkflowTriggerRecurrence(Model):
     """
 
     _attribute_map = {
-        'frequency': {'key': 'frequency', 'type': 'RecurrenceFrequency'},
+        'frequency': {'key': 'frequency', 'type': 'str'},
         'interval': {'key': 'interval', 'type': 'int'},
         'start_time': {'key': 'startTime', 'type': 'str'},
         'end_time': {'key': 'endTime', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_recurrence_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_recurrence_py3.py
index b437623a94f6..e50675b5db36 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_recurrence_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_trigger_recurrence_py3.py
@@ -31,7 +31,7 @@ class WorkflowTriggerRecurrence(Model):
     """
 
     _attribute_map = {
-        'frequency': {'key': 'frequency', 'type': 'RecurrenceFrequency'},
+        'frequency': {'key': 'frequency', 'type': 'str'},
         'interval': {'key': 'interval', 'type': 'int'},
         'start_time': {'key': 'startTime', 'type': 'str'},
         'end_time': {'key': 'endTime', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_version.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_version.py
index dfff86d6a134..ada5d76501f0 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_version.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_version.py
@@ -67,7 +67,7 @@ class WorkflowVersion(Resource):
         'tags': {'key': 'tags', 'type': '{str}'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
-        'state': {'key': 'properties.state', 'type': 'WorkflowState'},
+        'state': {'key': 'properties.state', 'type': 'str'},
         'version': {'key': 'properties.version', 'type': 'str'},
         'access_endpoint': {'key': 'properties.accessEndpoint', 'type': 'str'},
         'sku': {'key': 'properties.sku', 'type': 'Sku'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_version_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_version_py3.py
index dfc3e8d65951..26bf2042e5b8 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/workflow_version_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/workflow_version_py3.py
@@ -67,7 +67,7 @@ class WorkflowVersion(Resource):
         'tags': {'key': 'tags', 'type': '{str}'},
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
-        'state': {'key': 'properties.state', 'type': 'WorkflowState'},
+        'state': {'key': 'properties.state', 'type': 'str'},
         'version': {'key': 'properties.version', 'type': 'str'},
         'access_endpoint': {'key': 'properties.accessEndpoint', 'type': 'str'},
         'sku': {'key': 'properties.sku', 'type': 'Sku'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py
index ee545215c677..ee6f39190c38 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py
@@ -56,7 +56,7 @@ class X12DelimiterOverrides(Model):
         'data_element_separator': {'key': 'dataElementSeparator', 'type': 'int'},
         'component_separator': {'key': 'componentSeparator', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
         'replace_character': {'key': 'replaceCharacter', 'type': 'int'},
         'replace_separators_in_payload': {'key': 'replaceSeparatorsInPayload', 'type': 'bool'},
         'target_namespace': {'key': 'targetNamespace', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py
index c2333de8a794..193867ce4458 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py
@@ -56,7 +56,7 @@ class X12DelimiterOverrides(Model):
         'data_element_separator': {'key': 'dataElementSeparator', 'type': 'int'},
         'component_separator': {'key': 'componentSeparator', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
         'replace_character': {'key': 'replaceCharacter', 'type': 'int'},
         'replace_separators_in_payload': {'key': 'replaceSeparatorsInPayload', 'type': 'bool'},
         'target_namespace': {'key': 'targetNamespace', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_override.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_override.py
index fe2bc38c8ed3..93f12406b522 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_override.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_override.py
@@ -65,8 +65,8 @@ class X12EnvelopeOverride(Model):
         'sender_application_id': {'key': 'senderApplicationId', 'type': 'str'},
         'receiver_application_id': {'key': 'receiverApplicationId', 'type': 'str'},
         'functional_identifier_code': {'key': 'functionalIdentifierCode', 'type': 'str'},
-        'date_format': {'key': 'dateFormat', 'type': 'X12DateFormat'},
-        'time_format': {'key': 'timeFormat', 'type': 'X12TimeFormat'},
+        'date_format': {'key': 'dateFormat', 'type': 'str'},
+        'time_format': {'key': 'timeFormat', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_override_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_override_py3.py
index 4c25df099fef..a948c9bdc3cf 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_override_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_override_py3.py
@@ -65,8 +65,8 @@ class X12EnvelopeOverride(Model):
         'sender_application_id': {'key': 'senderApplicationId', 'type': 'str'},
         'receiver_application_id': {'key': 'receiverApplicationId', 'type': 'str'},
         'functional_identifier_code': {'key': 'functionalIdentifierCode', 'type': 'str'},
-        'date_format': {'key': 'dateFormat', 'type': 'X12DateFormat'},
-        'time_format': {'key': 'timeFormat', 'type': 'X12TimeFormat'},
+        'date_format': {'key': 'dateFormat', 'type': 'str'},
+        'time_format': {'key': 'timeFormat', 'type': 'str'},
     }
 
     def __init__(self, *, target_namespace: str, protocol_version: str, message_id: str, responsible_agency_code: str, header_version: str, sender_application_id: str, receiver_application_id: str, date_format, time_format, functional_identifier_code: str=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_settings.py
index 135261790cb2..65c4418b9822 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_settings.py
@@ -135,9 +135,9 @@ class X12EnvelopeSettings(Model):
         'transaction_set_control_number_prefix': {'key': 'transactionSetControlNumberPrefix', 'type': 'str'},
         'transaction_set_control_number_suffix': {'key': 'transactionSetControlNumberSuffix', 'type': 'str'},
         'overwrite_existing_transaction_set_control_number': {'key': 'overwriteExistingTransactionSetControlNumber', 'type': 'bool'},
-        'group_header_date_format': {'key': 'groupHeaderDateFormat', 'type': 'X12DateFormat'},
-        'group_header_time_format': {'key': 'groupHeaderTimeFormat', 'type': 'X12TimeFormat'},
-        'usage_indicator': {'key': 'usageIndicator', 'type': 'UsageIndicator'},
+        'group_header_date_format': {'key': 'groupHeaderDateFormat', 'type': 'str'},
+        'group_header_time_format': {'key': 'groupHeaderTimeFormat', 'type': 'str'},
+        'usage_indicator': {'key': 'usageIndicator', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_settings_py3.py
index 8a4bf0b5b7ea..a46cc19a7b48 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_envelope_settings_py3.py
@@ -135,9 +135,9 @@ class X12EnvelopeSettings(Model):
         'transaction_set_control_number_prefix': {'key': 'transactionSetControlNumberPrefix', 'type': 'str'},
         'transaction_set_control_number_suffix': {'key': 'transactionSetControlNumberSuffix', 'type': 'str'},
         'overwrite_existing_transaction_set_control_number': {'key': 'overwriteExistingTransactionSetControlNumber', 'type': 'bool'},
-        'group_header_date_format': {'key': 'groupHeaderDateFormat', 'type': 'X12DateFormat'},
-        'group_header_time_format': {'key': 'groupHeaderTimeFormat', 'type': 'X12TimeFormat'},
-        'usage_indicator': {'key': 'usageIndicator', 'type': 'UsageIndicator'},
+        'group_header_date_format': {'key': 'groupHeaderDateFormat', 'type': 'str'},
+        'group_header_time_format': {'key': 'groupHeaderTimeFormat', 'type': 'str'},
+        'usage_indicator': {'key': 'usageIndicator', 'type': 'str'},
     }
 
     def __init__(self, *, control_standards_id: int, use_control_standards_id_as_repetition_character: bool, sender_application_id: str, receiver_application_id: str, control_version_number: str, interchange_control_number_lower_bound: int, interchange_control_number_upper_bound: int, rollover_interchange_control_number: bool, enable_default_group_headers: bool, group_control_number_lower_bound: int, group_control_number_upper_bound: int, rollover_group_control_number: bool, group_header_agency_code: str, group_header_version: str, transaction_set_control_number_lower_bound: int, transaction_set_control_number_upper_bound: int, rollover_transaction_set_control_number: bool, overwrite_existing_transaction_set_control_number: bool, group_header_date_format, group_header_time_format, usage_indicator, functional_group_id: str=None, transaction_set_control_number_prefix: str=None, transaction_set_control_number_suffix: str=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py
index ef590fc24825..9799aac0e65b 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py
@@ -53,8 +53,8 @@ class X12FramingSettings(Model):
         'replace_separators_in_payload': {'key': 'replaceSeparatorsInPayload', 'type': 'bool'},
         'replace_character': {'key': 'replaceCharacter', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
-        'character_set': {'key': 'characterSet', 'type': 'X12CharacterSet'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
+        'character_set': {'key': 'characterSet', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py
index 9696f6411129..42d0aec04043 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py
@@ -53,8 +53,8 @@ class X12FramingSettings(Model):
         'replace_separators_in_payload': {'key': 'replaceSeparatorsInPayload', 'type': 'bool'},
         'replace_character': {'key': 'replaceCharacter', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
-        'character_set': {'key': 'characterSet', 'type': 'X12CharacterSet'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
+        'character_set': {'key': 'characterSet', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
     }
 
     def __init__(self, *, data_element_separator: int, component_separator: int, replace_separators_in_payload: bool, replace_character: int, segment_terminator: int, character_set, segment_terminator_suffix, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_message_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_message_filter.py
index a560cb141ce8..cfcbb4579685 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_message_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_message_filter.py
@@ -28,7 +28,7 @@ class X12MessageFilter(Model):
     }
 
     _attribute_map = {
-        'message_filter_type': {'key': 'messageFilterType', 'type': 'MessageFilterType'},
+        'message_filter_type': {'key': 'messageFilterType', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_message_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_message_filter_py3.py
index beb332725f2d..052e4feeb2d3 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_message_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_message_filter_py3.py
@@ -28,7 +28,7 @@ class X12MessageFilter(Model):
     }
 
     _attribute_map = {
-        'message_filter_type': {'key': 'messageFilterType', 'type': 'MessageFilterType'},
+        'message_filter_type': {'key': 'messageFilterType', 'type': 'str'},
     }
 
     def __init__(self, *, message_filter_type, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override.py
index 1b5e384734ca..6ec4b95c0e0e 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override.py
@@ -59,7 +59,7 @@ class X12ValidationOverride(Model):
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'validate_character_set': {'key': 'validateCharacterSet', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
-        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'TrailingSeparatorPolicy'},
+        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override_py3.py
index 9f80ba560202..00ebda132bd4 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override_py3.py
@@ -59,7 +59,7 @@ class X12ValidationOverride(Model):
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'validate_character_set': {'key': 'validateCharacterSet', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
-        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'TrailingSeparatorPolicy'},
+        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
     }
 
     def __init__(self, *, message_id: str, validate_edi_types: bool, validate_xsd_types: bool, allow_leading_and_trailing_spaces_and_zeroes: bool, validate_character_set: bool, trim_leading_and_trailing_spaces_and_zeroes: bool, trailing_separator_policy, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings.py
index 107e1849a2c5..315bcafddafe 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings.py
@@ -74,7 +74,7 @@ class X12ValidationSettings(Model):
         'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
-        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'TrailingSeparatorPolicy'},
+        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings_py3.py
index 3873b10dfce9..21c23d37298d 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings_py3.py
@@ -74,7 +74,7 @@ class X12ValidationSettings(Model):
         'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
-        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'TrailingSeparatorPolicy'},
+        'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
     }
 
     def __init__(self, *, validate_character_set: bool, check_duplicate_interchange_control_number: bool, interchange_control_number_validity_days: int, check_duplicate_group_control_number: bool, check_duplicate_transaction_set_control_number: bool, validate_edi_types: bool, validate_xsd_types: bool, allow_leading_and_trailing_spaces_and_zeroes: bool, trim_leading_and_trailing_spaces_and_zeroes: bool, trailing_separator_policy, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/__init__.py b/azure-mgmt-logic/azure/mgmt/logic/operations/__init__.py
index b2facd3995b3..4f914d51fe35 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/__init__.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/__init__.py
@@ -12,39 +12,43 @@
 from .workflows_operations import WorkflowsOperations
 from .workflow_versions_operations import WorkflowVersionsOperations
 from .workflow_triggers_operations import WorkflowTriggersOperations
+from .workflow_version_triggers_operations import WorkflowVersionTriggersOperations
 from .workflow_trigger_histories_operations import WorkflowTriggerHistoriesOperations
 from .workflow_runs_operations import WorkflowRunsOperations
 from .workflow_run_actions_operations import WorkflowRunActionsOperations
 from .workflow_run_action_repetitions_operations import WorkflowRunActionRepetitionsOperations
-from .workflow_run_action_scoped_repetitions_operations import WorkflowRunActionScopedRepetitionsOperations
+from .workflow_run_action_scope_repetitions_operations import WorkflowRunActionScopeRepetitionsOperations
 from .workflow_run_operations import WorkflowRunOperations
 from .integration_accounts_operations import IntegrationAccountsOperations
 from .integration_account_assemblies_operations import IntegrationAccountAssembliesOperations
 from .integration_account_batch_configurations_operations import IntegrationAccountBatchConfigurationsOperations
-from .schemas_operations import SchemasOperations
-from .maps_operations import MapsOperations
-from .partners_operations import PartnersOperations
-from .agreements_operations import AgreementsOperations
-from .certificates_operations import CertificatesOperations
-from .sessions_operations import SessionsOperations
+from .integration_account_schemas_operations import IntegrationAccountSchemasOperations
+from .integration_account_maps_operations import IntegrationAccountMapsOperations
+from .integration_account_partners_operations import IntegrationAccountPartnersOperations
+from .integration_account_agreements_operations import IntegrationAccountAgreementsOperations
+from .integration_account_certificates_operations import IntegrationAccountCertificatesOperations
+from .integration_account_sessions_operations import IntegrationAccountSessionsOperations
+from .operations import Operations
 
 __all__ = [
     'WorkflowsOperations',
     'WorkflowVersionsOperations',
     'WorkflowTriggersOperations',
+    'WorkflowVersionTriggersOperations',
     'WorkflowTriggerHistoriesOperations',
     'WorkflowRunsOperations',
     'WorkflowRunActionsOperations',
     'WorkflowRunActionRepetitionsOperations',
-    'WorkflowRunActionScopedRepetitionsOperations',
+    'WorkflowRunActionScopeRepetitionsOperations',
     'WorkflowRunOperations',
     'IntegrationAccountsOperations',
     'IntegrationAccountAssembliesOperations',
     'IntegrationAccountBatchConfigurationsOperations',
-    'SchemasOperations',
-    'MapsOperations',
-    'PartnersOperations',
-    'AgreementsOperations',
-    'CertificatesOperations',
-    'SessionsOperations',
+    'IntegrationAccountSchemasOperations',
+    'IntegrationAccountMapsOperations',
+    'IntegrationAccountPartnersOperations',
+    'IntegrationAccountAgreementsOperations',
+    'IntegrationAccountCertificatesOperations',
+    'IntegrationAccountSessionsOperations',
+    'Operations',
 ]
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_agreements_operations.py
similarity index 97%
rename from azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py
rename to azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_agreements_operations.py
index 6dc731f93279..89b061117b82 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/agreements_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_agreements_operations.py
@@ -16,14 +16,14 @@
 from .. import models
 
 
-class AgreementsOperations(object):
-    """AgreementsOperations operations.
+class IntegrationAccountAgreementsOperations(object):
+    """IntegrationAccountAgreementsOperations 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: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-01-preview".
     """
 
     models = models
@@ -33,11 +33,11 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
-    def list_by_integration_accounts(
+    def list(
             self, resource_group_name, integration_account_name, top=None, filter=None, custom_headers=None, raw=False, **operation_config):
         """Gets a list of integration account agreements.
 
@@ -64,7 +64,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_integration_accounts.metadata['url']
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -114,7 +114,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_integration_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/agreements'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/agreements'}
 
     def get(
             self, resource_group_name, integration_account_name, agreement_name, custom_headers=None, raw=False, **operation_config):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_assemblies_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_assemblies_operations.py
index 40812ebc146a..b939a935148a 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_assemblies_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_assemblies_operations.py
@@ -23,7 +23,7 @@ class IntegrationAccountAssembliesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_batch_configurations_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_batch_configurations_operations.py
index 7d08646f77de..5784a64384d4 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_batch_configurations_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_batch_configurations_operations.py
@@ -23,7 +23,7 @@ class IntegrationAccountBatchConfigurationsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/certificates_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_certificates_operations.py
similarity index 96%
rename from azure-mgmt-logic/azure/mgmt/logic/operations/certificates_operations.py
rename to azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_certificates_operations.py
index 32c7a0199b9e..f8662c321efb 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/certificates_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_certificates_operations.py
@@ -16,14 +16,14 @@
 from .. import models
 
 
-class CertificatesOperations(object):
-    """CertificatesOperations operations.
+class IntegrationAccountCertificatesOperations(object):
+    """IntegrationAccountCertificatesOperations 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: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-01-preview".
     """
 
     models = models
@@ -33,11 +33,11 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
-    def list_by_integration_accounts(
+    def list(
             self, resource_group_name, integration_account_name, top=None, custom_headers=None, raw=False, **operation_config):
         """Gets a list of integration account certificates.
 
@@ -61,7 +61,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_integration_accounts.metadata['url']
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -109,7 +109,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_integration_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/certificates'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/certificates'}
 
     def get(
             self, resource_group_name, integration_account_name, certificate_name, custom_headers=None, raw=False, **operation_config):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_maps_operations.py
similarity index 97%
rename from azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py
rename to azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_maps_operations.py
index 1357b1d6eb9d..d48be0f43a1b 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/maps_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_maps_operations.py
@@ -16,14 +16,14 @@
 from .. import models
 
 
-class MapsOperations(object):
-    """MapsOperations operations.
+class IntegrationAccountMapsOperations(object):
+    """IntegrationAccountMapsOperations 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: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-01-preview".
     """
 
     models = models
@@ -33,11 +33,11 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
-    def list_by_integration_accounts(
+    def list(
             self, resource_group_name, integration_account_name, top=None, filter=None, custom_headers=None, raw=False, **operation_config):
         """Gets a list of integration account maps.
 
@@ -64,7 +64,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_integration_accounts.metadata['url']
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -114,7 +114,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_integration_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/maps'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/maps'}
 
     def get(
             self, resource_group_name, integration_account_name, map_name, custom_headers=None, raw=False, **operation_config):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_partners_operations.py
similarity index 97%
rename from azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py
rename to azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_partners_operations.py
index 50a5372dc3ed..b77b6b9f72b8 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/partners_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_partners_operations.py
@@ -16,14 +16,14 @@
 from .. import models
 
 
-class PartnersOperations(object):
-    """PartnersOperations operations.
+class IntegrationAccountPartnersOperations(object):
+    """IntegrationAccountPartnersOperations 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: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-01-preview".
     """
 
     models = models
@@ -33,11 +33,11 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
-    def list_by_integration_accounts(
+    def list(
             self, resource_group_name, integration_account_name, top=None, filter=None, custom_headers=None, raw=False, **operation_config):
         """Gets a list of integration account partners.
 
@@ -64,7 +64,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_integration_accounts.metadata['url']
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -114,7 +114,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_integration_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/partners'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/partners'}
 
     def get(
             self, resource_group_name, integration_account_name, partner_name, custom_headers=None, raw=False, **operation_config):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_schemas_operations.py
similarity index 97%
rename from azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py
rename to azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_schemas_operations.py
index dae06f1d59bc..321e154853d7 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/schemas_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_schemas_operations.py
@@ -16,14 +16,14 @@
 from .. import models
 
 
-class SchemasOperations(object):
-    """SchemasOperations operations.
+class IntegrationAccountSchemasOperations(object):
+    """IntegrationAccountSchemasOperations 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: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-01-preview".
     """
 
     models = models
@@ -33,11 +33,11 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
-    def list_by_integration_accounts(
+    def list(
             self, resource_group_name, integration_account_name, top=None, filter=None, custom_headers=None, raw=False, **operation_config):
         """Gets a list of integration account schemas.
 
@@ -64,7 +64,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_integration_accounts.metadata['url']
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -114,7 +114,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_integration_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/schemas'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/schemas'}
 
     def get(
             self, resource_group_name, integration_account_name, schema_name, custom_headers=None, raw=False, **operation_config):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py
similarity index 96%
rename from azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py
rename to azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py
index 2acf631d159a..3ac925d6632f 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/sessions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py
@@ -15,14 +15,14 @@
 from .. import models
 
 
-class SessionsOperations(object):
-    """SessionsOperations operations.
+class IntegrationAccountSessionsOperations(object):
+    """IntegrationAccountSessionsOperations 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: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-01-preview".
     """
 
     models = models
@@ -32,11 +32,11 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
-    def list_by_integration_accounts(
+    def list(
             self, resource_group_name, integration_account_name, top=None, filter=None, custom_headers=None, raw=False, **operation_config):
         """Gets a list of integration account sessions.
 
@@ -64,7 +64,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_integration_accounts.metadata['url']
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -112,7 +112,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_integration_accounts.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/sessions'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/sessions'}
 
     def get(
             self, resource_group_name, integration_account_name, session_name, custom_headers=None, raw=False, **operation_config):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_accounts_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_accounts_operations.py
index 166c7e285bb3..324850d2661f 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_accounts_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_accounts_operations.py
@@ -23,7 +23,7 @@ class IntegrationAccountsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
@@ -429,7 +429,7 @@ def delete(
             return client_raw_response
     delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}'}
 
-    def get_callback_url(
+    def list_callback_url(
             self, resource_group_name, integration_account_name, not_after=None, key_type=None, custom_headers=None, raw=False, **operation_config):
         """Gets the integration account callback URL.
 
@@ -455,7 +455,7 @@ def get_callback_url(
         parameters = models.GetCallbackUrlParameters(not_after=not_after, key_type=key_type)
 
         # Construct URL
-        url = self.get_callback_url.metadata['url']
+        url = self.list_callback_url.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -500,7 +500,7 @@ def get_callback_url(
             return client_raw_response
 
         return deserialized
-    get_callback_url.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/listCallbackUrl'}
+    list_callback_url.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/integrationAccounts/{integrationAccountName}/listCallbackUrl'}
 
     def list_key_vault_keys(
             self, resource_group_name, integration_account_name, key_vault, skip_token=None, custom_headers=None, raw=False, **operation_config):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/operations.py
new file mode 100644
index 000000000000..28249a6929d3
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/operations.py
@@ -0,0 +1,96 @@
+# 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 Operations(object):
+    """Operations 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: The API version. Constant value: "2018-07-01-preview".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-07-01-preview"
+
+        self.config = config
+
+    def list(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all of the available Logic REST API operations.
+
+        :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 Operation
+        :rtype:
+         ~azure.mgmt.logic.models.OperationPaged[~azure.mgmt.logic.models.Operation]
+        :raises:
+         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list.metadata['url']
+
+                # Construct parameters
+                query_parameters = {}
+                query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            header_parameters['Accept'] = 'application/json'
+            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, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
+
+            if response.status_code not in [200]:
+                raise models.ErrorResponseException(self._deserialize, response)
+
+            return response
+
+        # Deserialize response
+        deserialized = models.OperationPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.OperationPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/providers/Microsoft.Logic/operations'}
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_operations.py
index c6cfe07c4078..6af8ea488463 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_operations.py
@@ -23,7 +23,7 @@ class WorkflowRunActionRepetitionsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scoped_repetitions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scope_repetitions_operations.py
similarity index 97%
rename from azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scoped_repetitions_operations.py
rename to azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scope_repetitions_operations.py
index 969f97135252..327074bbd910 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scoped_repetitions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_scope_repetitions_operations.py
@@ -16,14 +16,14 @@
 from .. import models
 
 
-class WorkflowRunActionScopedRepetitionsOperations(object):
-    """WorkflowRunActionScopedRepetitionsOperations operations.
+class WorkflowRunActionScopeRepetitionsOperations(object):
+    """WorkflowRunActionScopeRepetitionsOperations 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: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py
index 588a818106ad..01709a977e74 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_actions_operations.py
@@ -23,7 +23,7 @@ class WorkflowRunActionsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_operations.py
index f812bf4b3fe1..c128f429d4b1 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_operations.py
@@ -23,7 +23,7 @@ class WorkflowRunOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py
index a4b40a30e9fc..fe28c04d10df 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_runs_operations.py
@@ -23,7 +23,7 @@ class WorkflowRunsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py
index 6c1294ae5c32..cf4a5de23438 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_trigger_histories_operations.py
@@ -23,7 +23,7 @@ class WorkflowTriggerHistoriesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_triggers_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_triggers_operations.py
index 2e0b2194f9a2..af6cc9132dcd 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_triggers_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_triggers_operations.py
@@ -23,7 +23,7 @@ class WorkflowTriggersOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_version_triggers_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_version_triggers_operations.py
new file mode 100644
index 000000000000..0d7c07542b20
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_version_triggers_operations.py
@@ -0,0 +1,122 @@
+# 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 msrestazure.azure_exceptions import CloudError
+
+from .. import models
+
+
+class WorkflowVersionTriggersOperations(object):
+    """WorkflowVersionTriggersOperations 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: The API version. Constant value: "2018-07-01-preview".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-07-01-preview"
+
+        self.config = config
+
+    def list_callback_url(
+            self, resource_group_name, workflow_name, version_id, trigger_name, not_after=None, key_type=None, custom_headers=None, raw=False, **operation_config):
+        """Get the callback url for a trigger of a workflow version.
+
+        :param resource_group_name: The resource group name.
+        :type resource_group_name: str
+        :param workflow_name: The workflow name.
+        :type workflow_name: str
+        :param version_id: The workflow versionId.
+        :type version_id: str
+        :param trigger_name: The workflow trigger name.
+        :type trigger_name: str
+        :param not_after: The expiry time.
+        :type not_after: datetime
+        :param key_type: The key type. Possible values include:
+         'NotSpecified', 'Primary', 'Secondary'
+        :type key_type: str or ~azure.mgmt.logic.models.KeyType
+        :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: WorkflowTriggerCallbackUrl or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.logic.models.WorkflowTriggerCallbackUrl or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        parameters = None
+        if not_after is not None or key_type is not None:
+            parameters = models.GetCallbackUrlParameters(not_after=not_after, key_type=key_type)
+
+        # Construct URL
+        url = self.list_callback_url.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'workflowName': self._serialize.url("workflow_name", workflow_name, 'str'),
+            'versionId': self._serialize.url("version_id", version_id, 'str'),
+            'triggerName': self._serialize.url("trigger_name", trigger_name, '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['Accept'] = 'application/json'
+        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 body
+        if parameters is not None:
+            body_content = self._serialize.body(parameters, 'GetCallbackUrlParameters')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200]:
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('WorkflowTriggerCallbackUrl', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_callback_url.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/versions/{versionId}/triggers/{triggerName}/listCallbackUrl'}
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_versions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_versions_operations.py
index a98e2f80a77b..b2559032df76 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_versions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_versions_operations.py
@@ -23,7 +23,7 @@ class WorkflowVersionsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
@@ -175,87 +175,3 @@ def get(
 
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/versions/{versionId}'}
-
-    def list_callback_url(
-            self, resource_group_name, workflow_name, version_id, trigger_name, not_after=None, key_type=None, custom_headers=None, raw=False, **operation_config):
-        """Get the callback url for a trigger of a workflow version.
-
-        :param resource_group_name: The resource group name.
-        :type resource_group_name: str
-        :param workflow_name: The workflow name.
-        :type workflow_name: str
-        :param version_id: The workflow versionId.
-        :type version_id: str
-        :param trigger_name: The workflow trigger name.
-        :type trigger_name: str
-        :param not_after: The expiry time.
-        :type not_after: datetime
-        :param key_type: The key type. Possible values include:
-         'NotSpecified', 'Primary', 'Secondary'
-        :type key_type: str or ~azure.mgmt.logic.models.KeyType
-        :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: WorkflowTriggerCallbackUrl or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.logic.models.WorkflowTriggerCallbackUrl or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        parameters = None
-        if not_after is not None or key_type is not None:
-            parameters = models.GetCallbackUrlParameters(not_after=not_after, key_type=key_type)
-
-        # Construct URL
-        url = self.list_callback_url.metadata['url']
-        path_format_arguments = {
-            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'workflowName': self._serialize.url("workflow_name", workflow_name, 'str'),
-            'versionId': self._serialize.url("version_id", version_id, 'str'),
-            'triggerName': self._serialize.url("trigger_name", trigger_name, '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['Accept'] = 'application/json'
-        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 body
-        if parameters is not None:
-            body_content = self._serialize.body(parameters, 'GetCallbackUrlParameters')
-        else:
-            body_content = None
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters, header_parameters, body_content)
-        response = self._client.send(request, stream=False, **operation_config)
-
-        if response.status_code not in [200]:
-            exp = CloudError(response)
-            exp.request_id = response.headers.get('x-ms-request-id')
-            raise exp
-
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('WorkflowTriggerCallbackUrl', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    list_callback_url.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/versions/{versionId}/triggers/{triggerName}/listCallbackUrl'}
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py
index a08f66a38164..76b9133b8263 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflows_operations.py
@@ -23,7 +23,7 @@ class WorkflowsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: The API version. Constant value: "2016-06-01".
+    :ivar api_version: The API version. Constant value: "2018-07-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 = "2016-06-01"
+        self.api_version = "2018-07-01-preview"
 
         self.config = config
 
@@ -869,7 +869,7 @@ def regenerate_access_key(
             return client_raw_response
     regenerate_access_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/regenerateAccessKey'}
 
-    def validate_workflow(
+    def validate_by_resource_group(
             self, resource_group_name, workflow_name, validate, custom_headers=None, raw=False, **operation_config):
         """Validates the workflow.
 
@@ -889,7 +889,7 @@ def validate_workflow(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = self.validate_workflow.metadata['url']
+        url = self.validate_by_resource_group.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -926,9 +926,9 @@ def validate_workflow(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
-    validate_workflow.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/validate'}
+    validate_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/validate'}
 
-    def validate(
+    def validate_by_location(
             self, resource_group_name, location, workflow_name, workflow, custom_headers=None, raw=False, **operation_config):
         """Validates the workflow definition.
 
@@ -950,7 +950,7 @@ def validate(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = self.validate.metadata['url']
+        url = self.validate_by_location.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -988,4 +988,4 @@ def validate(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
-    validate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/locations/{location}/workflows/{workflowName}/validate'}
+    validate_by_location.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/locations/{location}/workflows/{workflowName}/validate'}
diff --git a/azure-mgmt-logic/azure/mgmt/logic/version.py b/azure-mgmt-logic/azure/mgmt/logic/version.py
index b2fd3a7ffa39..640f86d33a0d 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/version.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2016-06-01"
+VERSION = "2018-07-01-preview"
 

From 944a272e1469c24035884f0d03349b764bc581e9 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Mon, 10 Sep 2018 11:36:42 -0700
Subject: [PATCH 04/12] [AutoPR logic/resource-manager] Change some string
 modelled enums back into enums (#3237)

* Generated from 2b946c42fe05c892efee90f150c5b2b7897d9e8d

Change some string modelled enums back into enums

* Generated from c016726b2b4438bf45bdbebe25f68a67330478b0

Change EDIFACT back to be an enum, not a string

* Packaging update of azure-mgmt-logic
---
 azure-mgmt-logic/README.rst                   |  2 +-
 .../azure/mgmt/logic/models/__init__.py       |  5 ---
 ...access_key_regenerate_action_definition.py | 35 -------------------
 ...ss_key_regenerate_action_definition_py3.py | 35 -------------------
 .../models/edifact_delimiter_override.py      |  4 +--
 .../models/edifact_delimiter_override_py3.py  |  4 +--
 .../logic/models/edifact_framing_settings.py  |  4 +--
 .../models/edifact_framing_settings_py3.py    |  4 +--
 .../models/integration_account_agreement.py   |  2 +-
 .../integration_account_agreement_filter.py   |  2 +-
 ...ntegration_account_agreement_filter_py3.py |  2 +-
 .../integration_account_agreement_py3.py      |  2 +-
 .../models/logic_management_client_enums.py   |  7 ----
 .../mgmt/logic/models/recurrence_schedule.py  |  2 +-
 .../models/recurrence_schedule_occurrence.py  |  2 +-
 .../recurrence_schedule_occurrence_py3.py     |  2 +-
 .../logic/models/recurrence_schedule_py3.py   |  2 +-
 .../azure/mgmt/logic/models/tracking_event.py |  2 +-
 .../mgmt/logic/models/tracking_event_py3.py   |  2 +-
 .../logic/models/x12_delimiter_overrides.py   |  2 +-
 .../models/x12_delimiter_overrides_py3.py     |  2 +-
 .../mgmt/logic/models/x12_framing_settings.py |  2 +-
 .../logic/models/x12_framing_settings_py3.py  |  2 +-
 ...integration_account_sessions_operations.py |  8 +++--
 azure-mgmt-logic/setup.py                     |  4 ++-
 25 files changed, 31 insertions(+), 109 deletions(-)
 delete mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py
 delete mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py

diff --git a/azure-mgmt-logic/README.rst b/azure-mgmt-logic/README.rst
index 095902143154..c380cdb9816d 100644
--- a/azure-mgmt-logic/README.rst
+++ b/azure-mgmt-logic/README.rst
@@ -6,7 +6,7 @@ This is the Microsoft Azure Logic Apps Management Client Library.
 Azure Resource Manager (ARM) is the next generation of management APIs that
 replace the old Azure Service Management (ASM).
 
-This package has been tested with Python 2.7, 3.4, 3.5 and 3.6.
+This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
 
 For the older Azure Service Management (ASM) libraries, see
 `azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py b/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py
index 3f5a248b0d14..a79386ed9a8f 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py
@@ -111,7 +111,6 @@
     from .tracking_event_error_info_py3 import TrackingEventErrorInfo
     from .tracking_event_py3 import TrackingEvent
     from .tracking_events_definition_py3 import TrackingEventsDefinition
-    from .access_key_regenerate_action_definition_py3 import AccessKeyRegenerateActionDefinition
     from .set_trigger_state_action_definition_py3 import SetTriggerStateActionDefinition
     from .expression_root_py3 import ExpressionRoot
     from .azure_resource_error_info_py3 import AzureResourceErrorInfo
@@ -234,7 +233,6 @@
     from .tracking_event_error_info import TrackingEventErrorInfo
     from .tracking_event import TrackingEvent
     from .tracking_events_definition import TrackingEventsDefinition
-    from .access_key_regenerate_action_definition import AccessKeyRegenerateActionDefinition
     from .set_trigger_state_action_definition import SetTriggerStateActionDefinition
     from .expression_root import ExpressionRoot
     from .azure_resource_error_info import AzureResourceErrorInfo
@@ -305,7 +303,6 @@
     TrackEventsOperationOptions,
     EventLevel,
     TrackingRecordType,
-    AccessKeyType,
 )
 
 __all__ = [
@@ -410,7 +407,6 @@
     'TrackingEventErrorInfo',
     'TrackingEvent',
     'TrackingEventsDefinition',
-    'AccessKeyRegenerateActionDefinition',
     'SetTriggerStateActionDefinition',
     'ExpressionRoot',
     'AzureResourceErrorInfo',
@@ -480,5 +476,4 @@
     'TrackEventsOperationOptions',
     'EventLevel',
     'TrackingRecordType',
-    'AccessKeyType',
 ]
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py b/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py
deleted file mode 100644
index 3f0252392c9f..000000000000
--- a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition.py
+++ /dev/null
@@ -1,35 +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.
-# --------------------------------------------------------------------------
-
-from msrest.serialization import Model
-
-
-class AccessKeyRegenerateActionDefinition(Model):
-    """AccessKeyRegenerateActionDefinition.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param key_type: Required. Possible values include: 'NotSpecified',
-     'Primary', 'Secondary'
-    :type key_type: str or ~azure.mgmt.logic.models.AccessKeyType
-    """
-
-    _validation = {
-        'key_type': {'required': True},
-    }
-
-    _attribute_map = {
-        'key_type': {'key': 'keyType', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(AccessKeyRegenerateActionDefinition, self).__init__(**kwargs)
-        self.key_type = kwargs.get('key_type', None)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py
deleted file mode 100644
index cbe83e687dda..000000000000
--- a/azure-mgmt-logic/azure/mgmt/logic/models/access_key_regenerate_action_definition_py3.py
+++ /dev/null
@@ -1,35 +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.
-# --------------------------------------------------------------------------
-
-from msrest.serialization import Model
-
-
-class AccessKeyRegenerateActionDefinition(Model):
-    """AccessKeyRegenerateActionDefinition.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param key_type: Required. Possible values include: 'NotSpecified',
-     'Primary', 'Secondary'
-    :type key_type: str or ~azure.mgmt.logic.models.AccessKeyType
-    """
-
-    _validation = {
-        'key_type': {'required': True},
-    }
-
-    _attribute_map = {
-        'key_type': {'key': 'keyType', 'type': 'str'},
-    }
-
-    def __init__(self, *, key_type, **kwargs) -> None:
-        super(AccessKeyRegenerateActionDefinition, self).__init__(**kwargs)
-        self.key_type = key_type
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py
index ce43ee219d87..9cab599afb9a 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override.py
@@ -67,8 +67,8 @@ class EdifactDelimiterOverride(Model):
         'component_separator': {'key': 'componentSeparator', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
         'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
-        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
+        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'},
         'release_indicator': {'key': 'releaseIndicator', 'type': 'int'},
         'message_association_assigned_code': {'key': 'messageAssociationAssignedCode', 'type': 'str'},
         'target_namespace': {'key': 'targetNamespace', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py
index 8c5dc9ad9887..3d35e5e000a6 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_delimiter_override_py3.py
@@ -67,8 +67,8 @@ class EdifactDelimiterOverride(Model):
         'component_separator': {'key': 'componentSeparator', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
         'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
-        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
+        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'},
         'release_indicator': {'key': 'releaseIndicator', 'type': 'int'},
         'message_association_assigned_code': {'key': 'messageAssociationAssignedCode', 'type': 'str'},
         'target_namespace': {'key': 'targetNamespace', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py
index c3d9467aedeb..07795e620caf 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings.py
@@ -73,8 +73,8 @@ class EdifactFramingSettings(Model):
         'release_indicator': {'key': 'releaseIndicator', 'type': 'int'},
         'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'},
         'character_set': {'key': 'characterSet', 'type': 'str'},
-        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
+        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py
index b9de26605360..f7b668535545 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_framing_settings_py3.py
@@ -73,8 +73,8 @@ class EdifactFramingSettings(Model):
         'release_indicator': {'key': 'releaseIndicator', 'type': 'int'},
         'repetition_separator': {'key': 'repetitionSeparator', 'type': 'int'},
         'character_set': {'key': 'characterSet', 'type': 'str'},
-        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'str'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
+        'decimal_point_indicator': {'key': 'decimalPointIndicator', 'type': 'EdifactDecimalIndicator'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
     }
 
     def __init__(self, *, protocol_version: int, data_element_separator: int, component_separator: int, segment_terminator: int, release_indicator: int, repetition_separator: int, character_set, decimal_point_indicator, segment_terminator_suffix, service_code_list_directory_version: str=None, character_encoding: str=None, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py
index 6d4384aa44a5..5fad800c2ade 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement.py
@@ -77,7 +77,7 @@ class IntegrationAccountAgreement(Resource):
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
         'metadata': {'key': 'properties.metadata', 'type': 'object'},
-        'agreement_type': {'key': 'properties.agreementType', 'type': 'str'},
+        'agreement_type': {'key': 'properties.agreementType', 'type': 'AgreementType'},
         'host_partner': {'key': 'properties.hostPartner', 'type': 'str'},
         'guest_partner': {'key': 'properties.guestPartner', 'type': 'str'},
         'host_identity': {'key': 'properties.hostIdentity', 'type': 'BusinessIdentity'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py
index 23cee38077a5..ed00ee6cf955 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter.py
@@ -28,7 +28,7 @@ class IntegrationAccountAgreementFilter(Model):
     }
 
     _attribute_map = {
-        'agreement_type': {'key': 'agreementType', 'type': 'str'},
+        'agreement_type': {'key': 'agreementType', 'type': 'AgreementType'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py
index 691b1f4d5e50..aa7b65c825aa 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_filter_py3.py
@@ -28,7 +28,7 @@ class IntegrationAccountAgreementFilter(Model):
     }
 
     _attribute_map = {
-        'agreement_type': {'key': 'agreementType', 'type': 'str'},
+        'agreement_type': {'key': 'agreementType', 'type': 'AgreementType'},
     }
 
     def __init__(self, *, agreement_type, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py
index 46bddc85dca4..4f6d7c00bb25 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/integration_account_agreement_py3.py
@@ -77,7 +77,7 @@ class IntegrationAccountAgreement(Resource):
         'created_time': {'key': 'properties.createdTime', 'type': 'iso-8601'},
         'changed_time': {'key': 'properties.changedTime', 'type': 'iso-8601'},
         'metadata': {'key': 'properties.metadata', 'type': 'object'},
-        'agreement_type': {'key': 'properties.agreementType', 'type': 'str'},
+        'agreement_type': {'key': 'properties.agreementType', 'type': 'AgreementType'},
         'host_partner': {'key': 'properties.hostPartner', 'type': 'str'},
         'guest_partner': {'key': 'properties.guestPartner', 'type': 'str'},
         'host_identity': {'key': 'properties.hostIdentity', 'type': 'BusinessIdentity'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py b/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py
index 402d02db10f6..a87fce21bef8 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/logic_management_client_enums.py
@@ -332,10 +332,3 @@ class TrackingRecordType(str, Enum):
     edifact_interchange_acknowledgment = "EdifactInterchangeAcknowledgment"
     edifact_functional_group_acknowledgment = "EdifactFunctionalGroupAcknowledgment"
     edifact_transaction_set_acknowledgment = "EdifactTransactionSetAcknowledgment"
-
-
-class AccessKeyType(str, Enum):
-
-    not_specified = "NotSpecified"
-    primary = "Primary"
-    secondary = "Secondary"
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py
index 4a0c226bfc3e..7fdfd3fb5d71 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule.py
@@ -31,7 +31,7 @@ class RecurrenceSchedule(Model):
     _attribute_map = {
         'minutes': {'key': 'minutes', 'type': '[int]'},
         'hours': {'key': 'hours', 'type': '[int]'},
-        'week_days': {'key': 'weekDays', 'type': '[str]'},
+        'week_days': {'key': 'weekDays', 'type': '[DaysOfWeek]'},
         'month_days': {'key': 'monthDays', 'type': '[int]'},
         'monthly_occurrences': {'key': 'monthlyOccurrences', 'type': '[RecurrenceScheduleOccurrence]'},
     }
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py
index 71308e754c50..b32dbc67e712 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence.py
@@ -23,7 +23,7 @@ class RecurrenceScheduleOccurrence(Model):
     """
 
     _attribute_map = {
-        'day': {'key': 'day', 'type': 'str'},
+        'day': {'key': 'day', 'type': 'DayOfWeek'},
         'occurrence': {'key': 'occurrence', 'type': 'int'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py
index 65a779eec3e8..1bdaee939cc9 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_occurrence_py3.py
@@ -23,7 +23,7 @@ class RecurrenceScheduleOccurrence(Model):
     """
 
     _attribute_map = {
-        'day': {'key': 'day', 'type': 'str'},
+        'day': {'key': 'day', 'type': 'DayOfWeek'},
         'occurrence': {'key': 'occurrence', 'type': 'int'},
     }
 
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py
index 08b5d5d7df10..68c42503da65 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/recurrence_schedule_py3.py
@@ -31,7 +31,7 @@ class RecurrenceSchedule(Model):
     _attribute_map = {
         'minutes': {'key': 'minutes', 'type': '[int]'},
         'hours': {'key': 'hours', 'type': '[int]'},
-        'week_days': {'key': 'weekDays', 'type': '[str]'},
+        'week_days': {'key': 'weekDays', 'type': '[DaysOfWeek]'},
         'month_days': {'key': 'monthDays', 'type': '[int]'},
         'monthly_occurrences': {'key': 'monthlyOccurrences', 'type': '[RecurrenceScheduleOccurrence]'},
     }
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py
index 56d123ddfd51..505ce146ce76 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event.py
@@ -42,7 +42,7 @@ class TrackingEvent(Model):
     }
 
     _attribute_map = {
-        'event_level': {'key': 'eventLevel', 'type': 'str'},
+        'event_level': {'key': 'eventLevel', 'type': 'EventLevel'},
         'event_time': {'key': 'eventTime', 'type': 'iso-8601'},
         'record_type': {'key': 'recordType', 'type': 'str'},
         'error': {'key': 'error', 'type': 'TrackingEventErrorInfo'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py
index 472692e6d6f1..cd6606b4095e 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/tracking_event_py3.py
@@ -42,7 +42,7 @@ class TrackingEvent(Model):
     }
 
     _attribute_map = {
-        'event_level': {'key': 'eventLevel', 'type': 'str'},
+        'event_level': {'key': 'eventLevel', 'type': 'EventLevel'},
         'event_time': {'key': 'eventTime', 'type': 'iso-8601'},
         'record_type': {'key': 'recordType', 'type': 'str'},
         'error': {'key': 'error', 'type': 'TrackingEventErrorInfo'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py
index ee6f39190c38..ee545215c677 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides.py
@@ -56,7 +56,7 @@ class X12DelimiterOverrides(Model):
         'data_element_separator': {'key': 'dataElementSeparator', 'type': 'int'},
         'component_separator': {'key': 'componentSeparator', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
         'replace_character': {'key': 'replaceCharacter', 'type': 'int'},
         'replace_separators_in_payload': {'key': 'replaceSeparatorsInPayload', 'type': 'bool'},
         'target_namespace': {'key': 'targetNamespace', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py
index 193867ce4458..c2333de8a794 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_delimiter_overrides_py3.py
@@ -56,7 +56,7 @@ class X12DelimiterOverrides(Model):
         'data_element_separator': {'key': 'dataElementSeparator', 'type': 'int'},
         'component_separator': {'key': 'componentSeparator', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
         'replace_character': {'key': 'replaceCharacter', 'type': 'int'},
         'replace_separators_in_payload': {'key': 'replaceSeparatorsInPayload', 'type': 'bool'},
         'target_namespace': {'key': 'targetNamespace', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py
index 9799aac0e65b..c28e541459b2 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings.py
@@ -54,7 +54,7 @@ class X12FramingSettings(Model):
         'replace_character': {'key': 'replaceCharacter', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
         'character_set': {'key': 'characterSet', 'type': 'str'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
     }
 
     def __init__(self, **kwargs):
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py
index 42d0aec04043..ffd8f09a407d 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_framing_settings_py3.py
@@ -54,7 +54,7 @@ class X12FramingSettings(Model):
         'replace_character': {'key': 'replaceCharacter', 'type': 'int'},
         'segment_terminator': {'key': 'segmentTerminator', 'type': 'int'},
         'character_set': {'key': 'characterSet', 'type': 'str'},
-        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'str'},
+        'segment_terminator_suffix': {'key': 'segmentTerminatorSuffix', 'type': 'SegmentTerminatorSuffix'},
     }
 
     def __init__(self, *, data_element_separator: int, component_separator: int, replace_separators_in_payload: bool, replace_character: int, segment_terminator: int, character_set, segment_terminator_suffix, **kwargs) -> None:
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py
index 3ac925d6632f..9169be91fa09 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py
@@ -11,6 +11,7 @@
 
 import uuid
 from msrest.pipeline import ClientRawResponse
+from msrestazure.azure_exceptions import CloudError
 
 from .. import models
 
@@ -267,8 +268,7 @@ def delete(
          overrides<msrest:optionsforoperations>`.
         :return: None or ClientRawResponse if raw=true
         :rtype: None or ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
         url = self.delete.metadata['url']
@@ -298,7 +298,9 @@ def delete(
         response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 204]:
-            raise models.ErrorResponseException(self._deserialize, response)
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
 
         if raw:
             client_raw_response = ClientRawResponse(None, response)
diff --git a/azure-mgmt-logic/setup.py b/azure-mgmt-logic/setup.py
index 17ac0d37f0d3..9018d5b45c2a 100644
--- a/azure-mgmt-logic/setup.py
+++ b/azure-mgmt-logic/setup.py
@@ -72,12 +72,14 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
     packages=find_packages(exclude=["tests"]),
     install_requires=[
-        'msrestazure>=0.4.27,<2.0.0',
+        'msrest>=0.5.0',
+        'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
     ],
     cmdclass=cmdclass

From c7292943f0a717d5987e6ef6e9cf3b2a413d69bf Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 14 Sep 2018 11:36:08 -0700
Subject: [PATCH 05/12] Generated from 14736179143e9c45f99655ed4066c1ff36c6a98e
 (#3319)

Remove default response from Sessions to bring them inline with the remaining artifacts
---
 ...integration_account_sessions_operations.py | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py
index 9169be91fa09..1d3ac1334b33 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/integration_account_sessions_operations.py
@@ -58,8 +58,7 @@ def list(
         :return: An iterator like instance of IntegrationAccountSession
         :rtype:
          ~azure.mgmt.logic.models.IntegrationAccountSessionPaged[~azure.mgmt.logic.models.IntegrationAccountSession]
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         def internal_paging(next_link=None, raw=False):
 
@@ -100,7 +99,9 @@ def internal_paging(next_link=None, raw=False):
             response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
-                raise models.ErrorResponseException(self._deserialize, response)
+                exp = CloudError(response)
+                exp.request_id = response.headers.get('x-ms-request-id')
+                raise exp
 
             return response
 
@@ -133,8 +134,7 @@ def get(
         :return: IntegrationAccountSession or ClientRawResponse if raw=true
         :rtype: ~azure.mgmt.logic.models.IntegrationAccountSession or
          ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
         url = self.get.metadata['url']
@@ -165,7 +165,9 @@ def get(
         response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
-            raise models.ErrorResponseException(self._deserialize, response)
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
 
         deserialized = None
 
@@ -199,8 +201,7 @@ def create_or_update(
         :return: IntegrationAccountSession or ClientRawResponse if raw=true
         :rtype: ~azure.mgmt.logic.models.IntegrationAccountSession or
          ~msrest.pipeline.ClientRawResponse
-        :raises:
-         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
         url = self.create_or_update.metadata['url']
@@ -235,7 +236,9 @@ def create_or_update(
         response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200, 201]:
-            raise models.ErrorResponseException(self._deserialize, response)
+            exp = CloudError(response)
+            exp.request_id = response.headers.get('x-ms-request-id')
+            raise exp
 
         deserialized = None
 

From 5876bfd13056186d91f3560a2238615d69eb35d6 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Thu, 15 Nov 2018 14:22:14 -0800
Subject: [PATCH 06/12] [AutoPR logic/resource-manager] Add 2 missing endpoints
 to newest versions Microsoft.Logic (#3693)

* Generated from 6533a0dd2a5dfbe7ec76f3f2b6c407c876d4315d

Add missing endpoints to newest versions

* Packaging update of azure-mgmt-logic

* Generated from 09ee5609f7e335c47444a741f70625da9ce05630

Changing copy error of POST to GET. Added missing page links

* Generated from 1bbdab407fa1f6f3e68f40d006d153dcea4a0b44

Fix for top level properties errir

* Generated from 7ecc9d663ef1e01cd44bd527cc11dfc3f07f6bcb

Rename CloudError to not a potentially reserved name and removed the x-ms-external flag

* Generated from 91bb28bda57ea3c1098996d219975365b5499509

Use already existing error response object
---
 azure-mgmt-logic/MANIFEST.in                  |   4 +-
 azure-mgmt-logic/azure/__init__.py            |   2 +-
 azure-mgmt-logic/azure/mgmt/__init__.py       |   2 +-
 .../mgmt/logic/logic_management_client.py     |  10 +
 .../azure/mgmt/logic/models/__init__.py       |  14 ++
 .../azure/mgmt/logic/models/request.py        |  36 ++++
 .../mgmt/logic/models/request_history.py      |  52 +++++
 .../logic/models/request_history_paged.py     |  27 +++
 .../models/request_history_properties.py      |  40 ++++
 .../models/request_history_properties_py3.py  |  40 ++++
 .../mgmt/logic/models/request_history_py3.py  |  52 +++++
 .../azure/mgmt/logic/models/request_py3.py    |  36 ++++
 .../azure/mgmt/logic/models/response.py       |  36 ++++
 .../azure/mgmt/logic/models/response_py3.py   |  36 ++++
 .../azure/mgmt/logic/operations/__init__.py   |   4 +
 ...epetitions_request_histories_operations.py | 188 ++++++++++++++++++
 ...run_action_request_histories_operations.py | 182 +++++++++++++++++
 azure-mgmt-logic/azure_bdist_wheel.py         |  54 -----
 azure-mgmt-logic/setup.cfg                    |   1 -
 azure-mgmt-logic/setup.py                     |  17 +-
 20 files changed, 767 insertions(+), 66 deletions(-)
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/request.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/request_history.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/request_history_paged.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/request_history_properties.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/request_history_properties_py3.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/request_history_py3.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/request_py3.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/response.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/models/response_py3.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_request_histories_operations.py
 create mode 100644 azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_request_histories_operations.py
 delete mode 100644 azure-mgmt-logic/azure_bdist_wheel.py

diff --git a/azure-mgmt-logic/MANIFEST.in b/azure-mgmt-logic/MANIFEST.in
index 9ecaeb15de50..6ceb27f7a96e 100644
--- a/azure-mgmt-logic/MANIFEST.in
+++ b/azure-mgmt-logic/MANIFEST.in
@@ -1,2 +1,4 @@
 include *.rst
-include azure_bdist_wheel.py
\ No newline at end of file
+include azure/__init__.py
+include azure/mgmt/__init__.py
+
diff --git a/azure-mgmt-logic/azure/__init__.py b/azure-mgmt-logic/azure/__init__.py
index 849489fca33c..0260537a02bb 100644
--- a/azure-mgmt-logic/azure/__init__.py
+++ b/azure-mgmt-logic/azure/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
diff --git a/azure-mgmt-logic/azure/mgmt/__init__.py b/azure-mgmt-logic/azure/mgmt/__init__.py
index 849489fca33c..0260537a02bb 100644
--- a/azure-mgmt-logic/azure/mgmt/__init__.py
+++ b/azure-mgmt-logic/azure/mgmt/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
\ No newline at end of file
diff --git a/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py b/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py
index 5cecf1a882ce..ea6f82d78e58 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/logic_management_client.py
@@ -21,6 +21,8 @@
 from .operations.workflow_runs_operations import WorkflowRunsOperations
 from .operations.workflow_run_actions_operations import WorkflowRunActionsOperations
 from .operations.workflow_run_action_repetitions_operations import WorkflowRunActionRepetitionsOperations
+from .operations.workflow_run_action_repetitions_request_histories_operations import WorkflowRunActionRepetitionsRequestHistoriesOperations
+from .operations.workflow_run_action_request_histories_operations import WorkflowRunActionRequestHistoriesOperations
 from .operations.workflow_run_action_scope_repetitions_operations import WorkflowRunActionScopeRepetitionsOperations
 from .operations.workflow_run_operations import WorkflowRunOperations
 from .operations.integration_accounts_operations import IntegrationAccountsOperations
@@ -90,6 +92,10 @@ class LogicManagementClient(SDKClient):
     :vartype workflow_run_actions: azure.mgmt.logic.operations.WorkflowRunActionsOperations
     :ivar workflow_run_action_repetitions: WorkflowRunActionRepetitions operations
     :vartype workflow_run_action_repetitions: azure.mgmt.logic.operations.WorkflowRunActionRepetitionsOperations
+    :ivar workflow_run_action_repetitions_request_histories: WorkflowRunActionRepetitionsRequestHistories operations
+    :vartype workflow_run_action_repetitions_request_histories: azure.mgmt.logic.operations.WorkflowRunActionRepetitionsRequestHistoriesOperations
+    :ivar workflow_run_action_request_histories: WorkflowRunActionRequestHistories operations
+    :vartype workflow_run_action_request_histories: azure.mgmt.logic.operations.WorkflowRunActionRequestHistoriesOperations
     :ivar workflow_run_action_scope_repetitions: WorkflowRunActionScopeRepetitions operations
     :vartype workflow_run_action_scope_repetitions: azure.mgmt.logic.operations.WorkflowRunActionScopeRepetitionsOperations
     :ivar workflow_run_operations: WorkflowRunOperations operations
@@ -150,6 +156,10 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.workflow_run_action_repetitions = WorkflowRunActionRepetitionsOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.workflow_run_action_repetitions_request_histories = WorkflowRunActionRepetitionsRequestHistoriesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.workflow_run_action_request_histories = WorkflowRunActionRequestHistoriesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.workflow_run_action_scope_repetitions = WorkflowRunActionScopeRepetitionsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.workflow_run_operations = WorkflowRunOperations(
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py b/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py
index a79386ed9a8f..62165dd50eb4 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/__init__.py
@@ -131,6 +131,10 @@
     from .batch_release_criteria_py3 import BatchReleaseCriteria
     from .batch_configuration_properties_py3 import BatchConfigurationProperties
     from .batch_configuration_py3 import BatchConfiguration
+    from .request_py3 import Request
+    from .response_py3 import Response
+    from .request_history_properties_py3 import RequestHistoryProperties
+    from .request_history_py3 import RequestHistory
 except (SyntaxError, ImportError):
     from .resource import Resource
     from .sub_resource import SubResource
@@ -253,6 +257,10 @@
     from .batch_release_criteria import BatchReleaseCriteria
     from .batch_configuration_properties import BatchConfigurationProperties
     from .batch_configuration import BatchConfiguration
+    from .request import Request
+    from .response import Response
+    from .request_history_properties import RequestHistoryProperties
+    from .request_history import RequestHistory
 from .workflow_paged import WorkflowPaged
 from .workflow_version_paged import WorkflowVersionPaged
 from .workflow_trigger_paged import WorkflowTriggerPaged
@@ -261,6 +269,7 @@
 from .workflow_run_action_paged import WorkflowRunActionPaged
 from .expression_root_paged import ExpressionRootPaged
 from .workflow_run_action_repetition_definition_paged import WorkflowRunActionRepetitionDefinitionPaged
+from .request_history_paged import RequestHistoryPaged
 from .integration_account_paged import IntegrationAccountPaged
 from .key_vault_key_paged import KeyVaultKeyPaged
 from .assembly_definition_paged import AssemblyDefinitionPaged
@@ -427,6 +436,10 @@
     'BatchReleaseCriteria',
     'BatchConfigurationProperties',
     'BatchConfiguration',
+    'Request',
+    'Response',
+    'RequestHistoryProperties',
+    'RequestHistory',
     'WorkflowPaged',
     'WorkflowVersionPaged',
     'WorkflowTriggerPaged',
@@ -435,6 +448,7 @@
     'WorkflowRunActionPaged',
     'ExpressionRootPaged',
     'WorkflowRunActionRepetitionDefinitionPaged',
+    'RequestHistoryPaged',
     'IntegrationAccountPaged',
     'KeyVaultKeyPaged',
     'AssemblyDefinitionPaged',
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/request.py b/azure-mgmt-logic/azure/mgmt/logic/models/request.py
new file mode 100644
index 000000000000..061c655df42c
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/request.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 Request(Model):
+    """A request.
+
+    :param headers: A list of all the headers attached to the request.
+    :type headers: object
+    :param uri: The destination for the request.
+    :type uri: str
+    :param method: The HTTP method used for the request.
+    :type method: str
+    """
+
+    _attribute_map = {
+        'headers': {'key': 'headers', 'type': 'object'},
+        'uri': {'key': 'uri', 'type': 'str'},
+        'method': {'key': 'method', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Request, self).__init__(**kwargs)
+        self.headers = kwargs.get('headers', None)
+        self.uri = kwargs.get('uri', None)
+        self.method = kwargs.get('method', None)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/request_history.py b/azure-mgmt-logic/azure/mgmt/logic/models/request_history.py
new file mode 100644
index 000000000000..564959f187e8
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/request_history.py
@@ -0,0 +1,52 @@
+# 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 .resource import Resource
+
+
+class RequestHistory(Resource):
+    """The request history.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: The resource id.
+    :vartype id: str
+    :ivar name: Gets the resource name.
+    :vartype name: str
+    :ivar type: Gets the resource type.
+    :vartype type: str
+    :param location: The resource location.
+    :type location: str
+    :param tags: The resource tags.
+    :type tags: dict[str, str]
+    :param properties: The request history properties.
+    :type properties: ~azure.mgmt.logic.models.RequestHistoryProperties
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'properties': {'key': 'properties', 'type': 'RequestHistoryProperties'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RequestHistory, self).__init__(**kwargs)
+        self.properties = kwargs.get('properties', None)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/request_history_paged.py b/azure-mgmt-logic/azure/mgmt/logic/models/request_history_paged.py
new file mode 100644
index 000000000000..01d899c9e674
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/request_history_paged.py
@@ -0,0 +1,27 @@
+# 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.paging import Paged
+
+
+class RequestHistoryPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`RequestHistory <azure.mgmt.logic.models.RequestHistory>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[RequestHistory]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(RequestHistoryPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/request_history_properties.py b/azure-mgmt-logic/azure/mgmt/logic/models/request_history_properties.py
new file mode 100644
index 000000000000..241a1212a41d
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/request_history_properties.py
@@ -0,0 +1,40 @@
+# 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 RequestHistoryProperties(Model):
+    """The request history.
+
+    :param start_time: The time the request started.
+    :type start_time: datetime
+    :param end_time: The time the request ended.
+    :type end_time: datetime
+    :param request: The request.
+    :type request: ~azure.mgmt.logic.models.Request
+    :param response: The response.
+    :type response: ~azure.mgmt.logic.models.Response
+    """
+
+    _attribute_map = {
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+        'request': {'key': 'request', 'type': 'Request'},
+        'response': {'key': 'response', 'type': 'Response'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RequestHistoryProperties, self).__init__(**kwargs)
+        self.start_time = kwargs.get('start_time', None)
+        self.end_time = kwargs.get('end_time', None)
+        self.request = kwargs.get('request', None)
+        self.response = kwargs.get('response', None)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/request_history_properties_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/request_history_properties_py3.py
new file mode 100644
index 000000000000..5bb2653331e9
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/request_history_properties_py3.py
@@ -0,0 +1,40 @@
+# 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 RequestHistoryProperties(Model):
+    """The request history.
+
+    :param start_time: The time the request started.
+    :type start_time: datetime
+    :param end_time: The time the request ended.
+    :type end_time: datetime
+    :param request: The request.
+    :type request: ~azure.mgmt.logic.models.Request
+    :param response: The response.
+    :type response: ~azure.mgmt.logic.models.Response
+    """
+
+    _attribute_map = {
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+        'request': {'key': 'request', 'type': 'Request'},
+        'response': {'key': 'response', 'type': 'Response'},
+    }
+
+    def __init__(self, *, start_time=None, end_time=None, request=None, response=None, **kwargs) -> None:
+        super(RequestHistoryProperties, self).__init__(**kwargs)
+        self.start_time = start_time
+        self.end_time = end_time
+        self.request = request
+        self.response = response
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/request_history_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/request_history_py3.py
new file mode 100644
index 000000000000..855a717a27d2
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/request_history_py3.py
@@ -0,0 +1,52 @@
+# 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 .resource_py3 import Resource
+
+
+class RequestHistory(Resource):
+    """The request history.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: The resource id.
+    :vartype id: str
+    :ivar name: Gets the resource name.
+    :vartype name: str
+    :ivar type: Gets the resource type.
+    :vartype type: str
+    :param location: The resource location.
+    :type location: str
+    :param tags: The resource tags.
+    :type tags: dict[str, str]
+    :param properties: The request history properties.
+    :type properties: ~azure.mgmt.logic.models.RequestHistoryProperties
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'properties': {'key': 'properties', 'type': 'RequestHistoryProperties'},
+    }
+
+    def __init__(self, *, location: str=None, tags=None, properties=None, **kwargs) -> None:
+        super(RequestHistory, self).__init__(location=location, tags=tags, **kwargs)
+        self.properties = properties
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/request_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/request_py3.py
new file mode 100644
index 000000000000..e72ac2ab288c
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/request_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 Request(Model):
+    """A request.
+
+    :param headers: A list of all the headers attached to the request.
+    :type headers: object
+    :param uri: The destination for the request.
+    :type uri: str
+    :param method: The HTTP method used for the request.
+    :type method: str
+    """
+
+    _attribute_map = {
+        'headers': {'key': 'headers', 'type': 'object'},
+        'uri': {'key': 'uri', 'type': 'str'},
+        'method': {'key': 'method', 'type': 'str'},
+    }
+
+    def __init__(self, *, headers=None, uri: str=None, method: str=None, **kwargs) -> None:
+        super(Request, self).__init__(**kwargs)
+        self.headers = headers
+        self.uri = uri
+        self.method = method
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/response.py b/azure-mgmt-logic/azure/mgmt/logic/models/response.py
new file mode 100644
index 000000000000..f3b4a4a29e53
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/response.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 Response(Model):
+    """A response.
+
+    :param headers: A list of all the headers attached to the response.
+    :type headers: object
+    :param status_code: The status code of the response.
+    :type status_code: int
+    :param body_link: Details on the location of the body content.
+    :type body_link: ~azure.mgmt.logic.models.ContentLink
+    """
+
+    _attribute_map = {
+        'headers': {'key': 'headers', 'type': 'object'},
+        'status_code': {'key': 'statusCode', 'type': 'int'},
+        'body_link': {'key': 'bodyLink', 'type': 'ContentLink'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Response, self).__init__(**kwargs)
+        self.headers = kwargs.get('headers', None)
+        self.status_code = kwargs.get('status_code', None)
+        self.body_link = kwargs.get('body_link', None)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/response_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/response_py3.py
new file mode 100644
index 000000000000..7213223e63c4
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/response_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 Response(Model):
+    """A response.
+
+    :param headers: A list of all the headers attached to the response.
+    :type headers: object
+    :param status_code: The status code of the response.
+    :type status_code: int
+    :param body_link: Details on the location of the body content.
+    :type body_link: ~azure.mgmt.logic.models.ContentLink
+    """
+
+    _attribute_map = {
+        'headers': {'key': 'headers', 'type': 'object'},
+        'status_code': {'key': 'statusCode', 'type': 'int'},
+        'body_link': {'key': 'bodyLink', 'type': 'ContentLink'},
+    }
+
+    def __init__(self, *, headers=None, status_code: int=None, body_link=None, **kwargs) -> None:
+        super(Response, self).__init__(**kwargs)
+        self.headers = headers
+        self.status_code = status_code
+        self.body_link = body_link
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/__init__.py b/azure-mgmt-logic/azure/mgmt/logic/operations/__init__.py
index 4f914d51fe35..71ca7f9ddd5e 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/operations/__init__.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/__init__.py
@@ -17,6 +17,8 @@
 from .workflow_runs_operations import WorkflowRunsOperations
 from .workflow_run_actions_operations import WorkflowRunActionsOperations
 from .workflow_run_action_repetitions_operations import WorkflowRunActionRepetitionsOperations
+from .workflow_run_action_repetitions_request_histories_operations import WorkflowRunActionRepetitionsRequestHistoriesOperations
+from .workflow_run_action_request_histories_operations import WorkflowRunActionRequestHistoriesOperations
 from .workflow_run_action_scope_repetitions_operations import WorkflowRunActionScopeRepetitionsOperations
 from .workflow_run_operations import WorkflowRunOperations
 from .integration_accounts_operations import IntegrationAccountsOperations
@@ -39,6 +41,8 @@
     'WorkflowRunsOperations',
     'WorkflowRunActionsOperations',
     'WorkflowRunActionRepetitionsOperations',
+    'WorkflowRunActionRepetitionsRequestHistoriesOperations',
+    'WorkflowRunActionRequestHistoriesOperations',
     'WorkflowRunActionScopeRepetitionsOperations',
     'WorkflowRunOperations',
     'IntegrationAccountsOperations',
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_request_histories_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_request_histories_operations.py
new file mode 100644
index 000000000000..d39359102427
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_repetitions_request_histories_operations.py
@@ -0,0 +1,188 @@
+# 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 WorkflowRunActionRepetitionsRequestHistoriesOperations(object):
+    """WorkflowRunActionRepetitionsRequestHistoriesOperations 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: The API version. Constant value: "2018-07-01-preview".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-07-01-preview"
+
+        self.config = config
+
+    def list(
+            self, resource_group_name, workflow_name, run_name, action_name, repetition_name, custom_headers=None, raw=False, **operation_config):
+        """List a workflow run repetition request history.
+
+        :param resource_group_name: The resource group name.
+        :type resource_group_name: str
+        :param workflow_name: The workflow name.
+        :type workflow_name: str
+        :param run_name: The workflow run name.
+        :type run_name: str
+        :param action_name: The workflow action name.
+        :type action_name: str
+        :param repetition_name: The workflow repetition.
+        :type repetition_name: 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: An iterator like instance of RequestHistory
+        :rtype:
+         ~azure.mgmt.logic.models.RequestHistoryPaged[~azure.mgmt.logic.models.RequestHistory]
+        :raises:
+         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list.metadata['url']
+                path_format_arguments = {
+                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'workflowName': self._serialize.url("workflow_name", workflow_name, 'str'),
+                    'runName': self._serialize.url("run_name", run_name, 'str'),
+                    'actionName': self._serialize.url("action_name", action_name, 'str'),
+                    'repetitionName': self._serialize.url("repetition_name", repetition_name, '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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            header_parameters['Accept'] = 'application/json'
+            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, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
+
+            if response.status_code not in [200]:
+                raise models.ErrorResponseException(self._deserialize, response)
+
+            return response
+
+        # Deserialize response
+        deserialized = models.RequestHistoryPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.RequestHistoryPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/runs/{runName}/actions/{actionName}/repetitions/{repetitionName}/requestHistories'}
+
+    def get(
+            self, resource_group_name, workflow_name, run_name, action_name, repetition_name, request_history_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a workflow run repetition request history.
+
+        :param resource_group_name: The resource group name.
+        :type resource_group_name: str
+        :param workflow_name: The workflow name.
+        :type workflow_name: str
+        :param run_name: The workflow run name.
+        :type run_name: str
+        :param action_name: The workflow action name.
+        :type action_name: str
+        :param repetition_name: The workflow repetition.
+        :type repetition_name: str
+        :param request_history_name: The request history name.
+        :type request_history_name: 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: RequestHistory or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.logic.models.RequestHistory or
+         ~msrest.pipeline.ClientRawResponse
+        :raises:
+         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'workflowName': self._serialize.url("workflow_name", workflow_name, 'str'),
+            'runName': self._serialize.url("run_name", run_name, 'str'),
+            'actionName': self._serialize.url("action_name", action_name, 'str'),
+            'repetitionName': self._serialize.url("repetition_name", repetition_name, 'str'),
+            'requestHistoryName': self._serialize.url("request_history_name", request_history_name, '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['Accept'] = 'application/json'
+        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, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorResponseException(self._deserialize, response)
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('RequestHistory', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/runs/{runName}/actions/{actionName}/repetitions/{repetitionName}/requestHistories/{requestHistoryName}'}
diff --git a/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_request_histories_operations.py b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_request_histories_operations.py
new file mode 100644
index 000000000000..d6801a082c65
--- /dev/null
+++ b/azure-mgmt-logic/azure/mgmt/logic/operations/workflow_run_action_request_histories_operations.py
@@ -0,0 +1,182 @@
+# 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 WorkflowRunActionRequestHistoriesOperations(object):
+    """WorkflowRunActionRequestHistoriesOperations 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: The API version. Constant value: "2018-07-01-preview".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-07-01-preview"
+
+        self.config = config
+
+    def list(
+            self, resource_group_name, workflow_name, run_name, action_name, custom_headers=None, raw=False, **operation_config):
+        """List a workflow run request history.
+
+        :param resource_group_name: The resource group name.
+        :type resource_group_name: str
+        :param workflow_name: The workflow name.
+        :type workflow_name: str
+        :param run_name: The workflow run name.
+        :type run_name: str
+        :param action_name: The workflow action name.
+        :type action_name: 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: An iterator like instance of RequestHistory
+        :rtype:
+         ~azure.mgmt.logic.models.RequestHistoryPaged[~azure.mgmt.logic.models.RequestHistory]
+        :raises:
+         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list.metadata['url']
+                path_format_arguments = {
+                    'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'workflowName': self._serialize.url("workflow_name", workflow_name, 'str'),
+                    'runName': self._serialize.url("run_name", run_name, 'str'),
+                    'actionName': self._serialize.url("action_name", action_name, '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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            header_parameters['Accept'] = 'application/json'
+            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, header_parameters)
+            response = self._client.send(request, stream=False, **operation_config)
+
+            if response.status_code not in [200]:
+                raise models.ErrorResponseException(self._deserialize, response)
+
+            return response
+
+        # Deserialize response
+        deserialized = models.RequestHistoryPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.RequestHistoryPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/runs/{runName}/actions/{actionName}/requestHistories'}
+
+    def get(
+            self, resource_group_name, workflow_name, run_name, action_name, request_history_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a workflow run request history.
+
+        :param resource_group_name: The resource group name.
+        :type resource_group_name: str
+        :param workflow_name: The workflow name.
+        :type workflow_name: str
+        :param run_name: The workflow run name.
+        :type run_name: str
+        :param action_name: The workflow action name.
+        :type action_name: str
+        :param request_history_name: The request history name.
+        :type request_history_name: 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: RequestHistory or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.logic.models.RequestHistory or
+         ~msrest.pipeline.ClientRawResponse
+        :raises:
+         :class:`ErrorResponseException<azure.mgmt.logic.models.ErrorResponseException>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'workflowName': self._serialize.url("workflow_name", workflow_name, 'str'),
+            'runName': self._serialize.url("run_name", run_name, 'str'),
+            'actionName': self._serialize.url("action_name", action_name, 'str'),
+            'requestHistoryName': self._serialize.url("request_history_name", request_history_name, '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['Accept'] = 'application/json'
+        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, header_parameters)
+        response = self._client.send(request, stream=False, **operation_config)
+
+        if response.status_code not in [200]:
+            raise models.ErrorResponseException(self._deserialize, response)
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('RequestHistory', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Logic/workflows/{workflowName}/runs/{runName}/actions/{actionName}/requestHistories/{requestHistoryName}'}
diff --git a/azure-mgmt-logic/azure_bdist_wheel.py b/azure-mgmt-logic/azure_bdist_wheel.py
deleted file mode 100644
index 8a81d1b61775..000000000000
--- a/azure-mgmt-logic/azure_bdist_wheel.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for
-# license information.
-#--------------------------------------------------------------------------
-
-from distutils import log as logger
-import os.path
-
-from wheel.bdist_wheel import bdist_wheel
-class azure_bdist_wheel(bdist_wheel):
-    """The purpose of this class is to build wheel a little differently than the sdist,
-    without requiring to build the wheel from the sdist (i.e. you can build the wheel
-    directly from source).
-    """
-
-    description = "Create an Azure wheel distribution"
-
-    user_options = bdist_wheel.user_options + \
-        [('azure-namespace-package=', None,
-            "Name of the deepest nspkg used")]
-
-    def initialize_options(self):
-        bdist_wheel.initialize_options(self)
-        self.azure_namespace_package = None
-
-    def finalize_options(self):
-        bdist_wheel.finalize_options(self)
-        if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"):
-            raise ValueError("azure_namespace_package must finish by -nspkg")
-
-    def run(self):
-        if not self.distribution.install_requires:
-            self.distribution.install_requires = []
-        self.distribution.install_requires.append(
-            "{}>=2.0.0".format(self.azure_namespace_package))
-        bdist_wheel.run(self)
-
-    def write_record(self, bdist_dir, distinfo_dir):
-        if self.azure_namespace_package:
-            # Split and remove last part, assuming it's "nspkg"
-            subparts = self.azure_namespace_package.split('-')[0:-1]
-        folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))]
-        for azure_sub_package in folder_with_init:
-            init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py')
-            if os.path.isfile(init_file):
-                logger.info("manually remove {} while building the wheel".format(init_file))
-                os.remove(init_file)
-            else:
-                raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file))
-        bdist_wheel.write_record(self, bdist_dir, distinfo_dir)
-cmdclass = {
-    'bdist_wheel': azure_bdist_wheel,
-}
diff --git a/azure-mgmt-logic/setup.cfg b/azure-mgmt-logic/setup.cfg
index 856f4164982c..3c6e79cf31da 100644
--- a/azure-mgmt-logic/setup.cfg
+++ b/azure-mgmt-logic/setup.cfg
@@ -1,3 +1,2 @@
 [bdist_wheel]
 universal=1
-azure-namespace-package=azure-mgmt-nspkg
\ No newline at end of file
diff --git a/azure-mgmt-logic/setup.py b/azure-mgmt-logic/setup.py
index 9018d5b45c2a..760812b2cf0b 100644
--- a/azure-mgmt-logic/setup.py
+++ b/azure-mgmt-logic/setup.py
@@ -10,12 +10,6 @@
 import os.path
 from io import open
 from setuptools import find_packages, setup
-try:
-    from azure_bdist_wheel import cmdclass
-except ImportError:
-    from distutils import log as logger
-    logger.warn("Wheel is not available, disabling bdist_wheel hook")
-    cmdclass = {}
 
 # Change the PACKAGE_NAME only to change folder and different name
 PACKAGE_NAME = "azure-mgmt-logic"
@@ -76,11 +70,18 @@
         'License :: OSI Approved :: MIT License',
     ],
     zip_safe=False,
-    packages=find_packages(exclude=["tests"]),
+    packages=find_packages(exclude=[
+        'tests',
+        # Exclude packages that will be covered by PEP420 or nspkg
+        'azure',
+        'azure.mgmt',
+    ]),
     install_requires=[
         'msrest>=0.5.0',
         'msrestazure>=0.4.32,<2.0.0',
         'azure-common~=1.1',
     ],
-    cmdclass=cmdclass
+    extras_require={
+        ":python_version<'3.0'": ['azure-mgmt-nspkg'],
+    }
 )

From f2a4c5ee08c3351431592be46265eadc52d33e71 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 16 Nov 2018 11:47:53 -0800
Subject: [PATCH 07/12] Generated from 469707fc77ddb1e4989140acd566312a7f170318
 (#3807)

Don't make ResourceReference id readonly, it's causing a bug in the SDK where an Logic Apps with integration accounts can't be saved
---
 .../azure/mgmt/logic/models/key_vault_reference.py       | 5 ++---
 .../azure/mgmt/logic/models/key_vault_reference_py3.py   | 9 ++++-----
 .../azure/mgmt/logic/models/resource_reference.py        | 7 +++----
 .../azure/mgmt/logic/models/resource_reference_py3.py    | 9 ++++-----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/key_vault_reference.py b/azure-mgmt-logic/azure/mgmt/logic/models/key_vault_reference.py
index 7ce542e92b0c..88d9e767cbbe 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/key_vault_reference.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/key_vault_reference.py
@@ -18,8 +18,8 @@ class KeyVaultReference(ResourceReference):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: The resource id.
-    :vartype id: str
+    :param id: The resource id.
+    :type id: str
     :ivar name: Gets the resource name.
     :vartype name: str
     :ivar type: Gets the resource type.
@@ -27,7 +27,6 @@ class KeyVaultReference(ResourceReference):
     """
 
     _validation = {
-        'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
     }
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/key_vault_reference_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/key_vault_reference_py3.py
index bfcd7a433416..1696f9af62d1 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/key_vault_reference_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/key_vault_reference_py3.py
@@ -18,8 +18,8 @@ class KeyVaultReference(ResourceReference):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: The resource id.
-    :vartype id: str
+    :param id: The resource id.
+    :type id: str
     :ivar name: Gets the resource name.
     :vartype name: str
     :ivar type: Gets the resource type.
@@ -27,7 +27,6 @@ class KeyVaultReference(ResourceReference):
     """
 
     _validation = {
-        'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
     }
@@ -38,5 +37,5 @@ class KeyVaultReference(ResourceReference):
         'type': {'key': 'type', 'type': 'str'},
     }
 
-    def __init__(self, **kwargs) -> None:
-        super(KeyVaultReference, self).__init__(**kwargs)
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(KeyVaultReference, self).__init__(id=id, **kwargs)
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/resource_reference.py b/azure-mgmt-logic/azure/mgmt/logic/models/resource_reference.py
index 4d809125c873..728deff2c46b 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/resource_reference.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/resource_reference.py
@@ -18,8 +18,8 @@ class ResourceReference(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: The resource id.
-    :vartype id: str
+    :param id: The resource id.
+    :type id: str
     :ivar name: Gets the resource name.
     :vartype name: str
     :ivar type: Gets the resource type.
@@ -27,7 +27,6 @@ class ResourceReference(Model):
     """
 
     _validation = {
-        'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
     }
@@ -40,6 +39,6 @@ class ResourceReference(Model):
 
     def __init__(self, **kwargs):
         super(ResourceReference, self).__init__(**kwargs)
-        self.id = None
+        self.id = kwargs.get('id', None)
         self.name = None
         self.type = None
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/resource_reference_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/resource_reference_py3.py
index 371ae58efb0e..2ec7f04aab56 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/resource_reference_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/resource_reference_py3.py
@@ -18,8 +18,8 @@ class ResourceReference(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: The resource id.
-    :vartype id: str
+    :param id: The resource id.
+    :type id: str
     :ivar name: Gets the resource name.
     :vartype name: str
     :ivar type: Gets the resource type.
@@ -27,7 +27,6 @@ class ResourceReference(Model):
     """
 
     _validation = {
-        'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
     }
@@ -38,8 +37,8 @@ class ResourceReference(Model):
         'type': {'key': 'type', 'type': 'str'},
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, *, id: str=None, **kwargs) -> None:
         super(ResourceReference, self).__init__(**kwargs)
-        self.id = None
+        self.id = id
         self.name = None
         self.type = None

From 5524b1690379af6a5b8f84d5dbd94ec1d0ee19dc Mon Sep 17 00:00:00 2001
From: azuresdkci <azuresdkcheckins@gmail.com>
Date: Fri, 7 Dec 2018 18:05:37 +0000
Subject: [PATCH 08/12] Packaging update of azure-mgmt-logic

---
 azure-mgmt-logic/MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-mgmt-logic/MANIFEST.in b/azure-mgmt-logic/MANIFEST.in
index ac87972df424..6ceb27f7a96e 100644
--- a/azure-mgmt-logic/MANIFEST.in
+++ b/azure-mgmt-logic/MANIFEST.in
@@ -1,3 +1,4 @@
 include *.rst
 include azure/__init__.py
 include azure/mgmt/__init__.py
+

From dfb020385d40b12e9ca8263c57df0c1e141d0b8f Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 7 Dec 2018 10:41:25 -0800
Subject: [PATCH 09/12] Generated from 145604c497541dd3ed7dc990057d1ed6e18513ba
 (#3995)

Bugfix for swagger/sdk not matching the underlying service API
---
 .../azure/mgmt/logic/models/edifact_validation_override.py    | 4 ++--
 .../mgmt/logic/models/edifact_validation_override_py3.py      | 4 ++--
 .../azure/mgmt/logic/models/edifact_validation_settings.py    | 4 ++--
 .../mgmt/logic/models/edifact_validation_settings_py3.py      | 4 ++--
 .../azure/mgmt/logic/models/x12_validation_override.py        | 4 ++--
 .../azure/mgmt/logic/models/x12_validation_override_py3.py    | 4 ++--
 .../azure/mgmt/logic/models/x12_validation_settings.py        | 4 ++--
 .../azure/mgmt/logic/models/x12_validation_settings_py3.py    | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override.py
index 129f07f7be21..667ed14c90a0 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override.py
@@ -55,8 +55,8 @@ class EdifactValidationOverride(Model):
     _attribute_map = {
         'message_id': {'key': 'messageId', 'type': 'str'},
         'enforce_character_set': {'key': 'enforceCharacterSet', 'type': 'bool'},
-        'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
-        'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
+        'validate_edi_types': {'key': 'validateEDITypes', 'type': 'bool'},
+        'validate_xsd_types': {'key': 'validateXSDTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override_py3.py
index cdd71cc873db..a71de0a66f79 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_override_py3.py
@@ -55,8 +55,8 @@ class EdifactValidationOverride(Model):
     _attribute_map = {
         'message_id': {'key': 'messageId', 'type': 'str'},
         'enforce_character_set': {'key': 'enforceCharacterSet', 'type': 'bool'},
-        'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
-        'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
+        'validate_edi_types': {'key': 'validateEDITypes', 'type': 'bool'},
+        'validate_xsd_types': {'key': 'validateXSDTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings.py
index 576986924cb8..9a0c3ba33da2 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings.py
@@ -70,8 +70,8 @@ class EdifactValidationSettings(Model):
         'interchange_control_number_validity_days': {'key': 'interchangeControlNumberValidityDays', 'type': 'int'},
         'check_duplicate_group_control_number': {'key': 'checkDuplicateGroupControlNumber', 'type': 'bool'},
         'check_duplicate_transaction_set_control_number': {'key': 'checkDuplicateTransactionSetControlNumber', 'type': 'bool'},
-        'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
-        'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
+        'validate_edi_types': {'key': 'validateEDITypes', 'type': 'bool'},
+        'validate_xsd_types': {'key': 'validateXSDTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings_py3.py
index e774fdc97808..4b3ed23a8abc 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/edifact_validation_settings_py3.py
@@ -70,8 +70,8 @@ class EdifactValidationSettings(Model):
         'interchange_control_number_validity_days': {'key': 'interchangeControlNumberValidityDays', 'type': 'int'},
         'check_duplicate_group_control_number': {'key': 'checkDuplicateGroupControlNumber', 'type': 'bool'},
         'check_duplicate_transaction_set_control_number': {'key': 'checkDuplicateTransactionSetControlNumber', 'type': 'bool'},
-        'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
-        'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
+        'validate_edi_types': {'key': 'validateEDITypes', 'type': 'bool'},
+        'validate_xsd_types': {'key': 'validateXSDTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override.py
index 6ec4b95c0e0e..35beb6787a74 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override.py
@@ -54,8 +54,8 @@ class X12ValidationOverride(Model):
 
     _attribute_map = {
         'message_id': {'key': 'messageId', 'type': 'str'},
-        'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
-        'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
+        'validate_edi_types': {'key': 'validateEDITypes', 'type': 'bool'},
+        'validate_xsd_types': {'key': 'validateXSDTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'validate_character_set': {'key': 'validateCharacterSet', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override_py3.py
index 00ebda132bd4..4b27fb024434 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_override_py3.py
@@ -54,8 +54,8 @@ class X12ValidationOverride(Model):
 
     _attribute_map = {
         'message_id': {'key': 'messageId', 'type': 'str'},
-        'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
-        'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
+        'validate_edi_types': {'key': 'validateEDITypes', 'type': 'bool'},
+        'validate_xsd_types': {'key': 'validateXSDTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'validate_character_set': {'key': 'validateCharacterSet', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings.py
index 315bcafddafe..3fcbee7a88a4 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings.py
@@ -70,8 +70,8 @@ class X12ValidationSettings(Model):
         'interchange_control_number_validity_days': {'key': 'interchangeControlNumberValidityDays', 'type': 'int'},
         'check_duplicate_group_control_number': {'key': 'checkDuplicateGroupControlNumber', 'type': 'bool'},
         'check_duplicate_transaction_set_control_number': {'key': 'checkDuplicateTransactionSetControlNumber', 'type': 'bool'},
-        'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
-        'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
+        'validate_edi_types': {'key': 'validateEDITypes', 'type': 'bool'},
+        'validate_xsd_types': {'key': 'validateXSDTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},
diff --git a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings_py3.py b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings_py3.py
index 21c23d37298d..176e112201f9 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings_py3.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/models/x12_validation_settings_py3.py
@@ -70,8 +70,8 @@ class X12ValidationSettings(Model):
         'interchange_control_number_validity_days': {'key': 'interchangeControlNumberValidityDays', 'type': 'int'},
         'check_duplicate_group_control_number': {'key': 'checkDuplicateGroupControlNumber', 'type': 'bool'},
         'check_duplicate_transaction_set_control_number': {'key': 'checkDuplicateTransactionSetControlNumber', 'type': 'bool'},
-        'validate_edi_types': {'key': 'validateEdiTypes', 'type': 'bool'},
-        'validate_xsd_types': {'key': 'validateXsdTypes', 'type': 'bool'},
+        'validate_edi_types': {'key': 'validateEDITypes', 'type': 'bool'},
+        'validate_xsd_types': {'key': 'validateXSDTypes', 'type': 'bool'},
         'allow_leading_and_trailing_spaces_and_zeroes': {'key': 'allowLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trim_leading_and_trailing_spaces_and_zeroes': {'key': 'trimLeadingAndTrailingSpacesAndZeroes', 'type': 'bool'},
         'trailing_separator_policy': {'key': 'trailingSeparatorPolicy', 'type': 'str'},

From da08ff3df7d0a530cc0ec86fe2160c2272c169ba Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <laurent.mazuel@gmail.com>
Date: Mon, 10 Dec 2018 13:33:59 -0800
Subject: [PATCH 10/12] Update version.py

---
 azure-mgmt-logic/azure/mgmt/logic/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-mgmt-logic/azure/mgmt/logic/version.py b/azure-mgmt-logic/azure/mgmt/logic/version.py
index 640f86d33a0d..c6d87df7a7b3 100644
--- a/azure-mgmt-logic/azure/mgmt/logic/version.py
+++ b/azure-mgmt-logic/azure/mgmt/logic/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2018-07-01-preview"
+VERSION = "4.0.0rc1"
 

From be9f25e85d98a4f9631ad478eb3930fc5d28cc44 Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <laurent.mazuel@gmail.com>
Date: Mon, 10 Dec 2018 13:44:25 -0800
Subject: [PATCH 11/12] ChangeLog

---
 azure-mgmt-logic/HISTORY.rst | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/azure-mgmt-logic/HISTORY.rst b/azure-mgmt-logic/HISTORY.rst
index 721fc826b313..4691971cbe39 100644
--- a/azure-mgmt-logic/HISTORY.rst
+++ b/azure-mgmt-logic/HISTORY.rst
@@ -3,6 +3,40 @@
 Release History
 ===============
 
+4.0.0rc1 (2018-12-10)
++++++++++++++++++++++
+
+**Features**
+
+- Added operation WorkflowsOperations.validate_by_location
+- Added operation WorkflowsOperations.validate_by_resource_group
+- Added operation IntegrationAccountsOperations.list_callback_url
+- Added operation group WorkflowRunActionRequestHistoriesOperations
+- Added operation group Operations
+- Added operation group WorkflowRunActionScopeRepetitionsOperations
+- Added operation group WorkflowVersionTriggersOperations
+- Added operation group IntegrationAccountSessionsOperations
+- Added operation group IntegrationAccountCertificatesOperations
+- Added operation group IntegrationAccountSchemasOperations
+- Added operation group WorkflowRunActionRepetitionsRequestHistoriesOperations
+- Added operation group IntegrationAccountAgreementsOperations
+- Added operation group IntegrationAccountMapsOperations
+- Added operation group IntegrationAccountPartnersOperations
+
+**Breaking changes**
+
+- Removed operation WorkflowsOperations.validate_workflow
+- Removed operation WorkflowsOperations.validate
+- Removed operation WorkflowVersionsOperations.list_callback_url
+- Removed operation IntegrationAccountsOperations.get_callback_url
+- Removed operation group AgreementsOperations
+- Removed operation group SessionsOperations
+- Removed operation group CertificatesOperations
+- Removed operation group SchemasOperations
+- Removed operation group MapsOperations
+- Removed operation group WorkflowRunActionScopedRepetitionsOperations
+- Removed operation group PartnersOperations
+
 3.0.0 (2018-05-18)
 ++++++++++++++++++
 
@@ -50,7 +84,7 @@ This version uses a next-generation code generator that *might* introduce breaki
 
   - Return type changes from `msrestazure.azure_operation.AzureOperationPoller` to `msrest.polling.LROPoller`. External API is the same.
   - Return type is now **always** a `msrest.polling.LROPoller`, regardless of the optional parameters used.
-  - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, 
+  - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`,
     without polling, now this returns an LROPoller. After polling, the final resource will be returned as a `ClientRawResponse`.
   - New `polling` parameter. The default behavior is `Polling=True` which will poll using ARM algorithm. When `Polling=False`,
     the response of the initial call will be returned without polling.

From 9eb78765fb6bc68f9c0ac2240c8e16b6fa20756f Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <laurent.mazuel@gmail.com>
Date: Mon, 10 Dec 2018 13:45:49 -0800
Subject: [PATCH 12/12] Record with latest API

---
 .../recordings/test_mgmt_apps.test_logic.yaml | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/azure-mgmt-logic/tests/recordings/test_mgmt_apps.test_logic.yaml b/azure-mgmt-logic/tests/recordings/test_mgmt_apps.test_logic.yaml
index 8777eac89e8d..7c11739b684c 100644
--- a/azure-mgmt-logic/tests/recordings/test_mgmt_apps.test_logic.yaml
+++ b/azure-mgmt-logic/tests/recordings/test_mgmt_apps.test_logic.yaml
@@ -1,34 +1,32 @@
 interactions:
 - request:
-    body: '{"properties": {"definition": {"$schema": "https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#",
-      "actions": {}, "outputs": {}, "triggers": {}, "parameters": {}, "contentVersion":
-      "1.0.0.0"}}, "location": "West US"}'
+    body: '{"location": "West US", "properties": {"definition": {"$schema": "https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#",
+      "contentVersion": "1.0.0.0", "parameters": {}, "triggers": {}, "actions": {},
+      "outputs": {}}}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['268']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.5.1 (Windows-10-10.0.14393-SP0) requests/2.12.1 msrest/0.4.6
-          msrest_azure/0.4.7 logicmanagementclient/2.0.0 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17763-SP0) requests/2.20.1 msrest/0.5.5
+          msrest_azure/0.4.34 azure-mgmt-logic/4.0.0rc1 Azure-SDK-For-Python]
       accept-language: [en-US]
-      x-ms-client-request-id: [19de47ca-0a83-11e7-b965-ecb1d756380e]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_apps_test_logic86a60a43/providers/Microsoft.Logic/workflows/12HourHeartBeat?api-version=2016-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_apps_test_logic86a60a43/providers/Microsoft.Logic/workflows/12HourHeartBeat?api-version=2018-07-01-preview
   response:
-    body: {string: '{"properties":{"provisioningState":"Succeeded","createdTime":"2017-03-16T19:59:46.2363547Z","changedTime":"2017-03-16T19:59:46.2363547Z","state":"Enabled","version":"08587119124992771971","accessEndpoint":"https://prod-26.westus.logic.azure.com:443/workflows/30716e4017654266ac30fa93fa70a059","definition":{"$schema":"https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#","contentVersion":"1.0.0.0","parameters":{},"triggers":{},"actions":{},"outputs":{}},"parameters":{},"endpointsConfiguration":{"workflow":{"outgoingIpAddresses":[{"address":"52.160.92.112"},{"address":"40.118.244.241"},{"address":"40.118.241.243"}],"accessEndpointIpAddresses":[{"address":"52.160.90.237"},{"address":"138.91.188.137"},{"address":"13.91.252.184"}]},"connector":{"outgoingIpAddresses":[{"address":"104.40.51.248"}]}}},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_apps_test_logic86a60a43/providers/Microsoft.Logic/workflows/12HourHeartBeat","name":"12HourHeartBeat","type":"Microsoft.Logic/workflows","location":"West
+    body: {string: '{"properties":{"provisioningState":"Succeeded","createdTime":"2018-12-10T21:44:59.8075127Z","changedTime":"2018-12-10T21:44:59.793436Z","state":"Enabled","version":"08586571285857002143","accessEndpoint":"https://prod-39.westus.logic.azure.com:443/workflows/c16d097f07b74d8d845e4d08e4b96b87","definition":{"$schema":"https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#","contentVersion":"1.0.0.0","parameters":{},"triggers":{},"actions":{},"outputs":{}},"parameters":{},"endpointsConfiguration":{"workflow":{"outgoingIpAddresses":[{"address":"52.160.92.112"},{"address":"40.118.244.241"},{"address":"40.118.241.243"},{"address":"157.56.162.53"},{"address":"157.56.167.147"},{"address":"104.42.49.145"},{"address":"40.83.164.80"},{"address":"104.42.38.32"}],"accessEndpointIpAddresses":[{"address":"52.160.90.237"},{"address":"138.91.188.137"},{"address":"13.91.252.184"},{"address":"157.56.160.212
+        "}]},"connector":{"outgoingIpAddresses":[{"address":"104.40.51.248"}]}}},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_apps_test_logic86a60a43/providers/Microsoft.Logic/workflows/12HourHeartBeat","name":"12HourHeartBeat","type":"Microsoft.Logic/workflows","location":"West
         US"}'}
     headers:
-      Cache-Control: [no-cache]
-      Content-Length: ['1098']
-      Content-Type: [application/json; charset=utf-8]
-      Date: ['Thu, 16 Mar 2017 19:59:46 GMT']
-      Expires: ['-1']
-      Pragma: [no-cache]
-      Strict-Transport-Security: [max-age=31536000; includeSubDomains]
-      x-ms-correlation-request-id: [562b4a8d-1dfc-41bc-ad96-ebae6dadb28f]
+      cache-control: [no-cache]
+      content-length: ['1266']
+      content-type: [application/json; charset=utf-8]
+      date: ['Mon, 10 Dec 2018 21:45:00 GMT']
+      expires: ['-1']
+      pragma: [no-cache]
+      strict-transport-security: [max-age=31536000; includeSubDomains]
+      x-content-type-options: [nosniff]
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
-      x-ms-request-id: ['westus:0a51f962-b00f-4cba-b6b5-056156e3d6ea']
-      x-ms-routing-request-id: ['CENTRALUS:20170316T195946Z:562b4a8d-1dfc-41bc-ad96-ebae6dadb28f']
     status: {code: 201, message: Created}
 version: 1