Generated from 4932b37816f51bb9c33c8a7fc2dfd9818e7d59aa

AzureSDKAutomation · Nov 5, 2020 · 0224c72 · 0224c72
1 parent 755bff5
commit 0224c72
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py
@@ -1329,7 +1329,6 @@
     DayOfWeek,
     DaysOfWeek,
     RecurrenceFrequency,
-    DataFlowComputeType,
     AzureFunctionActivityMethod,
     WebActivityMethod,
     OraclePartitionOption,
@@ -1359,6 +1358,7 @@
     IntegrationRuntimeSsisCatalogPricingTier,
     IntegrationRuntimeLicenseType,
     IntegrationRuntimeEdition,
+    DataFlowComputeType,
     SsisObjectMetadataType,
     IntegrationRuntimeAuthKeyName,
     CopyBehaviorType,
@@ -2053,7 +2053,6 @@
     'DayOfWeek',
     'DaysOfWeek',
     'RecurrenceFrequency',
-    'DataFlowComputeType',
     'AzureFunctionActivityMethod',
     'WebActivityMethod',
     'OraclePartitionOption',
@@ -2083,6 +2082,7 @@
     'IntegrationRuntimeSsisCatalogPricingTier',
     'IntegrationRuntimeLicenseType',
     'IntegrationRuntimeEdition',
+    'DataFlowComputeType',
     'SsisObjectMetadataType',
     'IntegrationRuntimeAuthKeyName',
     'CopyBehaviorType',

diff --git a/...e-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py b/...e-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py
@@ -384,13 +384,6 @@ class RecurrenceFrequency(str, Enum):
     year = "Year"
 
 
-class DataFlowComputeType(str, Enum):
-
-    general = "General"
-    memory_optimized = "MemoryOptimized"
-    compute_optimized = "ComputeOptimized"
-
-
 class AzureFunctionActivityMethod(str, Enum):
 
     get = "GET"
@@ -606,6 +599,13 @@ class IntegrationRuntimeEdition(str, Enum):
     enterprise = "Enterprise"
 
 
+class DataFlowComputeType(str, Enum):
+
+    general = "General"
+    memory_optimized = "MemoryOptimized"
+    compute_optimized = "ComputeOptimized"
+
+
 class SsisObjectMetadataType(str, Enum):
 
     folder = "Folder"

diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py
@@ -13462,17 +13462,17 @@ class ExecuteDataFlowActivityTypePropertiesCompute(Model):
 
     :param compute_type: Compute type of the cluster which will execute data
      flow job. Possible values include: 'General', 'MemoryOptimized',
-     'ComputeOptimized'
-    :type compute_type: str or
-     ~azure.mgmt.datafactory.models.DataFlowComputeType
+     'ComputeOptimized'. Type: string (or Expression with resultType string)
+    :type compute_type: object
     :param core_count: Core count of the cluster which will execute data flow
-     job. Supported values are: 8, 16, 32, 48, 80, 144 and 272.
-    :type core_count: int
+     job. Supported values are: 8, 16, 32, 48, 80, 144 and 272. Type: integer
+     (or Expression with resultType integer)
+    :type core_count: object
     """
 
     _attribute_map = {
-        'compute_type': {'key': 'computeType', 'type': 'str'},
-        'core_count': {'key': 'coreCount', 'type': 'int'},
+        'compute_type': {'key': 'computeType', 'type': 'object'},
+        'core_count': {'key': 'coreCount', 'type': 'object'},
     }
 
     def __init__(self, **kwargs):

diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py
@@ -13462,20 +13462,20 @@ class ExecuteDataFlowActivityTypePropertiesCompute(Model):
 
     :param compute_type: Compute type of the cluster which will execute data
      flow job. Possible values include: 'General', 'MemoryOptimized',
-     'ComputeOptimized'
-    :type compute_type: str or
-     ~azure.mgmt.datafactory.models.DataFlowComputeType
+     'ComputeOptimized'. Type: string (or Expression with resultType string)
+    :type compute_type: object
     :param core_count: Core count of the cluster which will execute data flow
-     job. Supported values are: 8, 16, 32, 48, 80, 144 and 272.
-    :type core_count: int
+     job. Supported values are: 8, 16, 32, 48, 80, 144 and 272. Type: integer
+     (or Expression with resultType integer)
+    :type core_count: object
     """
 
     _attribute_map = {
-        'compute_type': {'key': 'computeType', 'type': 'str'},
-        'core_count': {'key': 'coreCount', 'type': 'int'},
+        'compute_type': {'key': 'computeType', 'type': 'object'},
+        'core_count': {'key': 'coreCount', 'type': 'object'},
     }
 
-    def __init__(self, *, compute_type=None, core_count: int=None, **kwargs) -> None:
+    def __init__(self, *, compute_type=None, core_count=None, **kwargs) -> None:
         super(ExecuteDataFlowActivityTypePropertiesCompute, self).__init__(**kwargs)
         self.compute_type = compute_type
         self.core_count = core_count