diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py index 86680dcf55dc..ab57aa1c0bfa 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py @@ -23,6 +23,7 @@ from .operations.pipeline_runs_operations import PipelineRunsOperations from .operations.activity_runs_operations import ActivityRunsOperations from .operations.triggers_operations import TriggersOperations +from .operations.trigger_runs_operations import TriggerRunsOperations from . import models @@ -84,6 +85,8 @@ class DataFactoryManagementClient(SDKClient): :vartype activity_runs: azure.mgmt.datafactory.operations.ActivityRunsOperations :ivar triggers: Triggers operations :vartype triggers: azure.mgmt.datafactory.operations.TriggersOperations + :ivar trigger_runs: TriggerRuns operations + :vartype trigger_runs: azure.mgmt.datafactory.operations.TriggerRunsOperations :param credentials: Credentials needed for the client to connect to Azure. :type credentials: :mod:`A msrestazure Credentials @@ -100,7 +103,7 @@ def __init__( super(DataFactoryManagementClient, 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 = '2017-09-01-preview' + self.api_version = '2018-06-01' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) @@ -124,3 +127,5 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.triggers = TriggersOperations( self._client, self.config, self._serialize, self._deserialize) + self.trigger_runs = TriggerRunsOperations( + self._client, self.config, self._serialize, self._deserialize) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py index ed790633bf18..99f5c25e46e5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py @@ -18,7 +18,7 @@ from .azure_key_vault_secret_reference_py3 import AzureKeyVaultSecretReference from .secret_base_py3 import SecretBase from .factory_identity_py3 import FactoryIdentity - from .factory_vsts_configuration_py3 import FactoryVSTSConfiguration + from .factory_repo_configuration_py3 import FactoryRepoConfiguration from .factory_py3 import Factory from .integration_runtime_py3 import IntegrationRuntime from .integration_runtime_resource_py3 import IntegrationRuntimeResource @@ -39,27 +39,30 @@ from .trigger_py3 import Trigger from .trigger_resource_py3 import TriggerResource from .create_run_response_py3 import CreateRunResponse - from .error_response_py3 import ErrorResponse, ErrorResponseException + from .factory_vsts_configuration_py3 import FactoryVSTSConfiguration + from .factory_git_hub_configuration_py3 import FactoryGitHubConfiguration from .factory_repo_update_py3 import FactoryRepoUpdate from .pipeline_reference_py3 import PipelineReference from .trigger_pipeline_reference_py3 import TriggerPipelineReference from .factory_update_parameters_py3 import FactoryUpdateParameters from .dataset_reference_py3 import DatasetReference - from .pipeline_run_query_filter_py3 import PipelineRunQueryFilter - from .pipeline_run_query_order_by_py3 import PipelineRunQueryOrderBy - from .pipeline_run_filter_parameters_py3 import PipelineRunFilterParameters + from .run_query_filter_py3 import RunQueryFilter + from .run_query_order_by_py3 import RunQueryOrderBy + from .run_filter_parameters_py3 import RunFilterParameters from .pipeline_run_invoked_by_py3 import PipelineRunInvokedBy from .pipeline_run_py3 import PipelineRun - from .pipeline_run_query_response_py3 import PipelineRunQueryResponse + from .pipeline_runs_query_response_py3 import PipelineRunsQueryResponse from .activity_run_py3 import ActivityRun + from .activity_runs_query_response_py3 import ActivityRunsQueryResponse from .trigger_run_py3 import TriggerRun + from .trigger_runs_query_response_py3 import TriggerRunsQueryResponse from .operation_display_py3 import OperationDisplay from .operation_log_specification_py3 import OperationLogSpecification from .operation_metric_availability_py3 import OperationMetricAvailability + from .operation_metric_dimension_py3 import OperationMetricDimension from .operation_metric_specification_py3 import OperationMetricSpecification from .operation_service_specification_py3 import OperationServiceSpecification from .operation_py3 import Operation - from .operation_list_response_py3 import OperationListResponse from .responsys_linked_service_py3 import ResponsysLinkedService from .azure_databricks_linked_service_py3 import AzureDatabricksLinkedService from .azure_data_lake_analytics_linked_service_py3 import AzureDataLakeAnalyticsLinkedService @@ -312,16 +315,12 @@ from .if_condition_activity_py3 import IfConditionActivity from .execute_pipeline_activity_py3 import ExecutePipelineActivity from .control_activity_py3 import ControlActivity - from .linked_integration_runtime_py3 import LinkedIntegrationRuntime from .self_hosted_integration_runtime_node_py3 import SelfHostedIntegrationRuntimeNode from .self_hosted_integration_runtime_status_py3 import SelfHostedIntegrationRuntimeStatus from .managed_integration_runtime_operation_result_py3 import ManagedIntegrationRuntimeOperationResult from .managed_integration_runtime_error_py3 import ManagedIntegrationRuntimeError from .managed_integration_runtime_node_py3 import ManagedIntegrationRuntimeNode from .managed_integration_runtime_status_py3 import ManagedIntegrationRuntimeStatus - from .linked_integration_runtime_rbac_py3 import LinkedIntegrationRuntimeRbac - from .linked_integration_runtime_key_py3 import LinkedIntegrationRuntimeKey - from .linked_integration_runtime_properties_py3 import LinkedIntegrationRuntimeProperties from .self_hosted_integration_runtime_py3 import SelfHostedIntegrationRuntime from .integration_runtime_custom_setup_script_properties_py3 import IntegrationRuntimeCustomSetupScriptProperties from .integration_runtime_ssis_catalog_info_py3 import IntegrationRuntimeSsisCatalogInfo @@ -332,7 +331,6 @@ from .integration_runtime_node_ip_address_py3 import IntegrationRuntimeNodeIpAddress from .integration_runtime_node_monitoring_data_py3 import IntegrationRuntimeNodeMonitoringData from .integration_runtime_monitoring_data_py3 import IntegrationRuntimeMonitoringData - from .integration_runtime_remove_node_request_py3 import IntegrationRuntimeRemoveNodeRequest from .integration_runtime_auth_keys_py3 import IntegrationRuntimeAuthKeys from .integration_runtime_regenerate_key_parameters_py3 import IntegrationRuntimeRegenerateKeyParameters from .integration_runtime_connection_info_py3 import IntegrationRuntimeConnectionInfo @@ -345,7 +343,7 @@ from .azure_key_vault_secret_reference import AzureKeyVaultSecretReference from .secret_base import SecretBase from .factory_identity import FactoryIdentity - from .factory_vsts_configuration import FactoryVSTSConfiguration + from .factory_repo_configuration import FactoryRepoConfiguration from .factory import Factory from .integration_runtime import IntegrationRuntime from .integration_runtime_resource import IntegrationRuntimeResource @@ -366,27 +364,30 @@ from .trigger import Trigger from .trigger_resource import TriggerResource from .create_run_response import CreateRunResponse - from .error_response import ErrorResponse, ErrorResponseException + from .factory_vsts_configuration import FactoryVSTSConfiguration + from .factory_git_hub_configuration import FactoryGitHubConfiguration from .factory_repo_update import FactoryRepoUpdate from .pipeline_reference import PipelineReference from .trigger_pipeline_reference import TriggerPipelineReference from .factory_update_parameters import FactoryUpdateParameters from .dataset_reference import DatasetReference - from .pipeline_run_query_filter import PipelineRunQueryFilter - from .pipeline_run_query_order_by import PipelineRunQueryOrderBy - from .pipeline_run_filter_parameters import PipelineRunFilterParameters + from .run_query_filter import RunQueryFilter + from .run_query_order_by import RunQueryOrderBy + from .run_filter_parameters import RunFilterParameters from .pipeline_run_invoked_by import PipelineRunInvokedBy from .pipeline_run import PipelineRun - from .pipeline_run_query_response import PipelineRunQueryResponse + from .pipeline_runs_query_response import PipelineRunsQueryResponse from .activity_run import ActivityRun + from .activity_runs_query_response import ActivityRunsQueryResponse from .trigger_run import TriggerRun + from .trigger_runs_query_response import TriggerRunsQueryResponse from .operation_display import OperationDisplay from .operation_log_specification import OperationLogSpecification from .operation_metric_availability import OperationMetricAvailability + from .operation_metric_dimension import OperationMetricDimension from .operation_metric_specification import OperationMetricSpecification from .operation_service_specification import OperationServiceSpecification from .operation import Operation - from .operation_list_response import OperationListResponse from .responsys_linked_service import ResponsysLinkedService from .azure_databricks_linked_service import AzureDatabricksLinkedService from .azure_data_lake_analytics_linked_service import AzureDataLakeAnalyticsLinkedService @@ -639,16 +640,12 @@ from .if_condition_activity import IfConditionActivity from .execute_pipeline_activity import ExecutePipelineActivity from .control_activity import ControlActivity - from .linked_integration_runtime import LinkedIntegrationRuntime from .self_hosted_integration_runtime_node import SelfHostedIntegrationRuntimeNode from .self_hosted_integration_runtime_status import SelfHostedIntegrationRuntimeStatus from .managed_integration_runtime_operation_result import ManagedIntegrationRuntimeOperationResult from .managed_integration_runtime_error import ManagedIntegrationRuntimeError from .managed_integration_runtime_node import ManagedIntegrationRuntimeNode from .managed_integration_runtime_status import ManagedIntegrationRuntimeStatus - from .linked_integration_runtime_rbac import LinkedIntegrationRuntimeRbac - from .linked_integration_runtime_key import LinkedIntegrationRuntimeKey - from .linked_integration_runtime_properties import LinkedIntegrationRuntimeProperties from .self_hosted_integration_runtime import SelfHostedIntegrationRuntime from .integration_runtime_custom_setup_script_properties import IntegrationRuntimeCustomSetupScriptProperties from .integration_runtime_ssis_catalog_info import IntegrationRuntimeSsisCatalogInfo @@ -659,28 +656,26 @@ from .integration_runtime_node_ip_address import IntegrationRuntimeNodeIpAddress from .integration_runtime_node_monitoring_data import IntegrationRuntimeNodeMonitoringData from .integration_runtime_monitoring_data import IntegrationRuntimeMonitoringData - from .integration_runtime_remove_node_request import IntegrationRuntimeRemoveNodeRequest from .integration_runtime_auth_keys import IntegrationRuntimeAuthKeys from .integration_runtime_regenerate_key_parameters import IntegrationRuntimeRegenerateKeyParameters from .integration_runtime_connection_info import IntegrationRuntimeConnectionInfo +from .operation_paged import OperationPaged from .factory_paged import FactoryPaged from .integration_runtime_resource_paged import IntegrationRuntimeResourcePaged from .linked_service_resource_paged import LinkedServiceResourcePaged from .dataset_resource_paged import DatasetResourcePaged from .pipeline_resource_paged import PipelineResourcePaged -from .activity_run_paged import ActivityRunPaged from .trigger_resource_paged import TriggerResourcePaged -from .trigger_run_paged import TriggerRunPaged from .data_factory_management_client_enums import ( IntegrationRuntimeState, IntegrationRuntimeAutoUpdate, ParameterType, DependencyCondition, TriggerRuntimeState, - PipelineRunQueryFilterOperand, - PipelineRunQueryFilterOperator, - PipelineRunQueryOrderByField, - PipelineRunQueryOrder, + RunQueryFilterOperand, + RunQueryFilterOperator, + RunQueryOrderByField, + RunQueryOrder, TriggerRunStatus, SparkServerType, SparkThriftTransportProtocol, @@ -741,7 +736,7 @@ 'AzureKeyVaultSecretReference', 'SecretBase', 'FactoryIdentity', - 'FactoryVSTSConfiguration', + 'FactoryRepoConfiguration', 'Factory', 'IntegrationRuntime', 'IntegrationRuntimeResource', @@ -762,27 +757,30 @@ 'Trigger', 'TriggerResource', 'CreateRunResponse', - 'ErrorResponse', 'ErrorResponseException', + 'FactoryVSTSConfiguration', + 'FactoryGitHubConfiguration', 'FactoryRepoUpdate', 'PipelineReference', 'TriggerPipelineReference', 'FactoryUpdateParameters', 'DatasetReference', - 'PipelineRunQueryFilter', - 'PipelineRunQueryOrderBy', - 'PipelineRunFilterParameters', + 'RunQueryFilter', + 'RunQueryOrderBy', + 'RunFilterParameters', 'PipelineRunInvokedBy', 'PipelineRun', - 'PipelineRunQueryResponse', + 'PipelineRunsQueryResponse', 'ActivityRun', + 'ActivityRunsQueryResponse', 'TriggerRun', + 'TriggerRunsQueryResponse', 'OperationDisplay', 'OperationLogSpecification', 'OperationMetricAvailability', + 'OperationMetricDimension', 'OperationMetricSpecification', 'OperationServiceSpecification', 'Operation', - 'OperationListResponse', 'ResponsysLinkedService', 'AzureDatabricksLinkedService', 'AzureDataLakeAnalyticsLinkedService', @@ -1035,16 +1033,12 @@ 'IfConditionActivity', 'ExecutePipelineActivity', 'ControlActivity', - 'LinkedIntegrationRuntime', 'SelfHostedIntegrationRuntimeNode', 'SelfHostedIntegrationRuntimeStatus', 'ManagedIntegrationRuntimeOperationResult', 'ManagedIntegrationRuntimeError', 'ManagedIntegrationRuntimeNode', 'ManagedIntegrationRuntimeStatus', - 'LinkedIntegrationRuntimeRbac', - 'LinkedIntegrationRuntimeKey', - 'LinkedIntegrationRuntimeProperties', 'SelfHostedIntegrationRuntime', 'IntegrationRuntimeCustomSetupScriptProperties', 'IntegrationRuntimeSsisCatalogInfo', @@ -1055,27 +1049,25 @@ 'IntegrationRuntimeNodeIpAddress', 'IntegrationRuntimeNodeMonitoringData', 'IntegrationRuntimeMonitoringData', - 'IntegrationRuntimeRemoveNodeRequest', 'IntegrationRuntimeAuthKeys', 'IntegrationRuntimeRegenerateKeyParameters', 'IntegrationRuntimeConnectionInfo', + 'OperationPaged', 'FactoryPaged', 'IntegrationRuntimeResourcePaged', 'LinkedServiceResourcePaged', 'DatasetResourcePaged', 'PipelineResourcePaged', - 'ActivityRunPaged', 'TriggerResourcePaged', - 'TriggerRunPaged', 'IntegrationRuntimeState', 'IntegrationRuntimeAutoUpdate', 'ParameterType', 'DependencyCondition', 'TriggerRuntimeState', - 'PipelineRunQueryFilterOperand', - 'PipelineRunQueryFilterOperator', - 'PipelineRunQueryOrderByField', - 'PipelineRunQueryOrder', + 'RunQueryFilterOperand', + 'RunQueryFilterOperator', + 'RunQueryOrderByField', + 'RunQueryOrder', 'TriggerRunStatus', 'SparkServerType', 'SparkThriftTransportProtocol', diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity.py index 602b8d52a38b..438e4b23f7eb 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity.py @@ -29,6 +29,8 @@ class Activity(Model): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str """ @@ -43,6 +45,7 @@ class Activity(Model): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, } @@ -56,4 +59,5 @@ def __init__(self, **kwargs): self.name = kwargs.get('name', None) self.description = kwargs.get('description', None) self.depends_on = kwargs.get('depends_on', None) + self.user_properties = kwargs.get('user_properties', None) self.type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_py3.py index c1283c260908..48d13e8e631d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_py3.py @@ -29,6 +29,8 @@ class Activity(Model): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str """ @@ -43,6 +45,7 @@ class Activity(Model): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, } @@ -50,10 +53,11 @@ class Activity(Model): 'type': {'Execution': 'ExecutionActivity', 'Container': 'ControlActivity'} } - def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, **kwargs) -> None: + def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, user_properties=None, **kwargs) -> None: super(Activity, self).__init__(**kwargs) self.additional_properties = additional_properties self.name = name self.description = description self.depends_on = depends_on + self.user_properties = user_properties self.type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_run_paged.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_run_paged.py deleted file mode 100644 index ac1ccd554d32..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_run_paged.py +++ /dev/null @@ -1,27 +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.paging import Paged - - -class ActivityRunPaged(Paged): - """ - A paging container for iterating over a list of :class:`ActivityRun ` object - """ - - _attribute_map = { - 'next_link': {'key': 'nextLink', 'type': 'str'}, - 'current_page': {'key': 'value', 'type': '[ActivityRun]'} - } - - def __init__(self, *args, **kwargs): - - super(ActivityRunPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_runs_query_response.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_runs_query_response.py new file mode 100644 index 000000000000..2fcd25a5ced2 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_runs_query_response.py @@ -0,0 +1,39 @@ +# 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 ActivityRunsQueryResponse(Model): + """A list activity runs. + + All required parameters must be populated in order to send to Azure. + + :param value: Required. List of activity runs. + :type value: list[~azure.mgmt.datafactory.models.ActivityRun] + :param continuation_token: The continuation token for getting the next + page of results, if any remaining results exist, null otherwise. + :type continuation_token: str + """ + + _validation = { + 'value': {'required': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': '[ActivityRun]'}, + 'continuation_token': {'key': 'continuationToken', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ActivityRunsQueryResponse, self).__init__(**kwargs) + self.value = kwargs.get('value', None) + self.continuation_token = kwargs.get('continuation_token', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_runs_query_response_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_runs_query_response_py3.py new file mode 100644 index 000000000000..ee3eae141635 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_runs_query_response_py3.py @@ -0,0 +1,39 @@ +# 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 ActivityRunsQueryResponse(Model): + """A list activity runs. + + All required parameters must be populated in order to send to Azure. + + :param value: Required. List of activity runs. + :type value: list[~azure.mgmt.datafactory.models.ActivityRun] + :param continuation_token: The continuation token for getting the next + page of results, if any remaining results exist, null otherwise. + :type continuation_token: str + """ + + _validation = { + 'value': {'required': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': '[ActivityRun]'}, + 'continuation_token': {'key': 'continuationToken', 'type': 'str'}, + } + + def __init__(self, *, value, continuation_token: str=None, **kwargs) -> None: + super(ActivityRunsQueryResponse, self).__init__(**kwargs) + self.value = value + self.continuation_token = continuation_token diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity.py index 826846634438..e9c935e65205 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity.py @@ -26,6 +26,8 @@ class AzureMLBatchExecutionActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -63,6 +65,7 @@ class AzureMLBatchExecutionActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity_py3.py index 67f0f605ca5d..e455622c0a89 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity_py3.py @@ -26,6 +26,8 @@ class AzureMLBatchExecutionActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -63,6 +65,7 @@ class AzureMLBatchExecutionActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -71,8 +74,8 @@ class AzureMLBatchExecutionActivity(ExecutionActivity): 'web_service_inputs': {'key': 'typeProperties.webServiceInputs', 'type': '{AzureMLWebServiceFile}'}, } - def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, global_parameters=None, web_service_outputs=None, web_service_inputs=None, **kwargs) -> None: - super(AzureMLBatchExecutionActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, global_parameters=None, web_service_outputs=None, web_service_inputs=None, **kwargs) -> None: + super(AzureMLBatchExecutionActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.global_parameters = global_parameters self.web_service_outputs = web_service_outputs self.web_service_inputs = web_service_inputs diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity.py index 2a6860f5f41e..6c809dd27d4d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity.py @@ -26,6 +26,8 @@ class AzureMLUpdateResourceActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -62,6 +64,7 @@ class AzureMLUpdateResourceActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity_py3.py index ff0dce23464f..13cbc43d5de5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity_py3.py @@ -26,6 +26,8 @@ class AzureMLUpdateResourceActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -62,6 +64,7 @@ class AzureMLUpdateResourceActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -70,8 +73,8 @@ class AzureMLUpdateResourceActivity(ExecutionActivity): 'trained_model_file_path': {'key': 'typeProperties.trainedModelFilePath', 'type': 'object'}, } - def __init__(self, *, name: str, trained_model_name, trained_model_linked_service_name, trained_model_file_path, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, **kwargs) -> None: - super(AzureMLUpdateResourceActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, trained_model_name, trained_model_linked_service_name, trained_model_file_path, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, **kwargs) -> None: + super(AzureMLUpdateResourceActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.trained_model_name = trained_model_name self.trained_model_linked_service_name = trained_model_linked_service_name self.trained_model_file_path = trained_model_file_path diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity.py index 200740cbe757..b1915fc2e454 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity.py @@ -30,6 +30,8 @@ class ControlActivity(Activity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str """ @@ -44,6 +46,7 @@ class ControlActivity(Activity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity_py3.py index 8623e8d151e2..929788720bc4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity_py3.py @@ -30,6 +30,8 @@ class ControlActivity(Activity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str """ @@ -44,6 +46,7 @@ class ControlActivity(Activity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, } @@ -51,6 +54,6 @@ class ControlActivity(Activity): 'type': {'Filter': 'FilterActivity', 'Until': 'UntilActivity', 'Wait': 'WaitActivity', 'ForEach': 'ForEachActivity', 'IfCondition': 'IfConditionActivity', 'ExecutePipeline': 'ExecutePipelineActivity'} } - def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, **kwargs) -> None: - super(ControlActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, **kwargs) + def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, user_properties=None, **kwargs) -> None: + super(ControlActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, **kwargs) self.type = 'Container' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity.py index e600efe42d06..e26170d07c14 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity.py @@ -26,6 +26,8 @@ class CopyActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -51,10 +53,10 @@ class CopyActivity(ExecutionActivity): the source or sink to avoid overloading the data store. Type: integer (or Expression with resultType integer), minimum: 0. :type parallel_copies: object - :param cloud_data_movement_units: Maximum number of cloud data movement - units that can be used to perform this data movement. Type: integer (or + :param data_integration_units: Maximum number of data integration units + that can be used to perform this data movement. Type: integer (or Expression with resultType integer), minimum: 0. - :type cloud_data_movement_units: object + :type data_integration_units: object :param enable_skip_incompatible_row: Whether to skip incompatible row. Default value is false. Type: boolean (or Expression with resultType boolean). @@ -81,6 +83,7 @@ class CopyActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -90,7 +93,7 @@ class CopyActivity(ExecutionActivity): 'enable_staging': {'key': 'typeProperties.enableStaging', 'type': 'object'}, 'staging_settings': {'key': 'typeProperties.stagingSettings', 'type': 'StagingSettings'}, 'parallel_copies': {'key': 'typeProperties.parallelCopies', 'type': 'object'}, - 'cloud_data_movement_units': {'key': 'typeProperties.cloudDataMovementUnits', 'type': 'object'}, + 'data_integration_units': {'key': 'typeProperties.dataIntegrationUnits', 'type': 'object'}, 'enable_skip_incompatible_row': {'key': 'typeProperties.enableSkipIncompatibleRow', 'type': 'object'}, 'redirect_incompatible_row_settings': {'key': 'typeProperties.redirectIncompatibleRowSettings', 'type': 'RedirectIncompatibleRowSettings'}, 'inputs': {'key': 'inputs', 'type': '[DatasetReference]'}, @@ -105,7 +108,7 @@ def __init__(self, **kwargs): self.enable_staging = kwargs.get('enable_staging', None) self.staging_settings = kwargs.get('staging_settings', None) self.parallel_copies = kwargs.get('parallel_copies', None) - self.cloud_data_movement_units = kwargs.get('cloud_data_movement_units', None) + self.data_integration_units = kwargs.get('data_integration_units', None) self.enable_skip_incompatible_row = kwargs.get('enable_skip_incompatible_row', None) self.redirect_incompatible_row_settings = kwargs.get('redirect_incompatible_row_settings', None) self.inputs = kwargs.get('inputs', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity_py3.py index 30dd29e42139..bdbd626bb317 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity_py3.py @@ -26,6 +26,8 @@ class CopyActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -51,10 +53,10 @@ class CopyActivity(ExecutionActivity): the source or sink to avoid overloading the data store. Type: integer (or Expression with resultType integer), minimum: 0. :type parallel_copies: object - :param cloud_data_movement_units: Maximum number of cloud data movement - units that can be used to perform this data movement. Type: integer (or + :param data_integration_units: Maximum number of data integration units + that can be used to perform this data movement. Type: integer (or Expression with resultType integer), minimum: 0. - :type cloud_data_movement_units: object + :type data_integration_units: object :param enable_skip_incompatible_row: Whether to skip incompatible row. Default value is false. Type: boolean (or Expression with resultType boolean). @@ -81,6 +83,7 @@ class CopyActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -90,22 +93,22 @@ class CopyActivity(ExecutionActivity): 'enable_staging': {'key': 'typeProperties.enableStaging', 'type': 'object'}, 'staging_settings': {'key': 'typeProperties.stagingSettings', 'type': 'StagingSettings'}, 'parallel_copies': {'key': 'typeProperties.parallelCopies', 'type': 'object'}, - 'cloud_data_movement_units': {'key': 'typeProperties.cloudDataMovementUnits', 'type': 'object'}, + 'data_integration_units': {'key': 'typeProperties.dataIntegrationUnits', 'type': 'object'}, 'enable_skip_incompatible_row': {'key': 'typeProperties.enableSkipIncompatibleRow', 'type': 'object'}, 'redirect_incompatible_row_settings': {'key': 'typeProperties.redirectIncompatibleRowSettings', 'type': 'RedirectIncompatibleRowSettings'}, 'inputs': {'key': 'inputs', 'type': '[DatasetReference]'}, 'outputs': {'key': 'outputs', 'type': '[DatasetReference]'}, } - def __init__(self, *, name: str, source, sink, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, translator=None, enable_staging=None, staging_settings=None, parallel_copies=None, cloud_data_movement_units=None, enable_skip_incompatible_row=None, redirect_incompatible_row_settings=None, inputs=None, outputs=None, **kwargs) -> None: - super(CopyActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, source, sink, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, translator=None, enable_staging=None, staging_settings=None, parallel_copies=None, data_integration_units=None, enable_skip_incompatible_row=None, redirect_incompatible_row_settings=None, inputs=None, outputs=None, **kwargs) -> None: + super(CopyActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.source = source self.sink = sink self.translator = translator self.enable_staging = enable_staging self.staging_settings = staging_settings self.parallel_copies = parallel_copies - self.cloud_data_movement_units = cloud_data_movement_units + self.data_integration_units = data_integration_units self.enable_skip_incompatible_row = enable_skip_incompatible_row self.redirect_incompatible_row_settings = redirect_incompatible_row_settings self.inputs = inputs diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity.py index 2ebe9c2bc401..9c0d65a18a16 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity.py @@ -26,6 +26,8 @@ class CustomActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -63,6 +65,7 @@ class CustomActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity_py3.py index 10542a55610f..abaee4d53210 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity_py3.py @@ -26,6 +26,8 @@ class CustomActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -63,6 +65,7 @@ class CustomActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -73,8 +76,8 @@ class CustomActivity(ExecutionActivity): 'extended_properties': {'key': 'typeProperties.extendedProperties', 'type': '{object}'}, } - def __init__(self, *, name: str, command, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, resource_linked_service=None, folder_path=None, reference_objects=None, extended_properties=None, **kwargs) -> None: - super(CustomActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, command, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, resource_linked_service=None, folder_path=None, reference_objects=None, extended_properties=None, **kwargs) -> None: + super(CustomActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.command = command self.resource_linked_service = resource_linked_service self.folder_path = folder_path diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py index fb948ae66a19..a7eb9a135489 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py @@ -57,15 +57,21 @@ class TriggerRuntimeState(str, Enum): disabled = "Disabled" -class PipelineRunQueryFilterOperand(str, Enum): +class RunQueryFilterOperand(str, Enum): pipeline_name = "PipelineName" status = "Status" run_start = "RunStart" run_end = "RunEnd" + activity_name = "ActivityName" + activity_run_start = "ActivityRunStart" + activity_run_end = "ActivityRunEnd" + activity_type = "ActivityType" + trigger_name = "TriggerName" + trigger_run_timestamp = "TriggerRunTimestamp" -class PipelineRunQueryFilterOperator(str, Enum): +class RunQueryFilterOperator(str, Enum): equals = "Equals" not_equals = "NotEquals" @@ -73,13 +79,20 @@ class PipelineRunQueryFilterOperator(str, Enum): not_in = "NotIn" -class PipelineRunQueryOrderByField(str, Enum): +class RunQueryOrderByField(str, Enum): run_start = "RunStart" run_end = "RunEnd" + pipeline_name = "PipelineName" + status = "Status" + activity_name = "ActivityName" + activity_run_start = "ActivityRunStart" + activity_run_end = "ActivityRunEnd" + trigger_name = "TriggerName" + trigger_run_timestamp = "TriggerRunTimestamp" -class PipelineRunQueryOrder(str, Enum): +class RunQueryOrder(str, Enum): asc = "ASC" desc = "DESC" diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity.py index a4b8dcdc70ab..e35da3e25273 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity.py @@ -26,6 +26,8 @@ class DataLakeAnalyticsUSQLActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -71,6 +73,7 @@ class DataLakeAnalyticsUSQLActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity_py3.py index 3b0ff6dbe94f..5e4e4968b535 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity_py3.py @@ -26,6 +26,8 @@ class DataLakeAnalyticsUSQLActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -71,6 +73,7 @@ class DataLakeAnalyticsUSQLActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -83,8 +86,8 @@ class DataLakeAnalyticsUSQLActivity(ExecutionActivity): 'compilation_mode': {'key': 'typeProperties.compilationMode', 'type': 'object'}, } - def __init__(self, *, name: str, script_path, script_linked_service, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, degree_of_parallelism=None, priority=None, parameters=None, runtime_version=None, compilation_mode=None, **kwargs) -> None: - super(DataLakeAnalyticsUSQLActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, script_path, script_linked_service, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, degree_of_parallelism=None, priority=None, parameters=None, runtime_version=None, compilation_mode=None, **kwargs) -> None: + super(DataLakeAnalyticsUSQLActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.script_path = script_path self.script_linked_service = script_linked_service self.degree_of_parallelism = degree_of_parallelism diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity.py index 136ee7debaca..fa0dfc114141 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity.py @@ -26,6 +26,8 @@ class DatabricksNotebookActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -54,6 +56,7 @@ class DatabricksNotebookActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity_py3.py index cefdc1681830..2b0ed28abd87 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity_py3.py @@ -26,6 +26,8 @@ class DatabricksNotebookActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -54,6 +56,7 @@ class DatabricksNotebookActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -61,8 +64,8 @@ class DatabricksNotebookActivity(ExecutionActivity): 'base_parameters': {'key': 'typeProperties.baseParameters', 'type': '{object}'}, } - def __init__(self, *, name: str, notebook_path, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, base_parameters=None, **kwargs) -> None: - super(DatabricksNotebookActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, notebook_path, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, base_parameters=None, **kwargs) -> None: + super(DatabricksNotebookActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.notebook_path = notebook_path self.base_parameters = base_parameters self.type = 'DatabricksNotebook' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/error_response.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/error_response.py deleted file mode 100644 index 2a48122fa578..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/error_response.py +++ /dev/null @@ -1,60 +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 -from msrest.exceptions import HttpOperationError - - -class ErrorResponse(Model): - """The object that defines the structure of an Azure Data Factory response. - - All required parameters must be populated in order to send to Azure. - - :param code: Required. Error code. - :type code: str - :param message: Required. Error message. - :type message: str - :param target: Property name/path in request associated with error. - :type target: str - :param details: Array with additional error details. - :type details: list[~azure.mgmt.datafactory.models.ErrorResponse] - """ - - _validation = { - 'code': {'required': True}, - 'message': {'required': True}, - } - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, - 'details': {'key': 'details', 'type': '[ErrorResponse]'}, - } - - def __init__(self, **kwargs): - super(ErrorResponse, self).__init__(**kwargs) - self.code = kwargs.get('code', None) - self.message = kwargs.get('message', None) - self.target = kwargs.get('target', None) - self.details = kwargs.get('details', None) - - -class ErrorResponseException(HttpOperationError): - """Server responsed with exception of type: 'ErrorResponse'. - - :param deserialize: A deserializer - :param response: Server response to be deserialized. - """ - - def __init__(self, deserialize, response, *args): - - super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/error_response_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/error_response_py3.py deleted file mode 100644 index 6b36d51c90df..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/error_response_py3.py +++ /dev/null @@ -1,60 +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 -from msrest.exceptions import HttpOperationError - - -class ErrorResponse(Model): - """The object that defines the structure of an Azure Data Factory response. - - All required parameters must be populated in order to send to Azure. - - :param code: Required. Error code. - :type code: str - :param message: Required. Error message. - :type message: str - :param target: Property name/path in request associated with error. - :type target: str - :param details: Array with additional error details. - :type details: list[~azure.mgmt.datafactory.models.ErrorResponse] - """ - - _validation = { - 'code': {'required': True}, - 'message': {'required': True}, - } - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, - 'details': {'key': 'details', 'type': '[ErrorResponse]'}, - } - - def __init__(self, *, code: str, message: str, target: str=None, details=None, **kwargs) -> None: - super(ErrorResponse, self).__init__(**kwargs) - self.code = code - self.message = message - self.target = target - self.details = details - - -class ErrorResponseException(HttpOperationError): - """Server responsed with exception of type: 'ErrorResponse'. - - :param deserialize: A deserializer - :param response: Server response to be deserialized. - """ - - def __init__(self, deserialize, response, *args): - - super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity.py index 4e3b48e75bdf..beab510d3367 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity.py @@ -26,6 +26,8 @@ class ExecutePipelineActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param pipeline: Required. Pipeline reference. @@ -48,6 +50,7 @@ class ExecutePipelineActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'pipeline': {'key': 'typeProperties.pipeline', 'type': 'PipelineReference'}, 'parameters': {'key': 'typeProperties.parameters', 'type': '{object}'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity_py3.py index 2550875243b6..ef878fec54fc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity_py3.py @@ -26,6 +26,8 @@ class ExecutePipelineActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param pipeline: Required. Pipeline reference. @@ -48,14 +50,15 @@ class ExecutePipelineActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'pipeline': {'key': 'typeProperties.pipeline', 'type': 'PipelineReference'}, 'parameters': {'key': 'typeProperties.parameters', 'type': '{object}'}, 'wait_on_completion': {'key': 'typeProperties.waitOnCompletion', 'type': 'bool'}, } - def __init__(self, *, name: str, pipeline, additional_properties=None, description: str=None, depends_on=None, parameters=None, wait_on_completion: bool=None, **kwargs) -> None: - super(ExecutePipelineActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, **kwargs) + def __init__(self, *, name: str, pipeline, additional_properties=None, description: str=None, depends_on=None, user_properties=None, parameters=None, wait_on_completion: bool=None, **kwargs) -> None: + super(ExecutePipelineActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, **kwargs) self.pipeline = pipeline self.parameters = parameters self.wait_on_completion = wait_on_completion diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity.py index f835b78bec55..66282d877881 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity.py @@ -26,6 +26,8 @@ class ExecuteSSISPackageActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -79,6 +81,7 @@ class ExecuteSSISPackageActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity_py3.py index 6b58bf34b57b..a1437141b785 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity_py3.py @@ -26,6 +26,8 @@ class ExecuteSSISPackageActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -79,6 +81,7 @@ class ExecuteSSISPackageActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -94,8 +97,8 @@ class ExecuteSSISPackageActivity(ExecutionActivity): 'property_overrides': {'key': 'typeProperties.propertyOverrides', 'type': '{SSISPropertyOverride}'}, } - def __init__(self, *, name: str, package_location, connect_via, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, runtime=None, logging_level: str=None, environment_path: str=None, project_parameters=None, package_parameters=None, project_connection_managers=None, package_connection_managers=None, property_overrides=None, **kwargs) -> None: - super(ExecuteSSISPackageActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, package_location, connect_via, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, runtime=None, logging_level: str=None, environment_path: str=None, project_parameters=None, package_parameters=None, project_connection_managers=None, package_connection_managers=None, property_overrides=None, **kwargs) -> None: + super(ExecuteSSISPackageActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.package_location = package_location self.runtime = runtime self.logging_level = logging_level diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity.py index 736ece86c29c..8e88fec0e8bd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity.py @@ -35,6 +35,8 @@ class ExecutionActivity(Activity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -54,6 +56,7 @@ class ExecutionActivity(Activity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity_py3.py index 0617ad31da47..d7290f78706a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity_py3.py @@ -35,6 +35,8 @@ class ExecutionActivity(Activity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -54,6 +56,7 @@ class ExecutionActivity(Activity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -63,8 +66,8 @@ class ExecutionActivity(Activity): 'type': {'DatabricksNotebook': 'DatabricksNotebookActivity', 'DataLakeAnalyticsU-SQL': 'DataLakeAnalyticsUSQLActivity', 'AzureMLUpdateResource': 'AzureMLUpdateResourceActivity', 'AzureMLBatchExecution': 'AzureMLBatchExecutionActivity', 'GetMetadata': 'GetMetadataActivity', 'WebActivity': 'WebActivity', 'Lookup': 'LookupActivity', 'SqlServerStoredProcedure': 'SqlServerStoredProcedureActivity', 'Custom': 'CustomActivity', 'ExecuteSSISPackage': 'ExecuteSSISPackageActivity', 'HDInsightSpark': 'HDInsightSparkActivity', 'HDInsightStreaming': 'HDInsightStreamingActivity', 'HDInsightMapReduce': 'HDInsightMapReduceActivity', 'HDInsightPig': 'HDInsightPigActivity', 'HDInsightHive': 'HDInsightHiveActivity', 'Copy': 'CopyActivity'} } - def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, **kwargs) -> None: - super(ExecutionActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, **kwargs) + def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, **kwargs) -> None: + super(ExecutionActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, **kwargs) self.linked_service_name = linked_service_name self.policy = policy self.type = 'Execution' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory.py index eaeaa060605e..614b3d7fc97a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory.py @@ -28,6 +28,8 @@ class Factory(Resource): :type location: str :param tags: The resource tags. :type tags: dict[str, str] + :ivar e_tag: Etag identifies change in the resource. + :vartype e_tag: str :param additional_properties: Unmatched properties from the message are deserialized this collection :type additional_properties: dict[str, object] @@ -39,15 +41,16 @@ class Factory(Resource): :vartype create_time: datetime :ivar version: Version of the factory. :vartype version: str - :param vsts_configuration: VSTS repo information of the factory. - :type vsts_configuration: - ~azure.mgmt.datafactory.models.FactoryVSTSConfiguration + :param repo_configuration: Git repo information of the factory. + :type repo_configuration: + ~azure.mgmt.datafactory.models.FactoryRepoConfiguration """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'e_tag': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'create_time': {'readonly': True}, 'version': {'readonly': True}, @@ -59,12 +62,13 @@ class Factory(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'e_tag': {'key': 'eTag', 'type': 'str'}, 'additional_properties': {'key': '', 'type': '{object}'}, 'identity': {'key': 'identity', 'type': 'FactoryIdentity'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'create_time': {'key': 'properties.createTime', 'type': 'iso-8601'}, 'version': {'key': 'properties.version', 'type': 'str'}, - 'vsts_configuration': {'key': 'properties.vstsConfiguration', 'type': 'FactoryVSTSConfiguration'}, + 'repo_configuration': {'key': 'properties.repoConfiguration', 'type': 'FactoryRepoConfiguration'}, } def __init__(self, **kwargs): @@ -74,4 +78,4 @@ def __init__(self, **kwargs): self.provisioning_state = None self.create_time = None self.version = None - self.vsts_configuration = kwargs.get('vsts_configuration', None) + self.repo_configuration = kwargs.get('repo_configuration', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_git_hub_configuration.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_git_hub_configuration.py new file mode 100644 index 000000000000..2c3f9b14840e --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_git_hub_configuration.py @@ -0,0 +1,61 @@ +# 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 .factory_repo_configuration import FactoryRepoConfiguration + + +class FactoryGitHubConfiguration(FactoryRepoConfiguration): + """Factory's GitHub repo information. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param account_name: Required. Account name. + :type account_name: str + :param repository_name: Required. Rrepository name. + :type repository_name: str + :param collaboration_branch: Required. Collaboration branch. + :type collaboration_branch: str + :param root_folder: Required. Root folder. + :type root_folder: str + :param last_commit_id: Last commit id. + :type last_commit_id: str + :param type: Required. Constant filled by server. + :type type: str + :ivar host_name: GitHub repo host name. + :vartype host_name: str + """ + + _validation = { + 'account_name': {'required': True}, + 'repository_name': {'required': True}, + 'collaboration_branch': {'required': True}, + 'root_folder': {'required': True}, + 'type': {'required': True}, + 'host_name': {'readonly': True}, + } + + _attribute_map = { + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'repository_name': {'key': 'repositoryName', 'type': 'str'}, + 'collaboration_branch': {'key': 'collaborationBranch', 'type': 'str'}, + 'root_folder': {'key': 'rootFolder', 'type': 'str'}, + 'last_commit_id': {'key': 'lastCommitId', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'host_name': {'key': 'hostName', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(FactoryGitHubConfiguration, self).__init__(**kwargs) + self.host_name = None + self.type = 'FactoryGithubConfiguration' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_git_hub_configuration_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_git_hub_configuration_py3.py new file mode 100644 index 000000000000..1a71ff9b4476 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_git_hub_configuration_py3.py @@ -0,0 +1,61 @@ +# 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 .factory_repo_configuration_py3 import FactoryRepoConfiguration + + +class FactoryGitHubConfiguration(FactoryRepoConfiguration): + """Factory's GitHub repo information. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param account_name: Required. Account name. + :type account_name: str + :param repository_name: Required. Rrepository name. + :type repository_name: str + :param collaboration_branch: Required. Collaboration branch. + :type collaboration_branch: str + :param root_folder: Required. Root folder. + :type root_folder: str + :param last_commit_id: Last commit id. + :type last_commit_id: str + :param type: Required. Constant filled by server. + :type type: str + :ivar host_name: GitHub repo host name. + :vartype host_name: str + """ + + _validation = { + 'account_name': {'required': True}, + 'repository_name': {'required': True}, + 'collaboration_branch': {'required': True}, + 'root_folder': {'required': True}, + 'type': {'required': True}, + 'host_name': {'readonly': True}, + } + + _attribute_map = { + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'repository_name': {'key': 'repositoryName', 'type': 'str'}, + 'collaboration_branch': {'key': 'collaborationBranch', 'type': 'str'}, + 'root_folder': {'key': 'rootFolder', 'type': 'str'}, + 'last_commit_id': {'key': 'lastCommitId', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'host_name': {'key': 'hostName', 'type': 'str'}, + } + + def __init__(self, *, account_name: str, repository_name: str, collaboration_branch: str, root_folder: str, last_commit_id: str=None, **kwargs) -> None: + super(FactoryGitHubConfiguration, self).__init__(account_name=account_name, repository_name=repository_name, collaboration_branch=collaboration_branch, root_folder=root_folder, last_commit_id=last_commit_id, **kwargs) + self.host_name = None + self.type = 'FactoryGithubConfiguration' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_py3.py index b718282c585a..0682aa5f8852 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_py3.py @@ -28,6 +28,8 @@ class Factory(Resource): :type location: str :param tags: The resource tags. :type tags: dict[str, str] + :ivar e_tag: Etag identifies change in the resource. + :vartype e_tag: str :param additional_properties: Unmatched properties from the message are deserialized this collection :type additional_properties: dict[str, object] @@ -39,15 +41,16 @@ class Factory(Resource): :vartype create_time: datetime :ivar version: Version of the factory. :vartype version: str - :param vsts_configuration: VSTS repo information of the factory. - :type vsts_configuration: - ~azure.mgmt.datafactory.models.FactoryVSTSConfiguration + :param repo_configuration: Git repo information of the factory. + :type repo_configuration: + ~azure.mgmt.datafactory.models.FactoryRepoConfiguration """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'e_tag': {'readonly': True}, 'provisioning_state': {'readonly': True}, 'create_time': {'readonly': True}, 'version': {'readonly': True}, @@ -59,19 +62,20 @@ class Factory(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'e_tag': {'key': 'eTag', 'type': 'str'}, 'additional_properties': {'key': '', 'type': '{object}'}, 'identity': {'key': 'identity', 'type': 'FactoryIdentity'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'create_time': {'key': 'properties.createTime', 'type': 'iso-8601'}, 'version': {'key': 'properties.version', 'type': 'str'}, - 'vsts_configuration': {'key': 'properties.vstsConfiguration', 'type': 'FactoryVSTSConfiguration'}, + 'repo_configuration': {'key': 'properties.repoConfiguration', 'type': 'FactoryRepoConfiguration'}, } - def __init__(self, *, location: str=None, tags=None, additional_properties=None, identity=None, vsts_configuration=None, **kwargs) -> None: + def __init__(self, *, location: str=None, tags=None, additional_properties=None, identity=None, repo_configuration=None, **kwargs) -> None: super(Factory, self).__init__(location=location, tags=tags, **kwargs) self.additional_properties = additional_properties self.identity = identity self.provisioning_state = None self.create_time = None self.version = None - self.vsts_configuration = vsts_configuration + self.repo_configuration = repo_configuration diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_configuration.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_configuration.py new file mode 100644 index 000000000000..2c7175f3a58c --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_configuration.py @@ -0,0 +1,65 @@ +# 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 FactoryRepoConfiguration(Model): + """Factory's git repo information. + + You probably want to use the sub-classes and not this class directly. Known + sub-classes are: FactoryVSTSConfiguration, FactoryGitHubConfiguration + + All required parameters must be populated in order to send to Azure. + + :param account_name: Required. Account name. + :type account_name: str + :param repository_name: Required. Rrepository name. + :type repository_name: str + :param collaboration_branch: Required. Collaboration branch. + :type collaboration_branch: str + :param root_folder: Required. Root folder. + :type root_folder: str + :param last_commit_id: Last commit id. + :type last_commit_id: str + :param type: Required. Constant filled by server. + :type type: str + """ + + _validation = { + 'account_name': {'required': True}, + 'repository_name': {'required': True}, + 'collaboration_branch': {'required': True}, + 'root_folder': {'required': True}, + 'type': {'required': True}, + } + + _attribute_map = { + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'repository_name': {'key': 'repositoryName', 'type': 'str'}, + 'collaboration_branch': {'key': 'collaborationBranch', 'type': 'str'}, + 'root_folder': {'key': 'rootFolder', 'type': 'str'}, + 'last_commit_id': {'key': 'lastCommitId', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + } + + _subtype_map = { + 'type': {'FactoryVSTSConfiguration': 'FactoryVSTSConfiguration', 'FactoryGithubConfiguration': 'FactoryGitHubConfiguration'} + } + + def __init__(self, **kwargs): + super(FactoryRepoConfiguration, self).__init__(**kwargs) + self.account_name = kwargs.get('account_name', None) + self.repository_name = kwargs.get('repository_name', None) + self.collaboration_branch = kwargs.get('collaboration_branch', None) + self.root_folder = kwargs.get('root_folder', None) + self.last_commit_id = kwargs.get('last_commit_id', None) + self.type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_configuration_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_configuration_py3.py new file mode 100644 index 000000000000..c974f2d5e7da --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_configuration_py3.py @@ -0,0 +1,65 @@ +# 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 FactoryRepoConfiguration(Model): + """Factory's git repo information. + + You probably want to use the sub-classes and not this class directly. Known + sub-classes are: FactoryVSTSConfiguration, FactoryGitHubConfiguration + + All required parameters must be populated in order to send to Azure. + + :param account_name: Required. Account name. + :type account_name: str + :param repository_name: Required. Rrepository name. + :type repository_name: str + :param collaboration_branch: Required. Collaboration branch. + :type collaboration_branch: str + :param root_folder: Required. Root folder. + :type root_folder: str + :param last_commit_id: Last commit id. + :type last_commit_id: str + :param type: Required. Constant filled by server. + :type type: str + """ + + _validation = { + 'account_name': {'required': True}, + 'repository_name': {'required': True}, + 'collaboration_branch': {'required': True}, + 'root_folder': {'required': True}, + 'type': {'required': True}, + } + + _attribute_map = { + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'repository_name': {'key': 'repositoryName', 'type': 'str'}, + 'collaboration_branch': {'key': 'collaborationBranch', 'type': 'str'}, + 'root_folder': {'key': 'rootFolder', 'type': 'str'}, + 'last_commit_id': {'key': 'lastCommitId', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + } + + _subtype_map = { + 'type': {'FactoryVSTSConfiguration': 'FactoryVSTSConfiguration', 'FactoryGithubConfiguration': 'FactoryGitHubConfiguration'} + } + + def __init__(self, *, account_name: str, repository_name: str, collaboration_branch: str, root_folder: str, last_commit_id: str=None, **kwargs) -> None: + super(FactoryRepoConfiguration, self).__init__(**kwargs) + self.account_name = account_name + self.repository_name = repository_name + self.collaboration_branch = collaboration_branch + self.root_folder = root_folder + self.last_commit_id = last_commit_id + self.type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update.py index 7651442cd45c..44eac9d287ce 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update.py @@ -13,25 +13,21 @@ class FactoryRepoUpdate(Model): - """Factory's VSTS repo information. + """Factory's git repo information. :param factory_resource_id: The factory resource id. :type factory_resource_id: str - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param vsts_configuration: VSTS repo information of the factory. - :type vsts_configuration: - ~azure.mgmt.datafactory.models.FactoryVSTSConfiguration + :param repo_configuration: Git repo information of the factory. + :type repo_configuration: + ~azure.mgmt.datafactory.models.FactoryRepoConfiguration """ _attribute_map = { 'factory_resource_id': {'key': 'factoryResourceId', 'type': 'str'}, - 'resource_group_name': {'key': 'resourceGroupName', 'type': 'str'}, - 'vsts_configuration': {'key': 'vstsConfiguration', 'type': 'FactoryVSTSConfiguration'}, + 'repo_configuration': {'key': 'repoConfiguration', 'type': 'FactoryRepoConfiguration'}, } def __init__(self, **kwargs): super(FactoryRepoUpdate, self).__init__(**kwargs) self.factory_resource_id = kwargs.get('factory_resource_id', None) - self.resource_group_name = kwargs.get('resource_group_name', None) - self.vsts_configuration = kwargs.get('vsts_configuration', None) + self.repo_configuration = kwargs.get('repo_configuration', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update_py3.py index 160f3f80ea28..68aca7a48db8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update_py3.py @@ -13,25 +13,21 @@ class FactoryRepoUpdate(Model): - """Factory's VSTS repo information. + """Factory's git repo information. :param factory_resource_id: The factory resource id. :type factory_resource_id: str - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param vsts_configuration: VSTS repo information of the factory. - :type vsts_configuration: - ~azure.mgmt.datafactory.models.FactoryVSTSConfiguration + :param repo_configuration: Git repo information of the factory. + :type repo_configuration: + ~azure.mgmt.datafactory.models.FactoryRepoConfiguration """ _attribute_map = { 'factory_resource_id': {'key': 'factoryResourceId', 'type': 'str'}, - 'resource_group_name': {'key': 'resourceGroupName', 'type': 'str'}, - 'vsts_configuration': {'key': 'vstsConfiguration', 'type': 'FactoryVSTSConfiguration'}, + 'repo_configuration': {'key': 'repoConfiguration', 'type': 'FactoryRepoConfiguration'}, } - def __init__(self, *, factory_resource_id: str=None, resource_group_name: str=None, vsts_configuration=None, **kwargs) -> None: + def __init__(self, *, factory_resource_id: str=None, repo_configuration=None, **kwargs) -> None: super(FactoryRepoUpdate, self).__init__(**kwargs) self.factory_resource_id = factory_resource_id - self.resource_group_name = resource_group_name - self.vsts_configuration = vsts_configuration + self.repo_configuration = repo_configuration diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration.py index c2c017197398..2d8d6d34861a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration.py @@ -9,44 +9,54 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.serialization import Model +from .factory_repo_configuration import FactoryRepoConfiguration -class FactoryVSTSConfiguration(Model): +class FactoryVSTSConfiguration(FactoryRepoConfiguration): """Factory's VSTS repo information. - :param account_name: VSTS account name. + All required parameters must be populated in order to send to Azure. + + :param account_name: Required. Account name. :type account_name: str - :param project_name: VSTS project name. - :type project_name: str - :param repository_name: VSTS repository name. + :param repository_name: Required. Rrepository name. :type repository_name: str - :param collaboration_branch: VSTS collaboration branch. + :param collaboration_branch: Required. Collaboration branch. :type collaboration_branch: str - :param root_folder: VSTS root folder. + :param root_folder: Required. Root folder. :type root_folder: str - :param last_commit_id: VSTS last commit id. + :param last_commit_id: Last commit id. :type last_commit_id: str + :param type: Required. Constant filled by server. + :type type: str + :param project_name: Required. VSTS project name. + :type project_name: str :param tenant_id: VSTS tenant id. :type tenant_id: str """ + _validation = { + 'account_name': {'required': True}, + 'repository_name': {'required': True}, + 'collaboration_branch': {'required': True}, + 'root_folder': {'required': True}, + 'type': {'required': True}, + 'project_name': {'required': True}, + } + _attribute_map = { 'account_name': {'key': 'accountName', 'type': 'str'}, - 'project_name': {'key': 'projectName', 'type': 'str'}, 'repository_name': {'key': 'repositoryName', 'type': 'str'}, 'collaboration_branch': {'key': 'collaborationBranch', 'type': 'str'}, 'root_folder': {'key': 'rootFolder', 'type': 'str'}, 'last_commit_id': {'key': 'lastCommitId', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'project_name': {'key': 'projectName', 'type': 'str'}, 'tenant_id': {'key': 'tenantId', 'type': 'str'}, } def __init__(self, **kwargs): super(FactoryVSTSConfiguration, self).__init__(**kwargs) - self.account_name = kwargs.get('account_name', None) self.project_name = kwargs.get('project_name', None) - self.repository_name = kwargs.get('repository_name', None) - self.collaboration_branch = kwargs.get('collaboration_branch', None) - self.root_folder = kwargs.get('root_folder', None) - self.last_commit_id = kwargs.get('last_commit_id', None) self.tenant_id = kwargs.get('tenant_id', None) + self.type = 'FactoryVSTSConfiguration' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration_py3.py index 49d6fe8b7a29..afa78e1b1f24 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration_py3.py @@ -9,44 +9,54 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.serialization import Model +from .factory_repo_configuration_py3 import FactoryRepoConfiguration -class FactoryVSTSConfiguration(Model): +class FactoryVSTSConfiguration(FactoryRepoConfiguration): """Factory's VSTS repo information. - :param account_name: VSTS account name. + All required parameters must be populated in order to send to Azure. + + :param account_name: Required. Account name. :type account_name: str - :param project_name: VSTS project name. - :type project_name: str - :param repository_name: VSTS repository name. + :param repository_name: Required. Rrepository name. :type repository_name: str - :param collaboration_branch: VSTS collaboration branch. + :param collaboration_branch: Required. Collaboration branch. :type collaboration_branch: str - :param root_folder: VSTS root folder. + :param root_folder: Required. Root folder. :type root_folder: str - :param last_commit_id: VSTS last commit id. + :param last_commit_id: Last commit id. :type last_commit_id: str + :param type: Required. Constant filled by server. + :type type: str + :param project_name: Required. VSTS project name. + :type project_name: str :param tenant_id: VSTS tenant id. :type tenant_id: str """ + _validation = { + 'account_name': {'required': True}, + 'repository_name': {'required': True}, + 'collaboration_branch': {'required': True}, + 'root_folder': {'required': True}, + 'type': {'required': True}, + 'project_name': {'required': True}, + } + _attribute_map = { 'account_name': {'key': 'accountName', 'type': 'str'}, - 'project_name': {'key': 'projectName', 'type': 'str'}, 'repository_name': {'key': 'repositoryName', 'type': 'str'}, 'collaboration_branch': {'key': 'collaborationBranch', 'type': 'str'}, 'root_folder': {'key': 'rootFolder', 'type': 'str'}, 'last_commit_id': {'key': 'lastCommitId', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'project_name': {'key': 'projectName', 'type': 'str'}, 'tenant_id': {'key': 'tenantId', 'type': 'str'}, } - def __init__(self, *, account_name: str=None, project_name: str=None, repository_name: str=None, collaboration_branch: str=None, root_folder: str=None, last_commit_id: str=None, tenant_id: str=None, **kwargs) -> None: - super(FactoryVSTSConfiguration, self).__init__(**kwargs) - self.account_name = account_name + def __init__(self, *, account_name: str, repository_name: str, collaboration_branch: str, root_folder: str, project_name: str, last_commit_id: str=None, tenant_id: str=None, **kwargs) -> None: + super(FactoryVSTSConfiguration, self).__init__(account_name=account_name, repository_name=repository_name, collaboration_branch=collaboration_branch, root_folder=root_folder, last_commit_id=last_commit_id, **kwargs) self.project_name = project_name - self.repository_name = repository_name - self.collaboration_branch = collaboration_branch - self.root_folder = root_folder - self.last_commit_id = last_commit_id self.tenant_id = tenant_id + self.type = 'FactoryVSTSConfiguration' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity.py index 409eff874d6d..29a386fdf0eb 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity.py @@ -26,6 +26,8 @@ class FilterActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param items: Required. Input array on which filter should be applied. @@ -46,6 +48,7 @@ class FilterActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'items': {'key': 'typeProperties.items', 'type': 'Expression'}, 'condition': {'key': 'typeProperties.condition', 'type': 'Expression'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity_py3.py index acc4617a3f72..970767da8b32 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity_py3.py @@ -26,6 +26,8 @@ class FilterActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param items: Required. Input array on which filter should be applied. @@ -46,13 +48,14 @@ class FilterActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'items': {'key': 'typeProperties.items', 'type': 'Expression'}, 'condition': {'key': 'typeProperties.condition', 'type': 'Expression'}, } - def __init__(self, *, name: str, items, condition, additional_properties=None, description: str=None, depends_on=None, **kwargs) -> None: - super(FilterActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, **kwargs) + def __init__(self, *, name: str, items, condition, additional_properties=None, description: str=None, depends_on=None, user_properties=None, **kwargs) -> None: + super(FilterActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, **kwargs) self.items = items self.condition = condition self.type = 'Filter' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity.py index f170cfa054ca..e5c37d53a17e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity.py @@ -27,6 +27,8 @@ class ForEachActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param is_sequential: Should the loop be executed in sequence or in @@ -54,6 +56,7 @@ class ForEachActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'is_sequential': {'key': 'typeProperties.isSequential', 'type': 'bool'}, 'batch_count': {'key': 'typeProperties.batchCount', 'type': 'int'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity_py3.py index e1ebd7ff426b..f33af7b8e254 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity_py3.py @@ -27,6 +27,8 @@ class ForEachActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param is_sequential: Should the loop be executed in sequence or in @@ -54,6 +56,7 @@ class ForEachActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'is_sequential': {'key': 'typeProperties.isSequential', 'type': 'bool'}, 'batch_count': {'key': 'typeProperties.batchCount', 'type': 'int'}, @@ -61,8 +64,8 @@ class ForEachActivity(ControlActivity): 'activities': {'key': 'typeProperties.activities', 'type': '[Activity]'}, } - def __init__(self, *, name: str, items, activities, additional_properties=None, description: str=None, depends_on=None, is_sequential: bool=None, batch_count: int=None, **kwargs) -> None: - super(ForEachActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, **kwargs) + def __init__(self, *, name: str, items, activities, additional_properties=None, description: str=None, depends_on=None, user_properties=None, is_sequential: bool=None, batch_count: int=None, **kwargs) -> None: + super(ForEachActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, **kwargs) self.is_sequential = is_sequential self.batch_count = batch_count self.items = items diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity.py index c1bac6e451f1..2d5d2c99447e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity.py @@ -26,6 +26,8 @@ class GetMetadataActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -50,6 +52,7 @@ class GetMetadataActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity_py3.py index 79e16f1a8c14..b992f462b6f3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity_py3.py @@ -26,6 +26,8 @@ class GetMetadataActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -50,6 +52,7 @@ class GetMetadataActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -57,8 +60,8 @@ class GetMetadataActivity(ExecutionActivity): 'field_list': {'key': 'typeProperties.fieldList', 'type': '[object]'}, } - def __init__(self, *, name: str, dataset, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, field_list=None, **kwargs) -> None: - super(GetMetadataActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, dataset, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, field_list=None, **kwargs) -> None: + super(GetMetadataActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.dataset = dataset self.field_list = field_list self.type = 'GetMetadata' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity.py index 21b78dbc4d24..a856c100b8b0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity.py @@ -26,6 +26,8 @@ class HDInsightHiveActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -62,6 +64,7 @@ class HDInsightHiveActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity_py3.py index 0d3e900a4398..3ced50d708ac 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity_py3.py @@ -26,6 +26,8 @@ class HDInsightHiveActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -62,6 +64,7 @@ class HDInsightHiveActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -73,8 +76,8 @@ class HDInsightHiveActivity(ExecutionActivity): 'defines': {'key': 'typeProperties.defines', 'type': '{object}'}, } - def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, storage_linked_services=None, arguments=None, get_debug_info=None, script_path=None, script_linked_service=None, defines=None, **kwargs) -> None: - super(HDInsightHiveActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, storage_linked_services=None, arguments=None, get_debug_info=None, script_path=None, script_linked_service=None, defines=None, **kwargs) -> None: + super(HDInsightHiveActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.storage_linked_services = storage_linked_services self.arguments = arguments self.get_debug_info = get_debug_info diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity.py index 2f7661fd79de..293013d73afc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity.py @@ -26,6 +26,8 @@ class HDInsightMapReduceActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -70,6 +72,7 @@ class HDInsightMapReduceActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity_py3.py index 2ac97c2e8453..830df1d395c2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity_py3.py @@ -26,6 +26,8 @@ class HDInsightMapReduceActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -70,6 +72,7 @@ class HDInsightMapReduceActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -83,8 +86,8 @@ class HDInsightMapReduceActivity(ExecutionActivity): 'defines': {'key': 'typeProperties.defines', 'type': '{object}'}, } - def __init__(self, *, name: str, class_name, jar_file_path, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, storage_linked_services=None, arguments=None, get_debug_info=None, jar_linked_service=None, jar_libs=None, defines=None, **kwargs) -> None: - super(HDInsightMapReduceActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, class_name, jar_file_path, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, storage_linked_services=None, arguments=None, get_debug_info=None, jar_linked_service=None, jar_libs=None, defines=None, **kwargs) -> None: + super(HDInsightMapReduceActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.storage_linked_services = storage_linked_services self.arguments = arguments self.get_debug_info = get_debug_info diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity.py index a552b1d9ae52..9400060e9d12 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity.py @@ -26,6 +26,8 @@ class HDInsightPigActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -62,6 +64,7 @@ class HDInsightPigActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity_py3.py index b57d8da7b682..839d193c5059 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity_py3.py @@ -26,6 +26,8 @@ class HDInsightPigActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -62,6 +64,7 @@ class HDInsightPigActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -73,8 +76,8 @@ class HDInsightPigActivity(ExecutionActivity): 'defines': {'key': 'typeProperties.defines', 'type': '{object}'}, } - def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, storage_linked_services=None, arguments=None, get_debug_info=None, script_path=None, script_linked_service=None, defines=None, **kwargs) -> None: - super(HDInsightPigActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, storage_linked_services=None, arguments=None, get_debug_info=None, script_path=None, script_linked_service=None, defines=None, **kwargs) -> None: + super(HDInsightPigActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.storage_linked_services = storage_linked_services self.arguments = arguments self.get_debug_info = get_debug_info diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity.py index 4984385f5d26..422177713af4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity.py @@ -26,6 +26,8 @@ class HDInsightSparkActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -71,6 +73,7 @@ class HDInsightSparkActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity_py3.py index 322d99f7c063..b3a44e425368 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity_py3.py @@ -26,6 +26,8 @@ class HDInsightSparkActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -71,6 +73,7 @@ class HDInsightSparkActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -84,8 +87,8 @@ class HDInsightSparkActivity(ExecutionActivity): 'spark_config': {'key': 'typeProperties.sparkConfig', 'type': '{object}'}, } - def __init__(self, *, name: str, root_path, entry_file_path, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, arguments=None, get_debug_info=None, spark_job_linked_service=None, class_name: str=None, proxy_user=None, spark_config=None, **kwargs) -> None: - super(HDInsightSparkActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, root_path, entry_file_path, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, arguments=None, get_debug_info=None, spark_job_linked_service=None, class_name: str=None, proxy_user=None, spark_config=None, **kwargs) -> None: + super(HDInsightSparkActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.root_path = root_path self.entry_file_path = entry_file_path self.arguments = arguments diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity.py index 80469577315f..fc2bcc3ac1b8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity.py @@ -26,6 +26,8 @@ class HDInsightStreamingActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -85,6 +87,7 @@ class HDInsightStreamingActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity_py3.py index 10756ecd093d..40ae73bf18ec 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity_py3.py @@ -26,6 +26,8 @@ class HDInsightStreamingActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -85,6 +87,7 @@ class HDInsightStreamingActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -102,8 +105,8 @@ class HDInsightStreamingActivity(ExecutionActivity): 'defines': {'key': 'typeProperties.defines', 'type': '{object}'}, } - def __init__(self, *, name: str, mapper, reducer, input, output, file_paths, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, storage_linked_services=None, arguments=None, get_debug_info=None, file_linked_service=None, combiner=None, command_environment=None, defines=None, **kwargs) -> None: - super(HDInsightStreamingActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, mapper, reducer, input, output, file_paths, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, storage_linked_services=None, arguments=None, get_debug_info=None, file_linked_service=None, combiner=None, command_environment=None, defines=None, **kwargs) -> None: + super(HDInsightStreamingActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.storage_linked_services = storage_linked_services self.arguments = arguments self.get_debug_info = get_debug_info diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity.py index 78eae5911550..1e66cc0a875b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity.py @@ -28,6 +28,8 @@ class IfConditionActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param expression: Required. An expression that would evaluate to Boolean. @@ -55,6 +57,7 @@ class IfConditionActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'expression': {'key': 'typeProperties.expression', 'type': 'Expression'}, 'if_true_activities': {'key': 'typeProperties.ifTrueActivities', 'type': '[Activity]'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity_py3.py index cbef9a900284..00798ac67bff 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity_py3.py @@ -28,6 +28,8 @@ class IfConditionActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param expression: Required. An expression that would evaluate to Boolean. @@ -55,14 +57,15 @@ class IfConditionActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'expression': {'key': 'typeProperties.expression', 'type': 'Expression'}, 'if_true_activities': {'key': 'typeProperties.ifTrueActivities', 'type': '[Activity]'}, 'if_false_activities': {'key': 'typeProperties.ifFalseActivities', 'type': '[Activity]'}, } - def __init__(self, *, name: str, expression, additional_properties=None, description: str=None, depends_on=None, if_true_activities=None, if_false_activities=None, **kwargs) -> None: - super(IfConditionActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, **kwargs) + def __init__(self, *, name: str, expression, additional_properties=None, description: str=None, depends_on=None, user_properties=None, if_true_activities=None, if_false_activities=None, **kwargs) -> None: + super(IfConditionActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, **kwargs) self.expression = expression self.if_true_activities = if_true_activities self.if_false_activities = if_false_activities diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_node_monitoring_data.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_node_monitoring_data.py index 93dc31785912..9d27bedf70aa 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_node_monitoring_data.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_node_monitoring_data.py @@ -27,7 +27,7 @@ class IntegrationRuntimeNodeMonitoringData(Model): runtime node. :vartype available_memory_in_mb: int :ivar cpu_utilization: CPU percentage on the integration runtime node. - :vartype cpu_utilization: float + :vartype cpu_utilization: int :ivar concurrent_jobs_limit: Maximum concurrent jobs on the integration runtime node. :vartype concurrent_jobs_limit: int @@ -58,7 +58,7 @@ class IntegrationRuntimeNodeMonitoringData(Model): 'additional_properties': {'key': '', 'type': '{object}'}, 'node_name': {'key': 'nodeName', 'type': 'str'}, 'available_memory_in_mb': {'key': 'availableMemoryInMB', 'type': 'int'}, - 'cpu_utilization': {'key': 'cpuUtilization', 'type': 'float'}, + 'cpu_utilization': {'key': 'cpuUtilization', 'type': 'int'}, 'concurrent_jobs_limit': {'key': 'concurrentJobsLimit', 'type': 'int'}, 'concurrent_jobs_running': {'key': 'concurrentJobsRunning', 'type': 'int'}, 'max_concurrent_jobs': {'key': 'maxConcurrentJobs', 'type': 'int'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_node_monitoring_data_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_node_monitoring_data_py3.py index 8c6482817e46..35c7e664b2ff 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_node_monitoring_data_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_node_monitoring_data_py3.py @@ -27,7 +27,7 @@ class IntegrationRuntimeNodeMonitoringData(Model): runtime node. :vartype available_memory_in_mb: int :ivar cpu_utilization: CPU percentage on the integration runtime node. - :vartype cpu_utilization: float + :vartype cpu_utilization: int :ivar concurrent_jobs_limit: Maximum concurrent jobs on the integration runtime node. :vartype concurrent_jobs_limit: int @@ -58,7 +58,7 @@ class IntegrationRuntimeNodeMonitoringData(Model): 'additional_properties': {'key': '', 'type': '{object}'}, 'node_name': {'key': 'nodeName', 'type': 'str'}, 'available_memory_in_mb': {'key': 'availableMemoryInMB', 'type': 'int'}, - 'cpu_utilization': {'key': 'cpuUtilization', 'type': 'float'}, + 'cpu_utilization': {'key': 'cpuUtilization', 'type': 'int'}, 'concurrent_jobs_limit': {'key': 'concurrentJobsLimit', 'type': 'int'}, 'concurrent_jobs_running': {'key': 'concurrentJobsRunning', 'type': 'int'}, 'max_concurrent_jobs': {'key': 'maxConcurrentJobs', 'type': 'int'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_remove_node_request.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_remove_node_request.py deleted file mode 100644 index 9080f93ffbdd..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_remove_node_request.py +++ /dev/null @@ -1,33 +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 IntegrationRuntimeRemoveNodeRequest(Model): - """Request to remove a node. - - :param additional_properties: Unmatched properties from the message are - deserialized this collection - :type additional_properties: dict[str, object] - :param node_name: The name of the node to be removed. - :type node_name: str - """ - - _attribute_map = { - 'additional_properties': {'key': '', 'type': '{object}'}, - 'node_name': {'key': 'nodeName', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(IntegrationRuntimeRemoveNodeRequest, self).__init__(**kwargs) - self.additional_properties = kwargs.get('additional_properties', None) - self.node_name = kwargs.get('node_name', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_remove_node_request_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_remove_node_request_py3.py deleted file mode 100644 index 57453c633fc5..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_remove_node_request_py3.py +++ /dev/null @@ -1,33 +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 IntegrationRuntimeRemoveNodeRequest(Model): - """Request to remove a node. - - :param additional_properties: Unmatched properties from the message are - deserialized this collection - :type additional_properties: dict[str, object] - :param node_name: The name of the node to be removed. - :type node_name: str - """ - - _attribute_map = { - 'additional_properties': {'key': '', 'type': '{object}'}, - 'node_name': {'key': 'nodeName', 'type': 'str'}, - } - - def __init__(self, *, additional_properties=None, node_name: str=None, **kwargs) -> None: - super(IntegrationRuntimeRemoveNodeRequest, self).__init__(**kwargs) - self.additional_properties = additional_properties - self.node_name = node_name diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime.py deleted file mode 100644 index f4a4e7eb8bf0..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime.py +++ /dev/null @@ -1,58 +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 LinkedIntegrationRuntime(Model): - """The linked integration runtime information. - - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar name: The name of the linked integration runtime. - :vartype name: str - :ivar subscription_id: The subscription ID for which the linked - integration runtime belong to. - :vartype subscription_id: str - :ivar data_factory_name: The name of the data factory for which the linked - integration runtime belong to. - :vartype data_factory_name: str - :ivar data_factory_location: The location of the data factory for which - the linked integration runtime belong to. - :vartype data_factory_location: str - :ivar create_time: The creating time of the linked integration runtime. - :vartype create_time: datetime - """ - - _validation = { - 'name': {'readonly': True}, - 'subscription_id': {'readonly': True}, - 'data_factory_name': {'readonly': True}, - 'data_factory_location': {'readonly': True}, - 'create_time': {'readonly': True}, - } - - _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'subscription_id': {'key': 'subscriptionId', 'type': 'str'}, - 'data_factory_name': {'key': 'dataFactoryName', 'type': 'str'}, - 'data_factory_location': {'key': 'dataFactoryLocation', 'type': 'str'}, - 'create_time': {'key': 'createTime', 'type': 'iso-8601'}, - } - - def __init__(self, **kwargs): - super(LinkedIntegrationRuntime, self).__init__(**kwargs) - self.name = None - self.subscription_id = None - self.data_factory_name = None - self.data_factory_location = None - self.create_time = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key.py deleted file mode 100644 index cbecfb9afae4..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key.py +++ /dev/null @@ -1,39 +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 .linked_integration_runtime_properties import LinkedIntegrationRuntimeProperties - - -class LinkedIntegrationRuntimeKey(LinkedIntegrationRuntimeProperties): - """The base definition of a secret type. - - All required parameters must be populated in order to send to Azure. - - :param authorization_type: Required. Constant filled by server. - :type authorization_type: str - :param key: Required. Type of the secret. - :type key: ~azure.mgmt.datafactory.models.SecureString - """ - - _validation = { - 'authorization_type': {'required': True}, - 'key': {'required': True}, - } - - _attribute_map = { - 'authorization_type': {'key': 'authorizationType', 'type': 'str'}, - 'key': {'key': 'key', 'type': 'SecureString'}, - } - - def __init__(self, **kwargs): - super(LinkedIntegrationRuntimeKey, self).__init__(**kwargs) - self.key = kwargs.get('key', None) - self.authorization_type = 'Key' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key_py3.py deleted file mode 100644 index c223b18281cd..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key_py3.py +++ /dev/null @@ -1,39 +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 .linked_integration_runtime_properties_py3 import LinkedIntegrationRuntimeProperties - - -class LinkedIntegrationRuntimeKey(LinkedIntegrationRuntimeProperties): - """The base definition of a secret type. - - All required parameters must be populated in order to send to Azure. - - :param authorization_type: Required. Constant filled by server. - :type authorization_type: str - :param key: Required. Type of the secret. - :type key: ~azure.mgmt.datafactory.models.SecureString - """ - - _validation = { - 'authorization_type': {'required': True}, - 'key': {'required': True}, - } - - _attribute_map = { - 'authorization_type': {'key': 'authorizationType', 'type': 'str'}, - 'key': {'key': 'key', 'type': 'SecureString'}, - } - - def __init__(self, *, key, **kwargs) -> None: - super(LinkedIntegrationRuntimeKey, self).__init__(**kwargs) - self.key = key - self.authorization_type = 'Key' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties.py deleted file mode 100644 index 20a80b23277c..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties.py +++ /dev/null @@ -1,41 +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 LinkedIntegrationRuntimeProperties(Model): - """The base definition of a secret type. - - You probably want to use the sub-classes and not this class directly. Known - sub-classes are: LinkedIntegrationRuntimeRbac, LinkedIntegrationRuntimeKey - - All required parameters must be populated in order to send to Azure. - - :param authorization_type: Required. Constant filled by server. - :type authorization_type: str - """ - - _validation = { - 'authorization_type': {'required': True}, - } - - _attribute_map = { - 'authorization_type': {'key': 'authorizationType', 'type': 'str'}, - } - - _subtype_map = { - 'authorization_type': {'RBAC': 'LinkedIntegrationRuntimeRbac', 'Key': 'LinkedIntegrationRuntimeKey'} - } - - def __init__(self, **kwargs): - super(LinkedIntegrationRuntimeProperties, self).__init__(**kwargs) - self.authorization_type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties_py3.py deleted file mode 100644 index da73c9b6b95a..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties_py3.py +++ /dev/null @@ -1,41 +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 LinkedIntegrationRuntimeProperties(Model): - """The base definition of a secret type. - - You probably want to use the sub-classes and not this class directly. Known - sub-classes are: LinkedIntegrationRuntimeRbac, LinkedIntegrationRuntimeKey - - All required parameters must be populated in order to send to Azure. - - :param authorization_type: Required. Constant filled by server. - :type authorization_type: str - """ - - _validation = { - 'authorization_type': {'required': True}, - } - - _attribute_map = { - 'authorization_type': {'key': 'authorizationType', 'type': 'str'}, - } - - _subtype_map = { - 'authorization_type': {'RBAC': 'LinkedIntegrationRuntimeRbac', 'Key': 'LinkedIntegrationRuntimeKey'} - } - - def __init__(self, **kwargs) -> None: - super(LinkedIntegrationRuntimeProperties, self).__init__(**kwargs) - self.authorization_type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_py3.py deleted file mode 100644 index 6c831ab5f511..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_py3.py +++ /dev/null @@ -1,58 +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 LinkedIntegrationRuntime(Model): - """The linked integration runtime information. - - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar name: The name of the linked integration runtime. - :vartype name: str - :ivar subscription_id: The subscription ID for which the linked - integration runtime belong to. - :vartype subscription_id: str - :ivar data_factory_name: The name of the data factory for which the linked - integration runtime belong to. - :vartype data_factory_name: str - :ivar data_factory_location: The location of the data factory for which - the linked integration runtime belong to. - :vartype data_factory_location: str - :ivar create_time: The creating time of the linked integration runtime. - :vartype create_time: datetime - """ - - _validation = { - 'name': {'readonly': True}, - 'subscription_id': {'readonly': True}, - 'data_factory_name': {'readonly': True}, - 'data_factory_location': {'readonly': True}, - 'create_time': {'readonly': True}, - } - - _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'subscription_id': {'key': 'subscriptionId', 'type': 'str'}, - 'data_factory_name': {'key': 'dataFactoryName', 'type': 'str'}, - 'data_factory_location': {'key': 'dataFactoryLocation', 'type': 'str'}, - 'create_time': {'key': 'createTime', 'type': 'iso-8601'}, - } - - def __init__(self, **kwargs) -> None: - super(LinkedIntegrationRuntime, self).__init__(**kwargs) - self.name = None - self.subscription_id = None - self.data_factory_name = None - self.data_factory_location = None - self.create_time = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac.py deleted file mode 100644 index 3c7235ecc279..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac.py +++ /dev/null @@ -1,40 +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 .linked_integration_runtime_properties import LinkedIntegrationRuntimeProperties - - -class LinkedIntegrationRuntimeRbac(LinkedIntegrationRuntimeProperties): - """The base definition of a secret type. - - All required parameters must be populated in order to send to Azure. - - :param authorization_type: Required. Constant filled by server. - :type authorization_type: str - :param resource_id: Required. The resource ID of the integration runtime - to be shared. - :type resource_id: str - """ - - _validation = { - 'authorization_type': {'required': True}, - 'resource_id': {'required': True}, - } - - _attribute_map = { - 'authorization_type': {'key': 'authorizationType', 'type': 'str'}, - 'resource_id': {'key': 'resourceId', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(LinkedIntegrationRuntimeRbac, self).__init__(**kwargs) - self.resource_id = kwargs.get('resource_id', None) - self.authorization_type = 'RBAC' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac_py3.py deleted file mode 100644 index 24d2b946d97e..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac_py3.py +++ /dev/null @@ -1,40 +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 .linked_integration_runtime_properties_py3 import LinkedIntegrationRuntimeProperties - - -class LinkedIntegrationRuntimeRbac(LinkedIntegrationRuntimeProperties): - """The base definition of a secret type. - - All required parameters must be populated in order to send to Azure. - - :param authorization_type: Required. Constant filled by server. - :type authorization_type: str - :param resource_id: Required. The resource ID of the integration runtime - to be shared. - :type resource_id: str - """ - - _validation = { - 'authorization_type': {'required': True}, - 'resource_id': {'required': True}, - } - - _attribute_map = { - 'authorization_type': {'key': 'authorizationType', 'type': 'str'}, - 'resource_id': {'key': 'resourceId', 'type': 'str'}, - } - - def __init__(self, *, resource_id: str, **kwargs) -> None: - super(LinkedIntegrationRuntimeRbac, self).__init__(**kwargs) - self.resource_id = resource_id - self.authorization_type = 'RBAC' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity.py index d5bfff330ee2..0cf215272adf 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity.py @@ -26,6 +26,8 @@ class LookupActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -55,6 +57,7 @@ class LookupActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity_py3.py index fdbcebcd0164..ef81802111c0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity_py3.py @@ -26,6 +26,8 @@ class LookupActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -55,6 +57,7 @@ class LookupActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -63,8 +66,8 @@ class LookupActivity(ExecutionActivity): 'first_row_only': {'key': 'typeProperties.firstRowOnly', 'type': 'object'}, } - def __init__(self, *, name: str, source, dataset, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, first_row_only=None, **kwargs) -> None: - super(LookupActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, source, dataset, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, first_row_only=None, **kwargs) -> None: + super(LookupActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.source = source self.dataset = dataset self.first_row_only = first_row_only diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_list_response.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_list_response.py deleted file mode 100644 index 5b2c7f8cb037..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_list_response.py +++ /dev/null @@ -1,34 +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 OperationListResponse(Model): - """A list of operations that can be performed by the Data Factory service. - - :param value: List of Data Factory operations supported by the Data - Factory resource provider. - :type value: list[~azure.mgmt.datafactory.models.Operation] - :param next_link: The link to the next page of results, if any remaining - results exist. - :type next_link: str - """ - - _attribute_map = { - 'value': {'key': 'value', 'type': '[Operation]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(OperationListResponse, self).__init__(**kwargs) - self.value = kwargs.get('value', None) - self.next_link = kwargs.get('next_link', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_list_response_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_list_response_py3.py deleted file mode 100644 index fe5c1ce91260..000000000000 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_list_response_py3.py +++ /dev/null @@ -1,34 +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 OperationListResponse(Model): - """A list of operations that can be performed by the Data Factory service. - - :param value: List of Data Factory operations supported by the Data - Factory resource provider. - :type value: list[~azure.mgmt.datafactory.models.Operation] - :param next_link: The link to the next page of results, if any remaining - results exist. - :type next_link: str - """ - - _attribute_map = { - 'value': {'key': 'value', 'type': '[Operation]'}, - 'next_link': {'key': 'nextLink', 'type': 'str'}, - } - - def __init__(self, *, value=None, next_link: str=None, **kwargs) -> None: - super(OperationListResponse, self).__init__(**kwargs) - self.value = value - self.next_link = next_link diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_dimension.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_dimension.py new file mode 100644 index 000000000000..24232e7b5470 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_dimension.py @@ -0,0 +1,37 @@ +# 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 OperationMetricDimension(Model): + """Defines the metric dimension. + + :param name: The name of the dimension for the metric. + :type name: str + :param display_name: The display name of the metric dimension. + :type display_name: str + :param to_be_exported_for_shoebox: Whether the dimension should be + exported to Azure Monitor. + :type to_be_exported_for_shoebox: bool + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'to_be_exported_for_shoebox': {'key': 'toBeExportedForShoebox', 'type': 'bool'}, + } + + def __init__(self, **kwargs): + super(OperationMetricDimension, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.display_name = kwargs.get('display_name', None) + self.to_be_exported_for_shoebox = kwargs.get('to_be_exported_for_shoebox', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_dimension_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_dimension_py3.py new file mode 100644 index 000000000000..1d8610b7fab8 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_dimension_py3.py @@ -0,0 +1,37 @@ +# 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 OperationMetricDimension(Model): + """Defines the metric dimension. + + :param name: The name of the dimension for the metric. + :type name: str + :param display_name: The display name of the metric dimension. + :type display_name: str + :param to_be_exported_for_shoebox: Whether the dimension should be + exported to Azure Monitor. + :type to_be_exported_for_shoebox: bool + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'to_be_exported_for_shoebox': {'key': 'toBeExportedForShoebox', 'type': 'bool'}, + } + + def __init__(self, *, name: str=None, display_name: str=None, to_be_exported_for_shoebox: bool=None, **kwargs) -> None: + super(OperationMetricDimension, self).__init__(**kwargs) + self.name = name + self.display_name = display_name + self.to_be_exported_for_shoebox = to_be_exported_for_shoebox diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_specification.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_specification.py index e2a9c98580a8..77f533fdcebf 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_specification.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_specification.py @@ -36,6 +36,9 @@ class OperationMetricSpecification(Model): available. :type availabilities: list[~azure.mgmt.datafactory.models.OperationMetricAvailability] + :param dimensions: Defines the metric dimension. + :type dimensions: + list[~azure.mgmt.datafactory.models.OperationMetricDimension] """ _attribute_map = { @@ -48,6 +51,7 @@ class OperationMetricSpecification(Model): 'source_mdm_account': {'key': 'sourceMdmAccount', 'type': 'str'}, 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, 'availabilities': {'key': 'availabilities', 'type': '[OperationMetricAvailability]'}, + 'dimensions': {'key': 'dimensions', 'type': '[OperationMetricDimension]'}, } def __init__(self, **kwargs): @@ -61,3 +65,4 @@ def __init__(self, **kwargs): self.source_mdm_account = kwargs.get('source_mdm_account', None) self.source_mdm_namespace = kwargs.get('source_mdm_namespace', None) self.availabilities = kwargs.get('availabilities', None) + self.dimensions = kwargs.get('dimensions', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_specification_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_specification_py3.py index 788106b93dfd..c1cc4ad39e72 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_specification_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_metric_specification_py3.py @@ -36,6 +36,9 @@ class OperationMetricSpecification(Model): available. :type availabilities: list[~azure.mgmt.datafactory.models.OperationMetricAvailability] + :param dimensions: Defines the metric dimension. + :type dimensions: + list[~azure.mgmt.datafactory.models.OperationMetricDimension] """ _attribute_map = { @@ -48,9 +51,10 @@ class OperationMetricSpecification(Model): 'source_mdm_account': {'key': 'sourceMdmAccount', 'type': 'str'}, 'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'}, 'availabilities': {'key': 'availabilities', 'type': '[OperationMetricAvailability]'}, + 'dimensions': {'key': 'dimensions', 'type': '[OperationMetricDimension]'}, } - def __init__(self, *, name: str=None, display_name: str=None, display_description: str=None, unit: str=None, aggregation_type: str=None, enable_regional_mdm_account: str=None, source_mdm_account: str=None, source_mdm_namespace: str=None, availabilities=None, **kwargs) -> None: + def __init__(self, *, name: str=None, display_name: str=None, display_description: str=None, unit: str=None, aggregation_type: str=None, enable_regional_mdm_account: str=None, source_mdm_account: str=None, source_mdm_namespace: str=None, availabilities=None, dimensions=None, **kwargs) -> None: super(OperationMetricSpecification, self).__init__(**kwargs) self.name = name self.display_name = display_name @@ -61,3 +65,4 @@ def __init__(self, *, name: str=None, display_name: str=None, display_descriptio self.source_mdm_account = source_mdm_account self.source_mdm_namespace = source_mdm_namespace self.availabilities = availabilities + self.dimensions = dimensions diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_run_paged.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_paged.py similarity index 70% rename from azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_run_paged.py rename to azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_paged.py index c9ad99f8ced0..d6eea01bbdb9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_run_paged.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/operation_paged.py @@ -12,16 +12,16 @@ from msrest.paging import Paged -class TriggerRunPaged(Paged): +class OperationPaged(Paged): """ - A paging container for iterating over a list of :class:`TriggerRun ` object + A paging container for iterating over a list of :class:`Operation ` object """ _attribute_map = { 'next_link': {'key': 'nextLink', 'type': 'str'}, - 'current_page': {'key': 'value', 'type': '[TriggerRun]'} + 'current_page': {'key': 'value', 'type': '[Operation]'} } def __init__(self, *args, **kwargs): - super(TriggerRunPaged, self).__init__(*args, **kwargs) + super(OperationPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_invoked_by.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_invoked_by.py index c43b642159d8..acefb80fd078 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_invoked_by.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_invoked_by.py @@ -22,19 +22,24 @@ class PipelineRunInvokedBy(Model): :vartype name: str :ivar id: The ID of the entity that started the run. :vartype id: str + :ivar invoked_by_type: The type of the entity that started the run. + :vartype invoked_by_type: str """ _validation = { 'name': {'readonly': True}, 'id': {'readonly': True}, + 'invoked_by_type': {'readonly': True}, } _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'id': {'key': 'id', 'type': 'str'}, + 'invoked_by_type': {'key': 'invokedByType', 'type': 'str'}, } def __init__(self, **kwargs): super(PipelineRunInvokedBy, self).__init__(**kwargs) self.name = None self.id = None + self.invoked_by_type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_invoked_by_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_invoked_by_py3.py index d7540cdd0b0f..c954a18b8a67 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_invoked_by_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_invoked_by_py3.py @@ -22,19 +22,24 @@ class PipelineRunInvokedBy(Model): :vartype name: str :ivar id: The ID of the entity that started the run. :vartype id: str + :ivar invoked_by_type: The type of the entity that started the run. + :vartype invoked_by_type: str """ _validation = { 'name': {'readonly': True}, 'id': {'readonly': True}, + 'invoked_by_type': {'readonly': True}, } _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'id': {'key': 'id', 'type': 'str'}, + 'invoked_by_type': {'key': 'invokedByType', 'type': 'str'}, } def __init__(self, **kwargs) -> None: super(PipelineRunInvokedBy, self).__init__(**kwargs) self.name = None self.id = None + self.invoked_by_type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_response.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_runs_query_response.py similarity index 92% rename from azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_response.py rename to azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_runs_query_response.py index 50639429fc78..c4591c5467ba 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_response.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_runs_query_response.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class PipelineRunQueryResponse(Model): +class PipelineRunsQueryResponse(Model): """A list pipeline runs. All required parameters must be populated in order to send to Azure. @@ -34,6 +34,6 @@ class PipelineRunQueryResponse(Model): } def __init__(self, **kwargs): - super(PipelineRunQueryResponse, self).__init__(**kwargs) + super(PipelineRunsQueryResponse, self).__init__(**kwargs) self.value = kwargs.get('value', None) self.continuation_token = kwargs.get('continuation_token', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_response_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_runs_query_response_py3.py similarity index 92% rename from azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_response_py3.py rename to azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_runs_query_response_py3.py index f0aef3ea8bc8..fbc689ec1632 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_response_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_runs_query_response_py3.py @@ -12,7 +12,7 @@ from msrest.serialization import Model -class PipelineRunQueryResponse(Model): +class PipelineRunsQueryResponse(Model): """A list pipeline runs. All required parameters must be populated in order to send to Azure. @@ -34,6 +34,6 @@ class PipelineRunQueryResponse(Model): } def __init__(self, *, value, continuation_token: str=None, **kwargs) -> None: - super(PipelineRunQueryResponse, self).__init__(**kwargs) + super(PipelineRunsQueryResponse, self).__init__(**kwargs) self.value = value self.continuation_token = continuation_token diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/resource.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/resource.py index 38d454c351e6..f6b2d7d3b512 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/resource.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/resource.py @@ -28,12 +28,15 @@ class Resource(Model): :type location: str :param tags: The resource tags. :type tags: dict[str, str] + :ivar e_tag: Etag identifies change in the resource. + :vartype e_tag: str """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'e_tag': {'readonly': True}, } _attribute_map = { @@ -42,6 +45,7 @@ class Resource(Model): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'e_tag': {'key': 'eTag', 'type': 'str'}, } def __init__(self, **kwargs): @@ -51,3 +55,4 @@ def __init__(self, **kwargs): self.type = None self.location = kwargs.get('location', None) self.tags = kwargs.get('tags', None) + self.e_tag = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/resource_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/resource_py3.py index 47cbb7d6aa4b..cfc0e4b09aa5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/resource_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/resource_py3.py @@ -28,12 +28,15 @@ class Resource(Model): :type location: str :param tags: The resource tags. :type tags: dict[str, str] + :ivar e_tag: Etag identifies change in the resource. + :vartype e_tag: str """ _validation = { 'id': {'readonly': True}, 'name': {'readonly': True}, 'type': {'readonly': True}, + 'e_tag': {'readonly': True}, } _attribute_map = { @@ -42,6 +45,7 @@ class Resource(Model): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, + 'e_tag': {'key': 'eTag', 'type': 'str'}, } def __init__(self, *, location: str=None, tags=None, **kwargs) -> None: @@ -51,3 +55,4 @@ def __init__(self, *, location: str=None, tags=None, **kwargs) -> None: self.type = None self.location = location self.tags = tags + self.e_tag = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_filter_parameters.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_filter_parameters.py similarity index 74% rename from azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_filter_parameters.py rename to azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_filter_parameters.py index 5e1341649f19..9271f7adf029 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_filter_parameters.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_filter_parameters.py @@ -12,25 +12,24 @@ from msrest.serialization import Model -class PipelineRunFilterParameters(Model): - """Query parameters for listing pipeline runs. +class RunFilterParameters(Model): + """Query parameters for listing runs. All required parameters must be populated in order to send to Azure. :param continuation_token: The continuation token for getting the next page of results. Null for first page. :type continuation_token: str - :param last_updated_after: Required. The time at or after which the - pipeline run event was updated in 'ISO 8601' format. + :param last_updated_after: Required. The time at or after which the run + event was updated in 'ISO 8601' format. :type last_updated_after: datetime - :param last_updated_before: Required. The time at or before which the - pipeline run event was updated in 'ISO 8601' format. + :param last_updated_before: Required. The time at or before which the run + event was updated in 'ISO 8601' format. :type last_updated_before: datetime :param filters: List of filters. - :type filters: list[~azure.mgmt.datafactory.models.PipelineRunQueryFilter] + :type filters: list[~azure.mgmt.datafactory.models.RunQueryFilter] :param order_by: List of OrderBy option. - :type order_by: - list[~azure.mgmt.datafactory.models.PipelineRunQueryOrderBy] + :type order_by: list[~azure.mgmt.datafactory.models.RunQueryOrderBy] """ _validation = { @@ -42,12 +41,12 @@ class PipelineRunFilterParameters(Model): 'continuation_token': {'key': 'continuationToken', 'type': 'str'}, 'last_updated_after': {'key': 'lastUpdatedAfter', 'type': 'iso-8601'}, 'last_updated_before': {'key': 'lastUpdatedBefore', 'type': 'iso-8601'}, - 'filters': {'key': 'filters', 'type': '[PipelineRunQueryFilter]'}, - 'order_by': {'key': 'orderBy', 'type': '[PipelineRunQueryOrderBy]'}, + 'filters': {'key': 'filters', 'type': '[RunQueryFilter]'}, + 'order_by': {'key': 'orderBy', 'type': '[RunQueryOrderBy]'}, } def __init__(self, **kwargs): - super(PipelineRunFilterParameters, self).__init__(**kwargs) + super(RunFilterParameters, self).__init__(**kwargs) self.continuation_token = kwargs.get('continuation_token', None) self.last_updated_after = kwargs.get('last_updated_after', None) self.last_updated_before = kwargs.get('last_updated_before', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_filter_parameters_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_filter_parameters_py3.py similarity index 74% rename from azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_filter_parameters_py3.py rename to azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_filter_parameters_py3.py index a436b8e4023c..c96e64eb63b3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_filter_parameters_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_filter_parameters_py3.py @@ -12,25 +12,24 @@ from msrest.serialization import Model -class PipelineRunFilterParameters(Model): - """Query parameters for listing pipeline runs. +class RunFilterParameters(Model): + """Query parameters for listing runs. All required parameters must be populated in order to send to Azure. :param continuation_token: The continuation token for getting the next page of results. Null for first page. :type continuation_token: str - :param last_updated_after: Required. The time at or after which the - pipeline run event was updated in 'ISO 8601' format. + :param last_updated_after: Required. The time at or after which the run + event was updated in 'ISO 8601' format. :type last_updated_after: datetime - :param last_updated_before: Required. The time at or before which the - pipeline run event was updated in 'ISO 8601' format. + :param last_updated_before: Required. The time at or before which the run + event was updated in 'ISO 8601' format. :type last_updated_before: datetime :param filters: List of filters. - :type filters: list[~azure.mgmt.datafactory.models.PipelineRunQueryFilter] + :type filters: list[~azure.mgmt.datafactory.models.RunQueryFilter] :param order_by: List of OrderBy option. - :type order_by: - list[~azure.mgmt.datafactory.models.PipelineRunQueryOrderBy] + :type order_by: list[~azure.mgmt.datafactory.models.RunQueryOrderBy] """ _validation = { @@ -42,12 +41,12 @@ class PipelineRunFilterParameters(Model): 'continuation_token': {'key': 'continuationToken', 'type': 'str'}, 'last_updated_after': {'key': 'lastUpdatedAfter', 'type': 'iso-8601'}, 'last_updated_before': {'key': 'lastUpdatedBefore', 'type': 'iso-8601'}, - 'filters': {'key': 'filters', 'type': '[PipelineRunQueryFilter]'}, - 'order_by': {'key': 'orderBy', 'type': '[PipelineRunQueryOrderBy]'}, + 'filters': {'key': 'filters', 'type': '[RunQueryFilter]'}, + 'order_by': {'key': 'orderBy', 'type': '[RunQueryOrderBy]'}, } def __init__(self, *, last_updated_after, last_updated_before, continuation_token: str=None, filters=None, order_by=None, **kwargs) -> None: - super(PipelineRunFilterParameters, self).__init__(**kwargs) + super(RunFilterParameters, self).__init__(**kwargs) self.continuation_token = continuation_token self.last_updated_after = last_updated_after self.last_updated_before = last_updated_before diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_filter.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_filter.py similarity index 65% rename from azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_filter.py rename to azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_filter.py index bca4438a6ed6..63a4cddc063d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_filter.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_filter.py @@ -12,19 +12,24 @@ from msrest.serialization import Model -class PipelineRunQueryFilter(Model): - """Query filter option for listing pipeline runs. +class RunQueryFilter(Model): + """Query filter option for listing runs. All required parameters must be populated in order to send to Azure. - :param operand: Required. Parameter name to be used for filter. Possible - values include: 'PipelineName', 'Status', 'RunStart', 'RunEnd' - :type operand: str or - ~azure.mgmt.datafactory.models.PipelineRunQueryFilterOperand + :param operand: Required. Parameter name to be used for filter. The + allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd + and Status; to query activity runs are ActivityName, ActivityRunStart, + ActivityRunEnd, ActivityType and Status, and to query trigger runs are + TriggerName, TriggerRunTimestamp and Status. Possible values include: + 'PipelineName', 'Status', 'RunStart', 'RunEnd', 'ActivityName', + 'ActivityRunStart', 'ActivityRunEnd', 'ActivityType', 'TriggerName', + 'TriggerRunTimestamp' + :type operand: str or ~azure.mgmt.datafactory.models.RunQueryFilterOperand :param operator: Required. Operator to be used for filter. Possible values include: 'Equals', 'NotEquals', 'In', 'NotIn' :type operator: str or - ~azure.mgmt.datafactory.models.PipelineRunQueryFilterOperator + ~azure.mgmt.datafactory.models.RunQueryFilterOperator :param values: Required. List of filter values. :type values: list[str] """ @@ -42,7 +47,7 @@ class PipelineRunQueryFilter(Model): } def __init__(self, **kwargs): - super(PipelineRunQueryFilter, self).__init__(**kwargs) + super(RunQueryFilter, self).__init__(**kwargs) self.operand = kwargs.get('operand', None) self.operator = kwargs.get('operator', None) self.values = kwargs.get('values', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_filter_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_filter_py3.py similarity index 65% rename from azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_filter_py3.py rename to azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_filter_py3.py index 3e6d24a3ac73..fc95591801bd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_filter_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_filter_py3.py @@ -12,19 +12,24 @@ from msrest.serialization import Model -class PipelineRunQueryFilter(Model): - """Query filter option for listing pipeline runs. +class RunQueryFilter(Model): + """Query filter option for listing runs. All required parameters must be populated in order to send to Azure. - :param operand: Required. Parameter name to be used for filter. Possible - values include: 'PipelineName', 'Status', 'RunStart', 'RunEnd' - :type operand: str or - ~azure.mgmt.datafactory.models.PipelineRunQueryFilterOperand + :param operand: Required. Parameter name to be used for filter. The + allowed operands to query pipeline runs are PipelineName, RunStart, RunEnd + and Status; to query activity runs are ActivityName, ActivityRunStart, + ActivityRunEnd, ActivityType and Status, and to query trigger runs are + TriggerName, TriggerRunTimestamp and Status. Possible values include: + 'PipelineName', 'Status', 'RunStart', 'RunEnd', 'ActivityName', + 'ActivityRunStart', 'ActivityRunEnd', 'ActivityType', 'TriggerName', + 'TriggerRunTimestamp' + :type operand: str or ~azure.mgmt.datafactory.models.RunQueryFilterOperand :param operator: Required. Operator to be used for filter. Possible values include: 'Equals', 'NotEquals', 'In', 'NotIn' :type operator: str or - ~azure.mgmt.datafactory.models.PipelineRunQueryFilterOperator + ~azure.mgmt.datafactory.models.RunQueryFilterOperator :param values: Required. List of filter values. :type values: list[str] """ @@ -42,7 +47,7 @@ class PipelineRunQueryFilter(Model): } def __init__(self, *, operand, operator, values, **kwargs) -> None: - super(PipelineRunQueryFilter, self).__init__(**kwargs) + super(RunQueryFilter, self).__init__(**kwargs) self.operand = operand self.operator = operator self.values = values diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_order_by.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_order_by.py similarity index 60% rename from azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_order_by.py rename to azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_order_by.py index 27da9656c88b..21afabcf215f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_order_by.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_order_by.py @@ -12,18 +12,22 @@ from msrest.serialization import Model -class PipelineRunQueryOrderBy(Model): - """An object to provide order by options for listing pipeline runs. +class RunQueryOrderBy(Model): + """An object to provide order by options for listing runs. All required parameters must be populated in order to send to Azure. - :param order_by: Required. Parameter name to be used for order by. - Possible values include: 'RunStart', 'RunEnd' - :type order_by: str or - ~azure.mgmt.datafactory.models.PipelineRunQueryOrderByField + :param order_by: Required. Parameter name to be used for order by. The + allowed parameters to order by for pipeline runs are PipelineName, + RunStart, RunEnd and Status; for activity runs are ActivityName, + ActivityRunStart, ActivityRunEnd and Status; for trigger runs are + TriggerName, TriggerRunTimestamp and Status. Possible values include: + 'RunStart', 'RunEnd', 'PipelineName', 'Status', 'ActivityName', + 'ActivityRunStart', 'ActivityRunEnd', 'TriggerName', 'TriggerRunTimestamp' + :type order_by: str or ~azure.mgmt.datafactory.models.RunQueryOrderByField :param order: Required. Sorting order of the parameter. Possible values include: 'ASC', 'DESC' - :type order: str or ~azure.mgmt.datafactory.models.PipelineRunQueryOrder + :type order: str or ~azure.mgmt.datafactory.models.RunQueryOrder """ _validation = { @@ -37,6 +41,6 @@ class PipelineRunQueryOrderBy(Model): } def __init__(self, **kwargs): - super(PipelineRunQueryOrderBy, self).__init__(**kwargs) + super(RunQueryOrderBy, self).__init__(**kwargs) self.order_by = kwargs.get('order_by', None) self.order = kwargs.get('order', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_order_by_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_order_by_py3.py similarity index 60% rename from azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_order_by_py3.py rename to azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_order_by_py3.py index 4edaf9ba99de..a3ddc8854d47 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_run_query_order_by_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/run_query_order_by_py3.py @@ -12,18 +12,22 @@ from msrest.serialization import Model -class PipelineRunQueryOrderBy(Model): - """An object to provide order by options for listing pipeline runs. +class RunQueryOrderBy(Model): + """An object to provide order by options for listing runs. All required parameters must be populated in order to send to Azure. - :param order_by: Required. Parameter name to be used for order by. - Possible values include: 'RunStart', 'RunEnd' - :type order_by: str or - ~azure.mgmt.datafactory.models.PipelineRunQueryOrderByField + :param order_by: Required. Parameter name to be used for order by. The + allowed parameters to order by for pipeline runs are PipelineName, + RunStart, RunEnd and Status; for activity runs are ActivityName, + ActivityRunStart, ActivityRunEnd and Status; for trigger runs are + TriggerName, TriggerRunTimestamp and Status. Possible values include: + 'RunStart', 'RunEnd', 'PipelineName', 'Status', 'ActivityName', + 'ActivityRunStart', 'ActivityRunEnd', 'TriggerName', 'TriggerRunTimestamp' + :type order_by: str or ~azure.mgmt.datafactory.models.RunQueryOrderByField :param order: Required. Sorting order of the parameter. Possible values include: 'ASC', 'DESC' - :type order: str or ~azure.mgmt.datafactory.models.PipelineRunQueryOrder + :type order: str or ~azure.mgmt.datafactory.models.RunQueryOrder """ _validation = { @@ -37,6 +41,6 @@ class PipelineRunQueryOrderBy(Model): } def __init__(self, *, order_by, order, **kwargs) -> None: - super(PipelineRunQueryOrderBy, self).__init__(**kwargs) + super(RunQueryOrderBy, self).__init__(**kwargs) self.order_by = order_by self.order = order diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime.py index d2b334ee11b5..b9c6c2870fff 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime.py @@ -24,9 +24,6 @@ class SelfHostedIntegrationRuntime(IntegrationRuntime): :type description: str :param type: Required. Constant filled by server. :type type: str - :param linked_info: - :type linked_info: - ~azure.mgmt.datafactory.models.LinkedIntegrationRuntimeProperties """ _validation = { @@ -37,10 +34,8 @@ class SelfHostedIntegrationRuntime(IntegrationRuntime): 'additional_properties': {'key': '', 'type': '{object}'}, 'description': {'key': 'description', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'linked_info': {'key': 'typeProperties.linkedInfo', 'type': 'LinkedIntegrationRuntimeProperties'}, } def __init__(self, **kwargs): super(SelfHostedIntegrationRuntime, self).__init__(**kwargs) - self.linked_info = kwargs.get('linked_info', None) self.type = 'SelfHosted' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_py3.py index 2a6929ecdd15..744d92d28a5a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_py3.py @@ -24,9 +24,6 @@ class SelfHostedIntegrationRuntime(IntegrationRuntime): :type description: str :param type: Required. Constant filled by server. :type type: str - :param linked_info: - :type linked_info: - ~azure.mgmt.datafactory.models.LinkedIntegrationRuntimeProperties """ _validation = { @@ -37,10 +34,8 @@ class SelfHostedIntegrationRuntime(IntegrationRuntime): 'additional_properties': {'key': '', 'type': '{object}'}, 'description': {'key': 'description', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, - 'linked_info': {'key': 'typeProperties.linkedInfo', 'type': 'LinkedIntegrationRuntimeProperties'}, } - def __init__(self, *, additional_properties=None, description: str=None, linked_info=None, **kwargs) -> None: + def __init__(self, *, additional_properties=None, description: str=None, **kwargs) -> None: super(SelfHostedIntegrationRuntime, self).__init__(additional_properties=additional_properties, description=description, **kwargs) - self.linked_info = linked_info self.type = 'SelfHosted' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status.py index 7bd67718e078..3a07410bb21e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status.py @@ -69,9 +69,11 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): ~azure.mgmt.datafactory.models.IntegrationRuntimeAutoUpdate :ivar version_status: Status of the integration runtime version. :vartype version_status: str - :param links: The list of linked integration runtimes that are created to - share with this integration runtime. - :type links: list[~azure.mgmt.datafactory.models.LinkedIntegrationRuntime] + :ivar pushed_version: The version that the integration runtime is going to + update to. + :vartype pushed_version: str + :ivar latest_version: The latest version on download center. + :vartype latest_version: str """ _validation = { @@ -89,6 +91,8 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): 'service_urls': {'readonly': True}, 'auto_update': {'readonly': True}, 'version_status': {'readonly': True}, + 'pushed_version': {'readonly': True}, + 'latest_version': {'readonly': True}, } _attribute_map = { @@ -108,7 +112,8 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): 'service_urls': {'key': 'typeProperties.serviceUrls', 'type': '[str]'}, 'auto_update': {'key': 'typeProperties.autoUpdate', 'type': 'str'}, 'version_status': {'key': 'typeProperties.versionStatus', 'type': 'str'}, - 'links': {'key': 'typeProperties.links', 'type': '[LinkedIntegrationRuntime]'}, + 'pushed_version': {'key': 'typeProperties.pushedVersion', 'type': 'str'}, + 'latest_version': {'key': 'typeProperties.latestVersion', 'type': 'str'}, } def __init__(self, **kwargs): @@ -125,5 +130,6 @@ def __init__(self, **kwargs): self.service_urls = None self.auto_update = None self.version_status = None - self.links = kwargs.get('links', None) + self.pushed_version = None + self.latest_version = None self.type = 'SelfHosted' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status_py3.py index 07362ed1835a..0714c35ca388 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status_py3.py @@ -69,9 +69,11 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): ~azure.mgmt.datafactory.models.IntegrationRuntimeAutoUpdate :ivar version_status: Status of the integration runtime version. :vartype version_status: str - :param links: The list of linked integration runtimes that are created to - share with this integration runtime. - :type links: list[~azure.mgmt.datafactory.models.LinkedIntegrationRuntime] + :ivar pushed_version: The version that the integration runtime is going to + update to. + :vartype pushed_version: str + :ivar latest_version: The latest version on download center. + :vartype latest_version: str """ _validation = { @@ -89,6 +91,8 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): 'service_urls': {'readonly': True}, 'auto_update': {'readonly': True}, 'version_status': {'readonly': True}, + 'pushed_version': {'readonly': True}, + 'latest_version': {'readonly': True}, } _attribute_map = { @@ -108,10 +112,11 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): 'service_urls': {'key': 'typeProperties.serviceUrls', 'type': '[str]'}, 'auto_update': {'key': 'typeProperties.autoUpdate', 'type': 'str'}, 'version_status': {'key': 'typeProperties.versionStatus', 'type': 'str'}, - 'links': {'key': 'typeProperties.links', 'type': '[LinkedIntegrationRuntime]'}, + 'pushed_version': {'key': 'typeProperties.pushedVersion', 'type': 'str'}, + 'latest_version': {'key': 'typeProperties.latestVersion', 'type': 'str'}, } - def __init__(self, *, additional_properties=None, nodes=None, links=None, **kwargs) -> None: + def __init__(self, *, additional_properties=None, nodes=None, **kwargs) -> None: super(SelfHostedIntegrationRuntimeStatus, self).__init__(additional_properties=additional_properties, **kwargs) self.create_time = None self.task_queue_id = None @@ -125,5 +130,6 @@ def __init__(self, *, additional_properties=None, nodes=None, links=None, **kwar self.service_urls = None self.auto_update = None self.version_status = None - self.links = links + self.pushed_version = None + self.latest_version = None self.type = 'SelfHosted' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity.py index 4d39b9d806f1..5a80087427fa 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity.py @@ -26,6 +26,8 @@ class SqlServerStoredProcedureActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -53,6 +55,7 @@ class SqlServerStoredProcedureActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity_py3.py index b1166e0de545..f7200f8f5776 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity_py3.py @@ -26,6 +26,8 @@ class SqlServerStoredProcedureActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -53,6 +55,7 @@ class SqlServerStoredProcedureActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -60,8 +63,8 @@ class SqlServerStoredProcedureActivity(ExecutionActivity): 'stored_procedure_parameters': {'key': 'typeProperties.storedProcedureParameters', 'type': '{StoredProcedureParameter}'}, } - def __init__(self, *, name: str, stored_procedure_name, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, stored_procedure_parameters=None, **kwargs) -> None: - super(SqlServerStoredProcedureActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, stored_procedure_name, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, stored_procedure_parameters=None, **kwargs) -> None: + super(SqlServerStoredProcedureActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.stored_procedure_name = stored_procedure_name self.stored_procedure_parameters = stored_procedure_parameters self.type = 'SqlServerStoredProcedure' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_runs_query_response.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_runs_query_response.py new file mode 100644 index 000000000000..7684fe7eb7dc --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_runs_query_response.py @@ -0,0 +1,39 @@ +# 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 TriggerRunsQueryResponse(Model): + """A list of trigger runs. + + All required parameters must be populated in order to send to Azure. + + :param value: Required. List of trigger runs. + :type value: list[~azure.mgmt.datafactory.models.TriggerRun] + :param continuation_token: The continuation token for getting the next + page of results, if any remaining results exist, null otherwise. + :type continuation_token: str + """ + + _validation = { + 'value': {'required': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': '[TriggerRun]'}, + 'continuation_token': {'key': 'continuationToken', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(TriggerRunsQueryResponse, self).__init__(**kwargs) + self.value = kwargs.get('value', None) + self.continuation_token = kwargs.get('continuation_token', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_runs_query_response_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_runs_query_response_py3.py new file mode 100644 index 000000000000..391a2441b3d1 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_runs_query_response_py3.py @@ -0,0 +1,39 @@ +# 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 TriggerRunsQueryResponse(Model): + """A list of trigger runs. + + All required parameters must be populated in order to send to Azure. + + :param value: Required. List of trigger runs. + :type value: list[~azure.mgmt.datafactory.models.TriggerRun] + :param continuation_token: The continuation token for getting the next + page of results, if any remaining results exist, null otherwise. + :type continuation_token: str + """ + + _validation = { + 'value': {'required': True}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': '[TriggerRun]'}, + 'continuation_token': {'key': 'continuationToken', 'type': 'str'}, + } + + def __init__(self, *, value, continuation_token: str=None, **kwargs) -> None: + super(TriggerRunsQueryResponse, self).__init__(**kwargs) + self.value = value + self.continuation_token = continuation_token diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity.py index 7cf4fc07594b..707c02e538c5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity.py @@ -27,6 +27,8 @@ class UntilActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param expression: Required. An expression that would evaluate to Boolean. @@ -55,6 +57,7 @@ class UntilActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'expression': {'key': 'typeProperties.expression', 'type': 'Expression'}, 'timeout': {'key': 'typeProperties.timeout', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity_py3.py index a73467b7123b..ac23fd6d4e92 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity_py3.py @@ -27,6 +27,8 @@ class UntilActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param expression: Required. An expression that would evaluate to Boolean. @@ -55,14 +57,15 @@ class UntilActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'expression': {'key': 'typeProperties.expression', 'type': 'Expression'}, 'timeout': {'key': 'typeProperties.timeout', 'type': 'object'}, 'activities': {'key': 'typeProperties.activities', 'type': '[Activity]'}, } - def __init__(self, *, name: str, expression, activities, additional_properties=None, description: str=None, depends_on=None, timeout=None, **kwargs) -> None: - super(UntilActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, **kwargs) + def __init__(self, *, name: str, expression, activities, additional_properties=None, description: str=None, depends_on=None, user_properties=None, timeout=None, **kwargs) -> None: + super(UntilActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, **kwargs) self.expression = expression self.timeout = timeout self.activities = activities diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity.py index 0ed8536f0afc..e2000f3f588c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity.py @@ -26,6 +26,8 @@ class WaitActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param wait_time_in_seconds: Required. Duration in seconds. @@ -43,6 +45,7 @@ class WaitActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'wait_time_in_seconds': {'key': 'typeProperties.waitTimeInSeconds', 'type': 'int'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity_py3.py index ee3da26e5b83..4170198d8d3b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity_py3.py @@ -26,6 +26,8 @@ class WaitActivity(ControlActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param wait_time_in_seconds: Required. Duration in seconds. @@ -43,11 +45,12 @@ class WaitActivity(ControlActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'wait_time_in_seconds': {'key': 'typeProperties.waitTimeInSeconds', 'type': 'int'}, } - def __init__(self, *, name: str, wait_time_in_seconds: int, additional_properties=None, description: str=None, depends_on=None, **kwargs) -> None: - super(WaitActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, **kwargs) + def __init__(self, *, name: str, wait_time_in_seconds: int, additional_properties=None, description: str=None, depends_on=None, user_properties=None, **kwargs) -> None: + super(WaitActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, **kwargs) self.wait_time_in_seconds = wait_time_in_seconds self.type = 'Wait' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity.py index 65831d837ae9..017aea067c90 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity.py @@ -26,6 +26,8 @@ class WebActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -71,6 +73,7 @@ class WebActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_py3.py index c84a8e4d31d2..5bdf1c4a0ac8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_py3.py @@ -26,6 +26,8 @@ class WebActivity(ExecutionActivity): :type description: str :param depends_on: Activity depends on condition. :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency] + :param user_properties: Activity user properties. + :type user_properties: dict[str, str] :param type: Required. Constant filled by server. :type type: str :param linked_service_name: Linked service reference. @@ -71,6 +73,7 @@ class WebActivity(ExecutionActivity): 'name': {'key': 'name', 'type': 'str'}, 'description': {'key': 'description', 'type': 'str'}, 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '{str}'}, 'type': {'key': 'type', 'type': 'str'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, @@ -83,8 +86,8 @@ class WebActivity(ExecutionActivity): 'linked_services': {'key': 'typeProperties.linkedServices', 'type': '[LinkedServiceReference]'}, } - def __init__(self, *, name: str, method, url, additional_properties=None, description: str=None, depends_on=None, linked_service_name=None, policy=None, headers=None, body=None, authentication=None, datasets=None, linked_services=None, **kwargs) -> None: - super(WebActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, linked_service_name=linked_service_name, policy=policy, **kwargs) + def __init__(self, *, name: str, method, url, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, headers=None, body=None, authentication=None, datasets=None, linked_services=None, **kwargs) -> None: + super(WebActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs) self.method = method self.url = url self.headers = headers diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/__init__.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/__init__.py index e074c1ecd77a..b6b9497ae922 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/__init__.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/__init__.py @@ -19,6 +19,7 @@ from .pipeline_runs_operations import PipelineRunsOperations from .activity_runs_operations import ActivityRunsOperations from .triggers_operations import TriggersOperations +from .trigger_runs_operations import TriggerRunsOperations __all__ = [ 'Operations', @@ -31,4 +32,5 @@ 'PipelineRunsOperations', 'ActivityRunsOperations', 'TriggersOperations', + 'TriggerRunsOperations', ] diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/activity_runs_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/activity_runs_operations.py index 3cf6354d05f6..ec8288ad562a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/activity_runs_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/activity_runs_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from .. import models @@ -22,7 +23,7 @@ class ActivityRunsOperations(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: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -32,13 +33,13 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config - def list_by_pipeline_run( - self, resource_group_name, factory_name, run_id, start_time, end_time, status=None, activity_name=None, linked_service_name=None, custom_headers=None, raw=False, **operation_config): - """List activity runs based on input filter conditions. + def query_by_pipeline_run( + self, resource_group_name, factory_name, run_id, filter_parameters, custom_headers=None, raw=False, **operation_config): + """Query activity runs based on input filter conditions. :param resource_group_name: The resource group name. :type resource_group_name: str @@ -46,83 +47,64 @@ def list_by_pipeline_run( :type factory_name: str :param run_id: The pipeline run identifier. :type run_id: str - :param start_time: The start time of activity runs in ISO8601 format. - :type start_time: datetime - :param end_time: The end time of activity runs in ISO8601 format. - :type end_time: datetime - :param status: The status of the pipeline run. - :type status: str - :param activity_name: The name of the activity. - :type activity_name: str - :param linked_service_name: The linked service name. - :type linked_service_name: str + :param filter_parameters: Parameters to filter the activity runs. + :type filter_parameters: + ~azure.mgmt.datafactory.models.RunFilterParameters :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`. - :return: An iterator like instance of ActivityRun - :rtype: - ~azure.mgmt.datafactory.models.ActivityRunPaged[~azure.mgmt.datafactory.models.ActivityRun] - :raises: - :class:`ErrorResponseException` + :return: ActivityRunsQueryResponse or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.datafactory.models.ActivityRunsQueryResponse or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` """ - def internal_paging(next_link=None, raw=False): - - if not next_link: - # Construct URL - url = self.list_by_pipeline_run.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', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), - 'factoryName': self._serialize.url("factory_name", factory_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$'), - 'runId': self._serialize.url("run_id", run_id, 'str') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - query_parameters['startTime'] = self._serialize.query("start_time", start_time, 'iso-8601') - query_parameters['endTime'] = self._serialize.query("end_time", end_time, 'iso-8601') - if status is not None: - query_parameters['status'] = self._serialize.query("status", status, 'str') - if activity_name is not None: - query_parameters['activityName'] = self._serialize.query("activity_name", activity_name, 'str') - if linked_service_name is not None: - query_parameters['linkedServiceName'] = self._serialize.query("linked_service_name", linked_service_name, 'str', max_length=260, min_length=1, pattern=r'^[A-Za-z0-9_][^<>*#.%&:\\+?/]*$') - - else: - url = next_link - query_parameters = {} - - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) - - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) - - return response - - # Deserialize response - deserialized = models.ActivityRunPaged(internal_paging, self._deserialize.dependencies) + # Construct URL + url = self.query_by_pipeline_run.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', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'factoryName': self._serialize.url("factory_name", factory_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$'), + 'runId': self._serialize.url("run_id", run_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(filter_parameters, 'RunFilterParameters') + + # Construct and send request + request = self._client.post(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, 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('ActivityRunsQueryResponse', response) if raw: - header_dict = {} - client_raw_response = models.ActivityRunPaged(internal_paging, self._deserialize.dependencies, header_dict) + client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response return deserialized - list_by_pipeline_run.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns/{runId}/activityruns'} + query_by_pipeline_run.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns/{runId}/queryActivityruns'} diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/datasets_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/datasets_operations.py index 9179f1e9dc95..d2768372d196 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/datasets_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/datasets_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from .. import models @@ -22,7 +23,7 @@ class DatasetsOperations(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: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -32,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config @@ -52,8 +53,7 @@ def list_by_factory( :return: An iterator like instance of DatasetResource :rtype: ~azure.mgmt.datafactory.models.DatasetResourcePaged[~azure.mgmt.datafactory.models.DatasetResource] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -91,7 +91,9 @@ def internal_paging(next_link=None, raw=False): request, header_parameters, 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 @@ -130,8 +132,7 @@ def create_or_update( :return: DatasetResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.DatasetResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ dataset = models.DatasetResource(properties=properties) @@ -170,7 +171,9 @@ def create_or_update( request, header_parameters, body_content, 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 @@ -185,7 +188,7 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/datasets/{datasetName}'} def get( - self, resource_group_name, factory_name, dataset_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, factory_name, dataset_name, if_none_match=None, custom_headers=None, raw=False, **operation_config): """Gets a dataset. :param resource_group_name: The resource group name. @@ -194,6 +197,10 @@ def get( :type factory_name: str :param dataset_name: The dataset name. :type dataset_name: str + :param if_none_match: ETag of the dataset entity. Should only be + specified for get. If the ETag matches the existing entity tag, or if + * was provided, then no content will be returned. + :type if_none_match: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -202,8 +209,7 @@ def get( :return: DatasetResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.DatasetResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get.metadata['url'] @@ -226,6 +232,8 @@ def get( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) + if if_none_match is not None: + header_parameters['If-None-Match'] = self._serialize.header("if_none_match", if_none_match, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -233,8 +241,10 @@ def get( request = self._client.get(url, query_parameters) response = self._client.send(request, header_parameters, stream=False, **operation_config) - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + if response.status_code not in [200, 304]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp deserialized = None @@ -265,8 +275,7 @@ def delete( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.delete.metadata['url'] @@ -297,7 +306,9 @@ def delete( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 204]: - raise models.ErrorResponseException(self._deserialize, response) + 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-datafactory/azure/mgmt/datafactory/operations/factories_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/factories_operations.py index 0a64dbac9083..d77c7fa31166 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/factories_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/factories_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from .. import models @@ -22,7 +23,7 @@ class FactoriesOperations(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: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -32,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config @@ -48,8 +49,7 @@ def list( :return: An iterator like instance of Factory :rtype: ~azure.mgmt.datafactory.models.FactoryPaged[~azure.mgmt.datafactory.models.Factory] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -85,7 +85,9 @@ def internal_paging(next_link=None, raw=False): request, header_parameters, 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 @@ -101,14 +103,16 @@ def internal_paging(next_link=None, raw=False): list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/factories'} def configure_factory_repo( - self, location_id, factory_repo_update, custom_headers=None, raw=False, **operation_config): + self, location_id, factory_resource_id=None, repo_configuration=None, custom_headers=None, raw=False, **operation_config): """Updates a factory's repo information. :param location_id: The location identifier. :type location_id: str - :param factory_repo_update: Update factory repo request definition. - :type factory_repo_update: - ~azure.mgmt.datafactory.models.FactoryRepoUpdate + :param factory_resource_id: The factory resource id. + :type factory_resource_id: str + :param repo_configuration: Git repo information of the factory. + :type repo_configuration: + ~azure.mgmt.datafactory.models.FactoryRepoConfiguration :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -117,9 +121,10 @@ def configure_factory_repo( :return: Factory or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.Factory or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ + factory_repo_update = models.FactoryRepoUpdate(factory_resource_id=factory_resource_id, repo_configuration=repo_configuration) + # Construct URL url = self.configure_factory_repo.metadata['url'] path_format_arguments = { @@ -151,7 +156,9 @@ def configure_factory_repo( request, header_parameters, body_content, 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 @@ -179,8 +186,7 @@ def list_by_resource_group( :return: An iterator like instance of Factory :rtype: ~azure.mgmt.datafactory.models.FactoryPaged[~azure.mgmt.datafactory.models.Factory] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -217,7 +223,9 @@ def internal_paging(next_link=None, raw=False): request, header_parameters, 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 @@ -233,7 +241,7 @@ def internal_paging(next_link=None, raw=False): list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories'} def create_or_update( - self, resource_group_name, factory_name, factory, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, factory_name, factory, if_match=None, custom_headers=None, raw=False, **operation_config): """Creates or updates a factory. :param resource_group_name: The resource group name. @@ -242,6 +250,10 @@ def create_or_update( :type factory_name: str :param factory: Factory resource definition. :type factory: ~azure.mgmt.datafactory.models.Factory + :param if_match: ETag of the factory entity. Should only be specified + for update, for which it should match existing entity or can be * for + unconditional update. + :type if_match: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -250,8 +262,7 @@ def create_or_update( :return: Factory or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.Factory or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.create_or_update.metadata['url'] @@ -273,6 +284,8 @@ def create_or_update( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) + if if_match is not None: + header_parameters['If-Match'] = self._serialize.header("if_match", if_match, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -285,7 +298,9 @@ def create_or_update( request, header_parameters, body_content, 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 @@ -319,8 +334,7 @@ def update( :return: Factory or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.Factory or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ factory_update_parameters = models.FactoryUpdateParameters(tags=tags, identity=identity) @@ -356,7 +370,9 @@ def update( request, header_parameters, body_content, 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 @@ -371,13 +387,17 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} def get( - self, resource_group_name, factory_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, factory_name, if_none_match=None, custom_headers=None, raw=False, **operation_config): """Gets a factory. :param resource_group_name: The resource group name. :type resource_group_name: str :param factory_name: The factory name. :type factory_name: str + :param if_none_match: ETag of the factory entity. Should only be + specified for get. If the ETag matches the existing entity tag, or if + * was provided, then no content will be returned. + :type if_none_match: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -386,8 +406,7 @@ def get( :return: Factory or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.Factory or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get.metadata['url'] @@ -409,6 +428,8 @@ def get( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) + if if_none_match is not None: + header_parameters['If-None-Match'] = self._serialize.header("if_none_match", if_none_match, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -416,8 +437,10 @@ def get( request = self._client.get(url, query_parameters) response = self._client.send(request, header_parameters, stream=False, **operation_config) - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + if response.status_code not in [200, 304]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp deserialized = None @@ -446,8 +469,7 @@ def delete( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.delete.metadata['url'] @@ -477,65 +499,11 @@ def delete( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 204]: - raise models.ErrorResponseException(self._deserialize, response) + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} - - def cancel_pipeline_run( - self, resource_group_name, factory_name, run_id, custom_headers=None, raw=False, **operation_config): - """Cancel a pipeline run by its run ID. - - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param factory_name: The factory name. - :type factory_name: str - :param run_id: The pipeline run identifier. - :type run_id: 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`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` - """ - # Construct URL - url = self.cancel_pipeline_run.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', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), - 'factoryName': self._serialize.url("factory_name", factory_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$'), - 'runId': self._serialize.url("run_id", run_id, 'str') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) - - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) - - if raw: - client_raw_response = ClientRawResponse(None, response) - return client_raw_response - cancel_pipeline_run.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/cancelpipelinerun/{runId}'} diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/integration_runtime_nodes_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/integration_runtime_nodes_operations.py index d1cc12ef640d..e909517a9cbc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/integration_runtime_nodes_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/integration_runtime_nodes_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from .. import models @@ -22,7 +23,7 @@ class IntegrationRuntimeNodesOperations(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: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -32,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config @@ -55,8 +56,7 @@ def delete( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.delete.metadata['url'] @@ -88,7 +88,9 @@ def delete( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 204]: - raise models.ErrorResponseException(self._deserialize, response) + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp if raw: client_raw_response = ClientRawResponse(None, response) @@ -121,8 +123,7 @@ def update( :rtype: ~azure.mgmt.datafactory.models.SelfHostedIntegrationRuntimeNode or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ update_integration_runtime_node_request = models.UpdateIntegrationRuntimeNodeRequest(concurrent_jobs_limit=concurrent_jobs_limit) @@ -160,7 +161,9 @@ def update( request, header_parameters, body_content, 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 @@ -195,8 +198,7 @@ def get_ip_address( raw=true :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeNodeIpAddress or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get_ip_address.metadata['url'] @@ -228,7 +230,9 @@ def get_ip_address( response = self._client.send(request, header_parameters, 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 diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/integration_runtimes_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/integration_runtimes_operations.py index 6790452bfc6f..6fe48b40a33c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/integration_runtimes_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/integration_runtimes_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from msrest.polling import LROPoller, NoPolling from msrestazure.polling.arm_polling import ARMPolling @@ -24,7 +25,7 @@ class IntegrationRuntimesOperations(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: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -34,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config @@ -54,8 +55,7 @@ def list_by_factory( :return: An iterator like instance of IntegrationRuntimeResource :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeResourcePaged[~azure.mgmt.datafactory.models.IntegrationRuntimeResource] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -93,7 +93,9 @@ def internal_paging(next_link=None, raw=False): request, header_parameters, 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 @@ -132,8 +134,7 @@ def create_or_update( :return: IntegrationRuntimeResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ integration_runtime = models.IntegrationRuntimeResource(properties=properties) @@ -172,7 +173,9 @@ def create_or_update( request, header_parameters, body_content, 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 @@ -187,7 +190,7 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}'} def get( - self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, factory_name, integration_runtime_name, if_none_match=None, custom_headers=None, raw=False, **operation_config): """Gets an integration runtime. :param resource_group_name: The resource group name. @@ -196,6 +199,10 @@ def get( :type factory_name: str :param integration_runtime_name: The integration runtime name. :type integration_runtime_name: str + :param if_none_match: ETag of the integration runtime entity. Should + only be specified for get. If the ETag matches the existing entity + tag, or if * was provided, then no content will be returned. + :type if_none_match: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -204,8 +211,7 @@ def get( :return: IntegrationRuntimeResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get.metadata['url'] @@ -228,6 +234,8 @@ def get( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) + if if_none_match is not None: + header_parameters['If-None-Match'] = self._serialize.header("if_none_match", if_none_match, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -235,8 +243,10 @@ def get( request = self._client.get(url, query_parameters) response = self._client.send(request, header_parameters, stream=False, **operation_config) - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + if response.status_code not in [200, 304]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp deserialized = None @@ -275,13 +285,10 @@ def update( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: IntegrationRuntimeStatusResponse or ClientRawResponse if - raw=true - :rtype: - ~azure.mgmt.datafactory.models.IntegrationRuntimeStatusResponse or + :return: IntegrationRuntimeResource or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ update_integration_runtime_request = models.UpdateIntegrationRuntimeRequest(auto_update=auto_update, update_delay_offset=update_delay_offset) @@ -318,12 +325,14 @@ def update( request, header_parameters, body_content, 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 if response.status_code == 200: - deserialized = self._deserialize('IntegrationRuntimeStatusResponse', response) + deserialized = self._deserialize('IntegrationRuntimeResource', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) @@ -349,8 +358,7 @@ def delete( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.delete.metadata['url'] @@ -381,7 +389,9 @@ def delete( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 204]: - raise models.ErrorResponseException(self._deserialize, response) + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp if raw: client_raw_response = ClientRawResponse(None, response) @@ -408,8 +418,7 @@ def get_status( :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeStatusResponse or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get_status.metadata['url'] @@ -440,7 +449,9 @@ def get_status( response = self._client.send(request, header_parameters, 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 @@ -475,8 +486,7 @@ def get_connection_info( :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeConnectionInfo or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get_connection_info.metadata['url'] @@ -507,7 +517,9 @@ def get_connection_info( response = self._client.send(request, header_parameters, 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 @@ -543,8 +555,7 @@ def regenerate_auth_key( :return: IntegrationRuntimeAuthKeys or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeAuthKeys or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ regenerate_key_parameters = models.IntegrationRuntimeRegenerateKeyParameters(key_name=key_name) @@ -581,7 +592,9 @@ def regenerate_auth_key( request, header_parameters, body_content, 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 @@ -613,8 +626,7 @@ def list_auth_keys( :return: IntegrationRuntimeAuthKeys or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeAuthKeys or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.list_auth_keys.metadata['url'] @@ -645,7 +657,9 @@ def list_auth_keys( response = self._client.send(request, header_parameters, 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 @@ -691,7 +705,9 @@ def _start_initial( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 202]: - raise models.ErrorResponseException(self._deserialize, response) + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp deserialized = None @@ -726,8 +742,7 @@ def start( ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.datafactory.models.IntegrationRuntimeStatusResponse] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.datafactory.models.IntegrationRuntimeStatusResponse]] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ raw_result = self._start_initial( resource_group_name=resource_group_name, @@ -788,7 +803,9 @@ def _stop_initial( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 202]: - 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) @@ -813,8 +830,7 @@ def stop( ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ raw_result = self._stop_initial( resource_group_name=resource_group_name, @@ -839,73 +855,6 @@ def get_long_running_output(response): return LROPoller(self._client, raw_result, get_long_running_output, polling_method) stop.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/stop'} - def remove_node( - self, resource_group_name, factory_name, integration_runtime_name, additional_properties=None, node_name=None, custom_headers=None, raw=False, **operation_config): - """Remove a node from integration runtime. - - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param factory_name: The factory name. - :type factory_name: str - :param integration_runtime_name: The integration runtime name. - :type integration_runtime_name: str - :param additional_properties: Unmatched properties from the message - are deserialized this collection - :type additional_properties: dict[str, object] - :param node_name: The name of the node to be removed. - :type node_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`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` - """ - remove_node_parameters = models.IntegrationRuntimeRemoveNodeRequest(additional_properties=additional_properties, node_name=node_name) - - # Construct URL - url = self.remove_node.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', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), - 'factoryName': self._serialize.url("factory_name", factory_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$'), - 'integrationRuntimeName': self._serialize.url("integration_runtime_name", integration_runtime_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct body - body_content = self._serialize.body(remove_node_parameters, 'IntegrationRuntimeRemoveNodeRequest') - - # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) - - if response.status_code not in [200, 204]: - raise models.ErrorResponseException(self._deserialize, response) - - if raw: - client_raw_response = ClientRawResponse(None, response) - return client_raw_response - remove_node.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/removeNode'} - def sync_credentials( self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): """Force the integration runtime to synchronize credentials across @@ -928,8 +877,7 @@ def sync_credentials( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.sync_credentials.metadata['url'] @@ -960,7 +908,9 @@ def sync_credentials( response = self._client.send(request, header_parameters, 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 if raw: client_raw_response = ClientRawResponse(None, response) @@ -988,8 +938,7 @@ def get_monitoring_data( :rtype: ~azure.mgmt.datafactory.models.IntegrationRuntimeMonitoringData or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get_monitoring_data.metadata['url'] @@ -1020,7 +969,9 @@ def get_monitoring_data( response = self._client.send(request, header_parameters, 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 @@ -1051,8 +1002,7 @@ def upgrade( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.upgrade.metadata['url'] @@ -1083,7 +1033,9 @@ def upgrade( response = self._client.send(request, header_parameters, 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 if raw: client_raw_response = ClientRawResponse(None, response) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/linked_services_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/linked_services_operations.py index 93a9eb3dd631..98ef184787ba 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/linked_services_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/linked_services_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from .. import models @@ -22,7 +23,7 @@ class LinkedServicesOperations(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: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -32,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config @@ -52,8 +53,7 @@ def list_by_factory( :return: An iterator like instance of LinkedServiceResource :rtype: ~azure.mgmt.datafactory.models.LinkedServiceResourcePaged[~azure.mgmt.datafactory.models.LinkedServiceResource] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -91,7 +91,9 @@ def internal_paging(next_link=None, raw=False): request, header_parameters, 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 @@ -130,8 +132,7 @@ def create_or_update( :return: LinkedServiceResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.LinkedServiceResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ linked_service = models.LinkedServiceResource(properties=properties) @@ -170,7 +171,9 @@ def create_or_update( request, header_parameters, body_content, 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 @@ -185,7 +188,7 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/linkedservices/{linkedServiceName}'} def get( - self, resource_group_name, factory_name, linked_service_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, factory_name, linked_service_name, if_none_match=None, custom_headers=None, raw=False, **operation_config): """Gets a linked service. :param resource_group_name: The resource group name. @@ -194,6 +197,10 @@ def get( :type factory_name: str :param linked_service_name: The linked service name. :type linked_service_name: str + :param if_none_match: ETag of the linked service entity. Should only + be specified for get. If the ETag matches the existing entity tag, or + if * was provided, then no content will be returned. + :type if_none_match: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -202,8 +209,7 @@ def get( :return: LinkedServiceResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.LinkedServiceResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get.metadata['url'] @@ -226,6 +232,8 @@ def get( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) + if if_none_match is not None: + header_parameters['If-None-Match'] = self._serialize.header("if_none_match", if_none_match, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -233,8 +241,10 @@ def get( request = self._client.get(url, query_parameters) response = self._client.send(request, header_parameters, stream=False, **operation_config) - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + if response.status_code not in [200, 304]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp deserialized = None @@ -265,8 +275,7 @@ def delete( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.delete.metadata['url'] @@ -297,7 +306,9 @@ def delete( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 204]: - raise models.ErrorResponseException(self._deserialize, response) + 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-datafactory/azure/mgmt/datafactory/operations/operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/operations.py index 5e3dbd283530..8af242714177 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from .. import models @@ -22,7 +23,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: The API version. Constant value: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -32,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config @@ -45,43 +46,53 @@ def list( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: OperationListResponse or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.datafactory.models.OperationListResponse or - ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :return: An iterator like instance of Operation + :rtype: + ~azure.mgmt.datafactory.models.OperationPaged[~azure.mgmt.datafactory.models.Operation] + :raises: :class:`CloudError` """ - # Construct URL - url = self.list.metadata['url'] + def internal_paging(next_link=None, raw=False): - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + if not next_link: + # Construct URL + url = self.list.metadata['url'] - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + else: + url = next_link + query_parameters = {} - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - deserialized = None + # Construct and send request + request = self._client.get(url, query_parameters) + response = self._client.send( + request, header_parameters, stream=False, **operation_config) - if response.status_code == 200: - deserialized = self._deserialize('OperationListResponse', response) + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.OperationPaged(internal_paging, self._deserialize.dependencies) if raw: - client_raw_response = ClientRawResponse(deserialized, response) + header_dict = {} + client_raw_response = models.OperationPaged(internal_paging, self._deserialize.dependencies, header_dict) return client_raw_response return deserialized diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipeline_runs_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipeline_runs_operations.py index 70daad3a45f8..6fcc2316ce16 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipeline_runs_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipeline_runs_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from .. import models @@ -22,7 +23,7 @@ class PipelineRunsOperations(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: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -32,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config @@ -46,17 +47,16 @@ def query_by_factory( :type factory_name: str :param filter_parameters: Parameters to filter the pipeline run. :type filter_parameters: - ~azure.mgmt.datafactory.models.PipelineRunFilterParameters + ~azure.mgmt.datafactory.models.RunFilterParameters :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`. - :return: PipelineRunQueryResponse or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.datafactory.models.PipelineRunQueryResponse or + :return: PipelineRunsQueryResponse or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.datafactory.models.PipelineRunsQueryResponse or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.query_by_factory.metadata['url'] @@ -82,7 +82,7 @@ def query_by_factory( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct body - body_content = self._serialize.body(filter_parameters, 'PipelineRunFilterParameters') + body_content = self._serialize.body(filter_parameters, 'RunFilterParameters') # Construct and send request request = self._client.post(url, query_parameters) @@ -90,19 +90,21 @@ def query_by_factory( request, header_parameters, body_content, 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 if response.status_code == 200: - deserialized = self._deserialize('PipelineRunQueryResponse', response) + deserialized = self._deserialize('PipelineRunsQueryResponse', response) if raw: client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response return deserialized - query_by_factory.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns'} + query_by_factory.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/queryPipelineRuns'} def get( self, resource_group_name, factory_name, run_id, custom_headers=None, raw=False, **operation_config): @@ -122,8 +124,7 @@ def get( :return: PipelineRun or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.PipelineRun or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get.metadata['url'] @@ -154,7 +155,9 @@ def get( response = self._client.send(request, header_parameters, 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 @@ -167,3 +170,60 @@ def get( return deserialized get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns/{runId}'} + + def cancel( + self, resource_group_name, factory_name, run_id, custom_headers=None, raw=False, **operation_config): + """Cancel a pipeline run by its run ID. + + :param resource_group_name: The resource group name. + :type resource_group_name: str + :param factory_name: The factory name. + :type factory_name: str + :param run_id: The pipeline run identifier. + :type run_id: 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`. + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.cancel.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', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'factoryName': self._serialize.url("factory_name", factory_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$'), + 'runId': self._serialize.url("run_id", run_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.post(url, query_parameters) + response = self._client.send(request, header_parameters, 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 + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + cancel.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns/{runId}/cancel'} diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipelines_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipelines_operations.py index 5dbca8f0a008..61cf8f7bcda8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipelines_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipelines_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from .. import models @@ -22,7 +23,7 @@ class PipelinesOperations(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: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -32,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config @@ -52,8 +53,7 @@ def list_by_factory( :return: An iterator like instance of PipelineResource :rtype: ~azure.mgmt.datafactory.models.PipelineResourcePaged[~azure.mgmt.datafactory.models.PipelineResource] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -91,7 +91,9 @@ def internal_paging(next_link=None, raw=False): request, header_parameters, 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 @@ -130,8 +132,7 @@ def create_or_update( :return: PipelineResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.PipelineResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.create_or_update.metadata['url'] @@ -168,7 +169,9 @@ def create_or_update( request, header_parameters, body_content, 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 @@ -183,7 +186,7 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines/{pipelineName}'} def get( - self, resource_group_name, factory_name, pipeline_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, factory_name, pipeline_name, if_none_match=None, custom_headers=None, raw=False, **operation_config): """Gets a pipeline. :param resource_group_name: The resource group name. @@ -192,6 +195,10 @@ def get( :type factory_name: str :param pipeline_name: The pipeline name. :type pipeline_name: str + :param if_none_match: ETag of the pipeline entity. Should only be + specified for get. If the ETag matches the existing entity tag, or if + * was provided, then no content will be returned. + :type if_none_match: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -200,8 +207,7 @@ def get( :return: PipelineResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.PipelineResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get.metadata['url'] @@ -224,6 +230,8 @@ def get( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) + if if_none_match is not None: + header_parameters['If-None-Match'] = self._serialize.header("if_none_match", if_none_match, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -231,8 +239,10 @@ def get( request = self._client.get(url, query_parameters) response = self._client.send(request, header_parameters, stream=False, **operation_config) - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + if response.status_code not in [200, 304]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp deserialized = None @@ -263,8 +273,7 @@ def delete( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.delete.metadata['url'] @@ -295,7 +304,9 @@ def delete( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 204]: - raise models.ErrorResponseException(self._deserialize, response) + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp if raw: client_raw_response = ClientRawResponse(None, response) @@ -303,7 +314,7 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines/{pipelineName}'} def create_run( - self, resource_group_name, factory_name, pipeline_name, parameters=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, factory_name, pipeline_name, reference_pipeline_run_id=None, parameters=None, custom_headers=None, raw=False, **operation_config): """Creates a run of a pipeline. :param resource_group_name: The resource group name. @@ -312,7 +323,12 @@ def create_run( :type factory_name: str :param pipeline_name: The pipeline name. :type pipeline_name: str - :param parameters: Parameters of the pipeline run. + :param reference_pipeline_run_id: The pipeline run identifier. If run + ID is specified the parameters of the the specified run will be used + to create a new run. + :type reference_pipeline_run_id: str + :param parameters: Parameters of the pipeline run. These parameters + will be used only if the runId is not specified. :type parameters: dict[str, object] :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -322,8 +338,7 @@ def create_run( :return: CreateRunResponse or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.CreateRunResponse or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.create_run.metadata['url'] @@ -338,6 +353,8 @@ def create_run( # Construct parameters query_parameters = {} query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + if reference_pipeline_run_id is not None: + query_parameters['referencePipelineRunId'] = self._serialize.query("reference_pipeline_run_id", reference_pipeline_run_id, 'str') # Construct headers header_parameters = {} @@ -360,12 +377,14 @@ def create_run( response = self._client.send( request, header_parameters, body_content, stream=False, **operation_config) - if response.status_code not in [202]: - raise models.ErrorResponseException(self._deserialize, response) + 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 == 202: + if response.status_code == 200: deserialized = self._deserialize('CreateRunResponse', response) if raw: diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/trigger_runs_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/trigger_runs_operations.py new file mode 100644 index 000000000000..f56548720d87 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/trigger_runs_operations.py @@ -0,0 +1,107 @@ +# 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 TriggerRunsOperations(object): + """TriggerRunsOperations 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-06-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-06-01" + + self.config = config + + def query_by_factory( + self, resource_group_name, factory_name, filter_parameters, custom_headers=None, raw=False, **operation_config): + """Query trigger runs. + + :param resource_group_name: The resource group name. + :type resource_group_name: str + :param factory_name: The factory name. + :type factory_name: str + :param filter_parameters: Parameters to filter the pipeline run. + :type filter_parameters: + ~azure.mgmt.datafactory.models.RunFilterParameters + :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`. + :return: TriggerRunsQueryResponse or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.datafactory.models.TriggerRunsQueryResponse or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.query_by_factory.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', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'factoryName': self._serialize.url("factory_name", factory_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(filter_parameters, 'RunFilterParameters') + + # Construct and send request + request = self._client.post(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, 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('TriggerRunsQueryResponse', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + query_by_factory.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/queryTriggerRuns'} diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/triggers_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/triggers_operations.py index e54de00202ea..9c8359038228 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/triggers_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/triggers_operations.py @@ -11,6 +11,7 @@ import uuid from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError from msrest.polling import LROPoller, NoPolling from msrestazure.polling.arm_polling import ARMPolling @@ -24,7 +25,7 @@ class TriggersOperations(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: "2017-09-01-preview". + :ivar api_version: The API version. Constant value: "2018-06-01". """ models = models @@ -34,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-09-01-preview" + self.api_version = "2018-06-01" self.config = config @@ -54,8 +55,7 @@ def list_by_factory( :return: An iterator like instance of TriggerResource :rtype: ~azure.mgmt.datafactory.models.TriggerResourcePaged[~azure.mgmt.datafactory.models.TriggerResource] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ def internal_paging(next_link=None, raw=False): @@ -93,7 +93,9 @@ def internal_paging(next_link=None, raw=False): request, header_parameters, 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 @@ -132,8 +134,7 @@ def create_or_update( :return: TriggerResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.TriggerResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ trigger = models.TriggerResource(properties=properties) @@ -172,7 +173,9 @@ def create_or_update( request, header_parameters, body_content, 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 @@ -187,7 +190,7 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}'} def get( - self, resource_group_name, factory_name, trigger_name, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, factory_name, trigger_name, if_none_match=None, custom_headers=None, raw=False, **operation_config): """Gets a trigger. :param resource_group_name: The resource group name. @@ -196,6 +199,10 @@ def get( :type factory_name: str :param trigger_name: The trigger name. :type trigger_name: str + :param if_none_match: ETag of the trigger entity. Should only be + specified for get. If the ETag matches the existing entity tag, or if + * was provided, then no content will be returned. + :type if_none_match: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -204,8 +211,7 @@ def get( :return: TriggerResource or ClientRawResponse if raw=true :rtype: ~azure.mgmt.datafactory.models.TriggerResource or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.get.metadata['url'] @@ -228,6 +234,8 @@ def get( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) + if if_none_match is not None: + header_parameters['If-None-Match'] = self._serialize.header("if_none_match", if_none_match, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -235,8 +243,10 @@ def get( request = self._client.get(url, query_parameters) response = self._client.send(request, header_parameters, stream=False, **operation_config) - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) + if response.status_code not in [200, 304]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp deserialized = None @@ -267,8 +277,7 @@ def delete( overrides`. :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ # Construct URL url = self.delete.metadata['url'] @@ -299,7 +308,9 @@ def delete( response = self._client.send(request, header_parameters, stream=False, **operation_config) if response.status_code not in [200, 204]: - raise models.ErrorResponseException(self._deserialize, response) + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp if raw: client_raw_response = ClientRawResponse(None, response) @@ -338,7 +349,9 @@ def _start_initial( response = self._client.send(request, header_parameters, 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 if raw: client_raw_response = ClientRawResponse(None, response) @@ -363,8 +376,7 @@ def start( ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ raw_result = self._start_initial( resource_group_name=resource_group_name, @@ -421,7 +433,9 @@ def _stop_initial( response = self._client.send(request, header_parameters, 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 if raw: client_raw_response = ClientRawResponse(None, response) @@ -446,8 +460,7 @@ def stop( ClientRawResponse if raw==True :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] - :raises: - :class:`ErrorResponseException` + :raises: :class:`CloudError` """ raw_result = self._stop_initial( resource_group_name=resource_group_name, @@ -471,82 +484,3 @@ def get_long_running_output(response): else: polling_method = polling return LROPoller(self._client, raw_result, get_long_running_output, polling_method) stop.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/stop'} - - def list_runs( - self, resource_group_name, factory_name, trigger_name, start_time, end_time, custom_headers=None, raw=False, **operation_config): - """List trigger runs. - - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param factory_name: The factory name. - :type factory_name: str - :param trigger_name: The trigger name. - :type trigger_name: str - :param start_time: Start time for trigger runs. - :type start_time: datetime - :param end_time: End time for trigger runs. - :type end_time: datetime - :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`. - :return: An iterator like instance of TriggerRun - :rtype: - ~azure.mgmt.datafactory.models.TriggerRunPaged[~azure.mgmt.datafactory.models.TriggerRun] - :raises: - :class:`ErrorResponseException` - """ - def internal_paging(next_link=None, raw=False): - - if not next_link: - # Construct URL - url = self.list_runs.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', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), - 'factoryName': self._serialize.url("factory_name", factory_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$'), - 'triggerName': self._serialize.url("trigger_name", trigger_name, 'str', max_length=260, min_length=1, pattern=r'^[A-Za-z0-9_][^<>*#.%&:\\+?/]*$') - } - 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') - query_parameters['startTime'] = self._serialize.query("start_time", start_time, 'iso-8601') - query_parameters['endTime'] = self._serialize.query("end_time", end_time, 'iso-8601') - - else: - url = next_link - query_parameters = {} - - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) - - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) - - return response - - # Deserialize response - deserialized = models.TriggerRunPaged(internal_paging, self._deserialize.dependencies) - - if raw: - header_dict = {} - client_raw_response = models.TriggerRunPaged(internal_paging, self._deserialize.dependencies, header_dict) - return client_raw_response - - return deserialized - list_runs.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/triggerruns'} diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py index 5a7feab42d26..a39916c162ce 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.6.0" +VERSION = "1.0.0"