From 5d5f4866a80650778837705070fdf4ce343437a9 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Fri, 4 Oct 2019 00:52:09 +0000 Subject: [PATCH 1/2] Generated from 0dd3e19d7826706a7eb3249eafbddc18be2f2cf8 Add AzureMLExecutePipeline activity and AzureMLService linked service --- .../azure/mgmt/datafactory/models/__init__.py | 6 + .../azure/mgmt/datafactory/models/_models.py | 193 ++++++++++++++++-- .../mgmt/datafactory/models/_models_py3.py | 193 ++++++++++++++++-- 3 files changed, 364 insertions(+), 28 deletions(-) diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py index 83229dd8d080..ab74ddc7c0fe 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py @@ -71,7 +71,9 @@ from ._models_py3 import AzureMariaDBSource from ._models_py3 import AzureMariaDBTableDataset from ._models_py3 import AzureMLBatchExecutionActivity + from ._models_py3 import AzureMLExecutePipelineActivity from ._models_py3 import AzureMLLinkedService + from ._models_py3 import AzureMLServiceLinkedService from ._models_py3 import AzureMLUpdateResourceActivity from ._models_py3 import AzureMLWebServiceFile from ._models_py3 import AzureMySqlLinkedService @@ -633,7 +635,9 @@ from ._models import AzureMariaDBSource from ._models import AzureMariaDBTableDataset from ._models import AzureMLBatchExecutionActivity + from ._models import AzureMLExecutePipelineActivity from ._models import AzureMLLinkedService + from ._models import AzureMLServiceLinkedService from ._models import AzureMLUpdateResourceActivity from ._models import AzureMLWebServiceFile from ._models import AzureMySqlLinkedService @@ -1282,7 +1286,9 @@ 'AzureMariaDBSource', 'AzureMariaDBTableDataset', 'AzureMLBatchExecutionActivity', + 'AzureMLExecutePipelineActivity', 'AzureMLLinkedService', + 'AzureMLServiceLinkedService', 'AzureMLUpdateResourceActivity', 'AzureMLWebServiceFile', 'AzureMySqlLinkedService', diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py index 5a1953f78c38..5f92f907d5c1 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py @@ -334,9 +334,9 @@ class LinkedService(Model): MongoDbV2LinkedService, MongoDbLinkedService, CassandraLinkedService, WebLinkedService, ODataLinkedService, HdfsLinkedService, MicrosoftAccessLinkedService, InformixLinkedService, OdbcLinkedService, - AzureMLLinkedService, TeradataLinkedService, Db2LinkedService, - SybaseLinkedService, PostgreSqlLinkedService, MySqlLinkedService, - AzureMySqlLinkedService, OracleLinkedService, + AzureMLServiceLinkedService, AzureMLLinkedService, TeradataLinkedService, + Db2LinkedService, SybaseLinkedService, PostgreSqlLinkedService, + MySqlLinkedService, AzureMySqlLinkedService, OracleLinkedService, GoogleCloudStorageLinkedService, AzureFileStorageLinkedService, FileServerLinkedService, HDInsightLinkedService, CommonDataServiceForAppsLinkedService, DynamicsCrmLinkedService, @@ -380,7 +380,7 @@ class LinkedService(Model): } _subtype_map = { - 'type': {'AzureFunction': 'AzureFunctionLinkedService', 'AzureDataExplorer': 'AzureDataExplorerLinkedService', 'SapTable': 'SapTableLinkedService', 'GoogleAdWords': 'GoogleAdWordsLinkedService', 'OracleServiceCloud': 'OracleServiceCloudLinkedService', 'DynamicsAX': 'DynamicsAXLinkedService', 'Responsys': 'ResponsysLinkedService', 'AzureDatabricks': 'AzureDatabricksLinkedService', 'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', 'SalesforceMarketingCloud': 'SalesforceMarketingCloudLinkedService', 'Netezza': 'NetezzaLinkedService', 'Vertica': 'VerticaLinkedService', 'Zoho': 'ZohoLinkedService', 'Xero': 'XeroLinkedService', 'Square': 'SquareLinkedService', 'Spark': 'SparkLinkedService', 'Shopify': 'ShopifyLinkedService', 'ServiceNow': 'ServiceNowLinkedService', 'QuickBooks': 'QuickBooksLinkedService', 'Presto': 'PrestoLinkedService', 'Phoenix': 'PhoenixLinkedService', 'Paypal': 'PaypalLinkedService', 'Marketo': 'MarketoLinkedService', 'AzureMariaDB': 'AzureMariaDBLinkedService', 'MariaDB': 'MariaDBLinkedService', 'Magento': 'MagentoLinkedService', 'Jira': 'JiraLinkedService', 'Impala': 'ImpalaLinkedService', 'Hubspot': 'HubspotLinkedService', 'Hive': 'HiveLinkedService', 'HBase': 'HBaseLinkedService', 'Greenplum': 'GreenplumLinkedService', 'GoogleBigQuery': 'GoogleBigQueryLinkedService', 'Eloqua': 'EloquaLinkedService', 'Drill': 'DrillLinkedService', 'Couchbase': 'CouchbaseLinkedService', 'Concur': 'ConcurLinkedService', 'AzurePostgreSql': 'AzurePostgreSqlLinkedService', 'AmazonMWS': 'AmazonMWSLinkedService', 'SapHana': 'SapHanaLinkedService', 'SapBW': 'SapBWLinkedService', 'Sftp': 'SftpServerLinkedService', 'FtpServer': 'FtpServerLinkedService', 'HttpServer': 'HttpLinkedService', 'AzureSearch': 'AzureSearchLinkedService', 'CustomDataSource': 'CustomDataSourceLinkedService', 'AmazonRedshift': 'AmazonRedshiftLinkedService', 'AmazonS3': 'AmazonS3LinkedService', 'RestService': 'RestServiceLinkedService', 'SapOpenHub': 'SapOpenHubLinkedService', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'SalesforceServiceCloud': 'SalesforceServiceCloudLinkedService', 'Salesforce': 'SalesforceLinkedService', 'Office365': 'Office365LinkedService', 'AzureBlobFS': 'AzureBlobFSLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'CosmosDbMongoDbApi': 'CosmosDbMongoDbApiLinkedService', 'MongoDbV2': 'MongoDbV2LinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'MicrosoftAccess': 'MicrosoftAccessLinkedService', 'Informix': 'InformixLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'GoogleCloudStorage': 'GoogleCloudStorageLinkedService', 'AzureFileStorage': 'AzureFileStorageLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'CommonDataServiceForApps': 'CommonDataServiceForAppsLinkedService', 'DynamicsCrm': 'DynamicsCrmLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlMI': 'AzureSqlMILinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureTableStorage': 'AzureTableStorageLinkedService', 'AzureBlobStorage': 'AzureBlobStorageLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} + 'type': {'AzureFunction': 'AzureFunctionLinkedService', 'AzureDataExplorer': 'AzureDataExplorerLinkedService', 'SapTable': 'SapTableLinkedService', 'GoogleAdWords': 'GoogleAdWordsLinkedService', 'OracleServiceCloud': 'OracleServiceCloudLinkedService', 'DynamicsAX': 'DynamicsAXLinkedService', 'Responsys': 'ResponsysLinkedService', 'AzureDatabricks': 'AzureDatabricksLinkedService', 'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', 'SalesforceMarketingCloud': 'SalesforceMarketingCloudLinkedService', 'Netezza': 'NetezzaLinkedService', 'Vertica': 'VerticaLinkedService', 'Zoho': 'ZohoLinkedService', 'Xero': 'XeroLinkedService', 'Square': 'SquareLinkedService', 'Spark': 'SparkLinkedService', 'Shopify': 'ShopifyLinkedService', 'ServiceNow': 'ServiceNowLinkedService', 'QuickBooks': 'QuickBooksLinkedService', 'Presto': 'PrestoLinkedService', 'Phoenix': 'PhoenixLinkedService', 'Paypal': 'PaypalLinkedService', 'Marketo': 'MarketoLinkedService', 'AzureMariaDB': 'AzureMariaDBLinkedService', 'MariaDB': 'MariaDBLinkedService', 'Magento': 'MagentoLinkedService', 'Jira': 'JiraLinkedService', 'Impala': 'ImpalaLinkedService', 'Hubspot': 'HubspotLinkedService', 'Hive': 'HiveLinkedService', 'HBase': 'HBaseLinkedService', 'Greenplum': 'GreenplumLinkedService', 'GoogleBigQuery': 'GoogleBigQueryLinkedService', 'Eloqua': 'EloquaLinkedService', 'Drill': 'DrillLinkedService', 'Couchbase': 'CouchbaseLinkedService', 'Concur': 'ConcurLinkedService', 'AzurePostgreSql': 'AzurePostgreSqlLinkedService', 'AmazonMWS': 'AmazonMWSLinkedService', 'SapHana': 'SapHanaLinkedService', 'SapBW': 'SapBWLinkedService', 'Sftp': 'SftpServerLinkedService', 'FtpServer': 'FtpServerLinkedService', 'HttpServer': 'HttpLinkedService', 'AzureSearch': 'AzureSearchLinkedService', 'CustomDataSource': 'CustomDataSourceLinkedService', 'AmazonRedshift': 'AmazonRedshiftLinkedService', 'AmazonS3': 'AmazonS3LinkedService', 'RestService': 'RestServiceLinkedService', 'SapOpenHub': 'SapOpenHubLinkedService', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'SalesforceServiceCloud': 'SalesforceServiceCloudLinkedService', 'Salesforce': 'SalesforceLinkedService', 'Office365': 'Office365LinkedService', 'AzureBlobFS': 'AzureBlobFSLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'CosmosDbMongoDbApi': 'CosmosDbMongoDbApiLinkedService', 'MongoDbV2': 'MongoDbV2LinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'MicrosoftAccess': 'MicrosoftAccessLinkedService', 'Informix': 'InformixLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureMLService': 'AzureMLServiceLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'GoogleCloudStorage': 'GoogleCloudStorageLinkedService', 'AzureFileStorage': 'AzureFileStorageLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'CommonDataServiceForApps': 'CommonDataServiceForAppsLinkedService', 'DynamicsCrm': 'DynamicsCrmLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlMI': 'AzureSqlMILinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureTableStorage': 'AzureTableStorageLinkedService', 'AzureBlobStorage': 'AzureBlobStorageLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} } def __init__(self, **kwargs): @@ -2814,9 +2814,9 @@ class ExecutionActivity(Activity): sub-classes are: ExecuteDataFlowActivity, AzureFunctionActivity, DatabricksSparkPythonActivity, DatabricksSparkJarActivity, DatabricksNotebookActivity, DataLakeAnalyticsUSQLActivity, - AzureMLUpdateResourceActivity, AzureMLBatchExecutionActivity, - GetMetadataActivity, WebActivity, LookupActivity, - AzureDataExplorerCommandActivity, DeleteActivity, + AzureMLExecutePipelineActivity, AzureMLUpdateResourceActivity, + AzureMLBatchExecutionActivity, GetMetadataActivity, WebActivity, + LookupActivity, AzureDataExplorerCommandActivity, DeleteActivity, SqlServerStoredProcedureActivity, CustomActivity, ExecuteSSISPackageActivity, HDInsightSparkActivity, HDInsightStreamingActivity, HDInsightMapReduceActivity, @@ -2861,7 +2861,7 @@ class ExecutionActivity(Activity): } _subtype_map = { - 'type': {'ExecuteDataFlow': 'ExecuteDataFlowActivity', 'AzureFunctionActivity': 'AzureFunctionActivity', 'DatabricksSparkPython': 'DatabricksSparkPythonActivity', 'DatabricksSparkJar': 'DatabricksSparkJarActivity', 'DatabricksNotebook': 'DatabricksNotebookActivity', 'DataLakeAnalyticsU-SQL': 'DataLakeAnalyticsUSQLActivity', 'AzureMLUpdateResource': 'AzureMLUpdateResourceActivity', 'AzureMLBatchExecution': 'AzureMLBatchExecutionActivity', 'GetMetadata': 'GetMetadataActivity', 'WebActivity': 'WebActivity', 'Lookup': 'LookupActivity', 'AzureDataExplorerCommand': 'AzureDataExplorerCommandActivity', 'Delete': 'DeleteActivity', 'SqlServerStoredProcedure': 'SqlServerStoredProcedureActivity', 'Custom': 'CustomActivity', 'ExecuteSSISPackage': 'ExecuteSSISPackageActivity', 'HDInsightSpark': 'HDInsightSparkActivity', 'HDInsightStreaming': 'HDInsightStreamingActivity', 'HDInsightMapReduce': 'HDInsightMapReduceActivity', 'HDInsightPig': 'HDInsightPigActivity', 'HDInsightHive': 'HDInsightHiveActivity', 'Copy': 'CopyActivity'} + 'type': {'ExecuteDataFlow': 'ExecuteDataFlowActivity', 'AzureFunctionActivity': 'AzureFunctionActivity', 'DatabricksSparkPython': 'DatabricksSparkPythonActivity', 'DatabricksSparkJar': 'DatabricksSparkJarActivity', 'DatabricksNotebook': 'DatabricksNotebookActivity', 'DataLakeAnalyticsU-SQL': 'DataLakeAnalyticsUSQLActivity', 'AzureMLExecutePipeline': 'AzureMLExecutePipelineActivity', 'AzureMLUpdateResource': 'AzureMLUpdateResourceActivity', 'AzureMLBatchExecution': 'AzureMLBatchExecutionActivity', 'GetMetadata': 'GetMetadataActivity', 'WebActivity': 'WebActivity', 'Lookup': 'LookupActivity', 'AzureDataExplorerCommand': 'AzureDataExplorerCommandActivity', 'Delete': 'DeleteActivity', 'SqlServerStoredProcedure': 'SqlServerStoredProcedureActivity', 'Custom': 'CustomActivity', 'ExecuteSSISPackage': 'ExecuteSSISPackageActivity', 'HDInsightSpark': 'HDInsightSparkActivity', 'HDInsightStreaming': 'HDInsightStreamingActivity', 'HDInsightMapReduce': 'HDInsightMapReduceActivity', 'HDInsightPig': 'HDInsightPigActivity', 'HDInsightHive': 'HDInsightHiveActivity', 'Copy': 'CopyActivity'} } def __init__(self, **kwargs): @@ -4303,8 +4303,90 @@ def __init__(self, **kwargs): self.type = 'AzureMLBatchExecution' +class AzureMLExecutePipelineActivity(ExecutionActivity): + """Azure ML Execute Pipeline activity. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param name: Required. Activity name. + :type name: str + :param description: Activity description. + :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: list[~azure.mgmt.datafactory.models.UserProperty] + :param type: Required. Constant filled by server. + :type type: str + :param linked_service_name: Linked service reference. + :type linked_service_name: + ~azure.mgmt.datafactory.models.LinkedServiceReference + :param policy: Activity policy. + :type policy: ~azure.mgmt.datafactory.models.ActivityPolicy + :param ml_pipeline_id: Required. ID of the published Azure ML pipeline. + Type: string (or Expression with resultType string). + :type ml_pipeline_id: object + :param experiment_name: Run history experiment name of the pipeline run. + This information will be passed in the ExperimentName property of the + published pipeline execution request. Type: string (or Expression with + resultType string). + :type experiment_name: object + :param ml_pipeline_parameters: Key,Value pairs to be passed to the + published Azure ML pipeline endpoint. Keys must match the names of + pipeline parameters defined in the published pipeline. Values will be + passed in the ParameterAssignments property of the published pipeline + execution request. Type: object with key value pairs (or Expression with + resultType object). + :type ml_pipeline_parameters: object + :param ml_parent_run_id: The parent Azure ML Service pipeline run id. This + information will be passed in the ParentRunId property of the published + pipeline execution request. Type: string (or Expression with resultType + string). + :type ml_parent_run_id: object + :param continue_on_step_failure: Whether to continue execution of other + steps in the PipelineRun if a step fails. This information will be passed + in the continueOnStepFailure property of the published pipeline execution + request. Type: boolean (or Expression with resultType boolean). + :type continue_on_step_failure: object + """ + + _validation = { + 'name': {'required': True}, + 'type': {'required': True}, + 'ml_pipeline_id': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'name': {'key': 'name', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, + 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '[UserProperty]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, + 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, + 'ml_pipeline_id': {'key': 'typeProperties.mlPipelineId', 'type': 'object'}, + 'experiment_name': {'key': 'typeProperties.experimentName', 'type': 'object'}, + 'ml_pipeline_parameters': {'key': 'typeProperties.mlPipelineParameters', 'type': 'object'}, + 'ml_parent_run_id': {'key': 'typeProperties.mlParentRunId', 'type': 'object'}, + 'continue_on_step_failure': {'key': 'typeProperties.continueOnStepFailure', 'type': 'object'}, + } + + def __init__(self, **kwargs): + super(AzureMLExecutePipelineActivity, self).__init__(**kwargs) + self.ml_pipeline_id = kwargs.get('ml_pipeline_id', None) + self.experiment_name = kwargs.get('experiment_name', None) + self.ml_pipeline_parameters = kwargs.get('ml_pipeline_parameters', None) + self.ml_parent_run_id = kwargs.get('ml_parent_run_id', None) + self.continue_on_step_failure = kwargs.get('continue_on_step_failure', None) + self.type = 'AzureMLExecutePipeline' + + class AzureMLLinkedService(LinkedService): - """Azure ML Web Service linked service. + """Azure ML Studio Web Service linked service. All required parameters must be populated in order to send to Azure. @@ -4325,22 +4407,23 @@ class AzureMLLinkedService(LinkedService): :param type: Required. Constant filled by server. :type type: str :param ml_endpoint: Required. The Batch Execution REST URL for an Azure ML - Web Service endpoint. Type: string (or Expression with resultType string). + Studio Web Service endpoint. Type: string (or Expression with resultType + string). :type ml_endpoint: object :param api_key: Required. The API key for accessing the Azure ML model endpoint. :type api_key: ~azure.mgmt.datafactory.models.SecretBase :param update_resource_endpoint: The Update Resource REST URL for an Azure - ML Web Service endpoint. Type: string (or Expression with resultType - string). + ML Studio Web Service endpoint. Type: string (or Expression with + resultType string). :type update_resource_endpoint: object :param service_principal_id: The ID of the service principal used to authenticate against the ARM-based updateResourceEndpoint of an Azure ML - web service. Type: string (or Expression with resultType string). + Studio web service. Type: string (or Expression with resultType string). :type service_principal_id: object :param service_principal_key: The key of the service principal used to authenticate against the ARM-based updateResourceEndpoint of an Azure ML - web service. + Studio web service. :type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase :param tenant: The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string). @@ -4385,6 +4468,88 @@ def __init__(self, **kwargs): self.type = 'AzureML' +class AzureMLServiceLinkedService(LinkedService): + """Azure ML Service linked service. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param connect_via: The integration runtime reference. + :type connect_via: + ~azure.mgmt.datafactory.models.IntegrationRuntimeReference + :param description: Linked service description. + :type description: str + :param parameters: Parameters for linked service. + :type parameters: dict[str, + ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + linked service. + :type annotations: list[object] + :param type: Required. Constant filled by server. + :type type: str + :param subscription_id: Required. Azure ML Service workspace subscription + ID. Type: string (or Expression with resultType string). + :type subscription_id: object + :param resource_group_name: Required. Azure ML Service workspace resource + group name. Type: string (or Expression with resultType string). + :type resource_group_name: object + :param ml_workspace_name: Required. Azure ML Service workspace name. Type: + string (or Expression with resultType string). + :type ml_workspace_name: object + :param service_principal_id: The ID of the service principal used to + authenticate against the endpoint of a published Azure ML Service + pipeline. Type: string (or Expression with resultType string). + :type service_principal_id: object + :param service_principal_key: The key of the service principal used to + authenticate against the endpoint of a published Azure ML Service + pipeline. + :type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase + :param tenant: The name or ID of the tenant to which the service principal + belongs. Type: string (or Expression with resultType string). + :type tenant: object + :param encrypted_credential: The encrypted credential used for + authentication. Credentials are encrypted using the integration runtime + credential manager. Type: string (or Expression with resultType string). + :type encrypted_credential: object + """ + + _validation = { + 'type': {'required': True}, + 'subscription_id': {'required': True}, + 'resource_group_name': {'required': True}, + 'ml_workspace_name': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'connect_via': {'key': 'connectVia', 'type': 'IntegrationRuntimeReference'}, + 'description': {'key': 'description', 'type': 'str'}, + 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'subscription_id': {'key': 'typeProperties.subscriptionId', 'type': 'object'}, + 'resource_group_name': {'key': 'typeProperties.resourceGroupName', 'type': 'object'}, + 'ml_workspace_name': {'key': 'typeProperties.mlWorkspaceName', 'type': 'object'}, + 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, + 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, + 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, + 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, + } + + def __init__(self, **kwargs): + super(AzureMLServiceLinkedService, self).__init__(**kwargs) + self.subscription_id = kwargs.get('subscription_id', None) + self.resource_group_name = kwargs.get('resource_group_name', None) + self.ml_workspace_name = kwargs.get('ml_workspace_name', None) + self.service_principal_id = kwargs.get('service_principal_id', None) + self.service_principal_key = kwargs.get('service_principal_key', None) + self.tenant = kwargs.get('tenant', None) + self.encrypted_credential = kwargs.get('encrypted_credential', None) + self.type = 'AzureMLService' + + class AzureMLUpdateResourceActivity(ExecutionActivity): """Azure ML Update Resource management activity. diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py index dcec660c9494..5ccabcf0be25 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py @@ -334,9 +334,9 @@ class LinkedService(Model): MongoDbV2LinkedService, MongoDbLinkedService, CassandraLinkedService, WebLinkedService, ODataLinkedService, HdfsLinkedService, MicrosoftAccessLinkedService, InformixLinkedService, OdbcLinkedService, - AzureMLLinkedService, TeradataLinkedService, Db2LinkedService, - SybaseLinkedService, PostgreSqlLinkedService, MySqlLinkedService, - AzureMySqlLinkedService, OracleLinkedService, + AzureMLServiceLinkedService, AzureMLLinkedService, TeradataLinkedService, + Db2LinkedService, SybaseLinkedService, PostgreSqlLinkedService, + MySqlLinkedService, AzureMySqlLinkedService, OracleLinkedService, GoogleCloudStorageLinkedService, AzureFileStorageLinkedService, FileServerLinkedService, HDInsightLinkedService, CommonDataServiceForAppsLinkedService, DynamicsCrmLinkedService, @@ -380,7 +380,7 @@ class LinkedService(Model): } _subtype_map = { - 'type': {'AzureFunction': 'AzureFunctionLinkedService', 'AzureDataExplorer': 'AzureDataExplorerLinkedService', 'SapTable': 'SapTableLinkedService', 'GoogleAdWords': 'GoogleAdWordsLinkedService', 'OracleServiceCloud': 'OracleServiceCloudLinkedService', 'DynamicsAX': 'DynamicsAXLinkedService', 'Responsys': 'ResponsysLinkedService', 'AzureDatabricks': 'AzureDatabricksLinkedService', 'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', 'SalesforceMarketingCloud': 'SalesforceMarketingCloudLinkedService', 'Netezza': 'NetezzaLinkedService', 'Vertica': 'VerticaLinkedService', 'Zoho': 'ZohoLinkedService', 'Xero': 'XeroLinkedService', 'Square': 'SquareLinkedService', 'Spark': 'SparkLinkedService', 'Shopify': 'ShopifyLinkedService', 'ServiceNow': 'ServiceNowLinkedService', 'QuickBooks': 'QuickBooksLinkedService', 'Presto': 'PrestoLinkedService', 'Phoenix': 'PhoenixLinkedService', 'Paypal': 'PaypalLinkedService', 'Marketo': 'MarketoLinkedService', 'AzureMariaDB': 'AzureMariaDBLinkedService', 'MariaDB': 'MariaDBLinkedService', 'Magento': 'MagentoLinkedService', 'Jira': 'JiraLinkedService', 'Impala': 'ImpalaLinkedService', 'Hubspot': 'HubspotLinkedService', 'Hive': 'HiveLinkedService', 'HBase': 'HBaseLinkedService', 'Greenplum': 'GreenplumLinkedService', 'GoogleBigQuery': 'GoogleBigQueryLinkedService', 'Eloqua': 'EloquaLinkedService', 'Drill': 'DrillLinkedService', 'Couchbase': 'CouchbaseLinkedService', 'Concur': 'ConcurLinkedService', 'AzurePostgreSql': 'AzurePostgreSqlLinkedService', 'AmazonMWS': 'AmazonMWSLinkedService', 'SapHana': 'SapHanaLinkedService', 'SapBW': 'SapBWLinkedService', 'Sftp': 'SftpServerLinkedService', 'FtpServer': 'FtpServerLinkedService', 'HttpServer': 'HttpLinkedService', 'AzureSearch': 'AzureSearchLinkedService', 'CustomDataSource': 'CustomDataSourceLinkedService', 'AmazonRedshift': 'AmazonRedshiftLinkedService', 'AmazonS3': 'AmazonS3LinkedService', 'RestService': 'RestServiceLinkedService', 'SapOpenHub': 'SapOpenHubLinkedService', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'SalesforceServiceCloud': 'SalesforceServiceCloudLinkedService', 'Salesforce': 'SalesforceLinkedService', 'Office365': 'Office365LinkedService', 'AzureBlobFS': 'AzureBlobFSLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'CosmosDbMongoDbApi': 'CosmosDbMongoDbApiLinkedService', 'MongoDbV2': 'MongoDbV2LinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'MicrosoftAccess': 'MicrosoftAccessLinkedService', 'Informix': 'InformixLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'GoogleCloudStorage': 'GoogleCloudStorageLinkedService', 'AzureFileStorage': 'AzureFileStorageLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'CommonDataServiceForApps': 'CommonDataServiceForAppsLinkedService', 'DynamicsCrm': 'DynamicsCrmLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlMI': 'AzureSqlMILinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureTableStorage': 'AzureTableStorageLinkedService', 'AzureBlobStorage': 'AzureBlobStorageLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} + 'type': {'AzureFunction': 'AzureFunctionLinkedService', 'AzureDataExplorer': 'AzureDataExplorerLinkedService', 'SapTable': 'SapTableLinkedService', 'GoogleAdWords': 'GoogleAdWordsLinkedService', 'OracleServiceCloud': 'OracleServiceCloudLinkedService', 'DynamicsAX': 'DynamicsAXLinkedService', 'Responsys': 'ResponsysLinkedService', 'AzureDatabricks': 'AzureDatabricksLinkedService', 'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', 'SalesforceMarketingCloud': 'SalesforceMarketingCloudLinkedService', 'Netezza': 'NetezzaLinkedService', 'Vertica': 'VerticaLinkedService', 'Zoho': 'ZohoLinkedService', 'Xero': 'XeroLinkedService', 'Square': 'SquareLinkedService', 'Spark': 'SparkLinkedService', 'Shopify': 'ShopifyLinkedService', 'ServiceNow': 'ServiceNowLinkedService', 'QuickBooks': 'QuickBooksLinkedService', 'Presto': 'PrestoLinkedService', 'Phoenix': 'PhoenixLinkedService', 'Paypal': 'PaypalLinkedService', 'Marketo': 'MarketoLinkedService', 'AzureMariaDB': 'AzureMariaDBLinkedService', 'MariaDB': 'MariaDBLinkedService', 'Magento': 'MagentoLinkedService', 'Jira': 'JiraLinkedService', 'Impala': 'ImpalaLinkedService', 'Hubspot': 'HubspotLinkedService', 'Hive': 'HiveLinkedService', 'HBase': 'HBaseLinkedService', 'Greenplum': 'GreenplumLinkedService', 'GoogleBigQuery': 'GoogleBigQueryLinkedService', 'Eloqua': 'EloquaLinkedService', 'Drill': 'DrillLinkedService', 'Couchbase': 'CouchbaseLinkedService', 'Concur': 'ConcurLinkedService', 'AzurePostgreSql': 'AzurePostgreSqlLinkedService', 'AmazonMWS': 'AmazonMWSLinkedService', 'SapHana': 'SapHanaLinkedService', 'SapBW': 'SapBWLinkedService', 'Sftp': 'SftpServerLinkedService', 'FtpServer': 'FtpServerLinkedService', 'HttpServer': 'HttpLinkedService', 'AzureSearch': 'AzureSearchLinkedService', 'CustomDataSource': 'CustomDataSourceLinkedService', 'AmazonRedshift': 'AmazonRedshiftLinkedService', 'AmazonS3': 'AmazonS3LinkedService', 'RestService': 'RestServiceLinkedService', 'SapOpenHub': 'SapOpenHubLinkedService', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'SalesforceServiceCloud': 'SalesforceServiceCloudLinkedService', 'Salesforce': 'SalesforceLinkedService', 'Office365': 'Office365LinkedService', 'AzureBlobFS': 'AzureBlobFSLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'CosmosDbMongoDbApi': 'CosmosDbMongoDbApiLinkedService', 'MongoDbV2': 'MongoDbV2LinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'MicrosoftAccess': 'MicrosoftAccessLinkedService', 'Informix': 'InformixLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureMLService': 'AzureMLServiceLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'GoogleCloudStorage': 'GoogleCloudStorageLinkedService', 'AzureFileStorage': 'AzureFileStorageLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'CommonDataServiceForApps': 'CommonDataServiceForAppsLinkedService', 'DynamicsCrm': 'DynamicsCrmLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlMI': 'AzureSqlMILinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureTableStorage': 'AzureTableStorageLinkedService', 'AzureBlobStorage': 'AzureBlobStorageLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} } def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, **kwargs) -> None: @@ -2814,9 +2814,9 @@ class ExecutionActivity(Activity): sub-classes are: ExecuteDataFlowActivity, AzureFunctionActivity, DatabricksSparkPythonActivity, DatabricksSparkJarActivity, DatabricksNotebookActivity, DataLakeAnalyticsUSQLActivity, - AzureMLUpdateResourceActivity, AzureMLBatchExecutionActivity, - GetMetadataActivity, WebActivity, LookupActivity, - AzureDataExplorerCommandActivity, DeleteActivity, + AzureMLExecutePipelineActivity, AzureMLUpdateResourceActivity, + AzureMLBatchExecutionActivity, GetMetadataActivity, WebActivity, + LookupActivity, AzureDataExplorerCommandActivity, DeleteActivity, SqlServerStoredProcedureActivity, CustomActivity, ExecuteSSISPackageActivity, HDInsightSparkActivity, HDInsightStreamingActivity, HDInsightMapReduceActivity, @@ -2861,7 +2861,7 @@ class ExecutionActivity(Activity): } _subtype_map = { - 'type': {'ExecuteDataFlow': 'ExecuteDataFlowActivity', 'AzureFunctionActivity': 'AzureFunctionActivity', 'DatabricksSparkPython': 'DatabricksSparkPythonActivity', 'DatabricksSparkJar': 'DatabricksSparkJarActivity', 'DatabricksNotebook': 'DatabricksNotebookActivity', 'DataLakeAnalyticsU-SQL': 'DataLakeAnalyticsUSQLActivity', 'AzureMLUpdateResource': 'AzureMLUpdateResourceActivity', 'AzureMLBatchExecution': 'AzureMLBatchExecutionActivity', 'GetMetadata': 'GetMetadataActivity', 'WebActivity': 'WebActivity', 'Lookup': 'LookupActivity', 'AzureDataExplorerCommand': 'AzureDataExplorerCommandActivity', 'Delete': 'DeleteActivity', 'SqlServerStoredProcedure': 'SqlServerStoredProcedureActivity', 'Custom': 'CustomActivity', 'ExecuteSSISPackage': 'ExecuteSSISPackageActivity', 'HDInsightSpark': 'HDInsightSparkActivity', 'HDInsightStreaming': 'HDInsightStreamingActivity', 'HDInsightMapReduce': 'HDInsightMapReduceActivity', 'HDInsightPig': 'HDInsightPigActivity', 'HDInsightHive': 'HDInsightHiveActivity', 'Copy': 'CopyActivity'} + 'type': {'ExecuteDataFlow': 'ExecuteDataFlowActivity', 'AzureFunctionActivity': 'AzureFunctionActivity', 'DatabricksSparkPython': 'DatabricksSparkPythonActivity', 'DatabricksSparkJar': 'DatabricksSparkJarActivity', 'DatabricksNotebook': 'DatabricksNotebookActivity', 'DataLakeAnalyticsU-SQL': 'DataLakeAnalyticsUSQLActivity', 'AzureMLExecutePipeline': 'AzureMLExecutePipelineActivity', 'AzureMLUpdateResource': 'AzureMLUpdateResourceActivity', 'AzureMLBatchExecution': 'AzureMLBatchExecutionActivity', 'GetMetadata': 'GetMetadataActivity', 'WebActivity': 'WebActivity', 'Lookup': 'LookupActivity', 'AzureDataExplorerCommand': 'AzureDataExplorerCommandActivity', 'Delete': 'DeleteActivity', '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, user_properties=None, linked_service_name=None, policy=None, **kwargs) -> None: @@ -4303,8 +4303,90 @@ def __init__(self, *, name: str, additional_properties=None, description: str=No self.type = 'AzureMLBatchExecution' +class AzureMLExecutePipelineActivity(ExecutionActivity): + """Azure ML Execute Pipeline activity. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param name: Required. Activity name. + :type name: str + :param description: Activity description. + :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: list[~azure.mgmt.datafactory.models.UserProperty] + :param type: Required. Constant filled by server. + :type type: str + :param linked_service_name: Linked service reference. + :type linked_service_name: + ~azure.mgmt.datafactory.models.LinkedServiceReference + :param policy: Activity policy. + :type policy: ~azure.mgmt.datafactory.models.ActivityPolicy + :param ml_pipeline_id: Required. ID of the published Azure ML pipeline. + Type: string (or Expression with resultType string). + :type ml_pipeline_id: object + :param experiment_name: Run history experiment name of the pipeline run. + This information will be passed in the ExperimentName property of the + published pipeline execution request. Type: string (or Expression with + resultType string). + :type experiment_name: object + :param ml_pipeline_parameters: Key,Value pairs to be passed to the + published Azure ML pipeline endpoint. Keys must match the names of + pipeline parameters defined in the published pipeline. Values will be + passed in the ParameterAssignments property of the published pipeline + execution request. Type: object with key value pairs (or Expression with + resultType object). + :type ml_pipeline_parameters: object + :param ml_parent_run_id: The parent Azure ML Service pipeline run id. This + information will be passed in the ParentRunId property of the published + pipeline execution request. Type: string (or Expression with resultType + string). + :type ml_parent_run_id: object + :param continue_on_step_failure: Whether to continue execution of other + steps in the PipelineRun if a step fails. This information will be passed + in the continueOnStepFailure property of the published pipeline execution + request. Type: boolean (or Expression with resultType boolean). + :type continue_on_step_failure: object + """ + + _validation = { + 'name': {'required': True}, + 'type': {'required': True}, + 'ml_pipeline_id': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'name': {'key': 'name', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, + 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '[UserProperty]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, + 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, + 'ml_pipeline_id': {'key': 'typeProperties.mlPipelineId', 'type': 'object'}, + 'experiment_name': {'key': 'typeProperties.experimentName', 'type': 'object'}, + 'ml_pipeline_parameters': {'key': 'typeProperties.mlPipelineParameters', 'type': 'object'}, + 'ml_parent_run_id': {'key': 'typeProperties.mlParentRunId', 'type': 'object'}, + 'continue_on_step_failure': {'key': 'typeProperties.continueOnStepFailure', 'type': 'object'}, + } + + def __init__(self, *, name: str, ml_pipeline_id, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, experiment_name=None, ml_pipeline_parameters=None, ml_parent_run_id=None, continue_on_step_failure=None, **kwargs) -> None: + super(AzureMLExecutePipelineActivity, 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.ml_pipeline_id = ml_pipeline_id + self.experiment_name = experiment_name + self.ml_pipeline_parameters = ml_pipeline_parameters + self.ml_parent_run_id = ml_parent_run_id + self.continue_on_step_failure = continue_on_step_failure + self.type = 'AzureMLExecutePipeline' + + class AzureMLLinkedService(LinkedService): - """Azure ML Web Service linked service. + """Azure ML Studio Web Service linked service. All required parameters must be populated in order to send to Azure. @@ -4325,22 +4407,23 @@ class AzureMLLinkedService(LinkedService): :param type: Required. Constant filled by server. :type type: str :param ml_endpoint: Required. The Batch Execution REST URL for an Azure ML - Web Service endpoint. Type: string (or Expression with resultType string). + Studio Web Service endpoint. Type: string (or Expression with resultType + string). :type ml_endpoint: object :param api_key: Required. The API key for accessing the Azure ML model endpoint. :type api_key: ~azure.mgmt.datafactory.models.SecretBase :param update_resource_endpoint: The Update Resource REST URL for an Azure - ML Web Service endpoint. Type: string (or Expression with resultType - string). + ML Studio Web Service endpoint. Type: string (or Expression with + resultType string). :type update_resource_endpoint: object :param service_principal_id: The ID of the service principal used to authenticate against the ARM-based updateResourceEndpoint of an Azure ML - web service. Type: string (or Expression with resultType string). + Studio web service. Type: string (or Expression with resultType string). :type service_principal_id: object :param service_principal_key: The key of the service principal used to authenticate against the ARM-based updateResourceEndpoint of an Azure ML - web service. + Studio web service. :type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase :param tenant: The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string). @@ -4385,6 +4468,88 @@ def __init__(self, *, ml_endpoint, api_key, additional_properties=None, connect_ self.type = 'AzureML' +class AzureMLServiceLinkedService(LinkedService): + """Azure ML Service linked service. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param connect_via: The integration runtime reference. + :type connect_via: + ~azure.mgmt.datafactory.models.IntegrationRuntimeReference + :param description: Linked service description. + :type description: str + :param parameters: Parameters for linked service. + :type parameters: dict[str, + ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + linked service. + :type annotations: list[object] + :param type: Required. Constant filled by server. + :type type: str + :param subscription_id: Required. Azure ML Service workspace subscription + ID. Type: string (or Expression with resultType string). + :type subscription_id: object + :param resource_group_name: Required. Azure ML Service workspace resource + group name. Type: string (or Expression with resultType string). + :type resource_group_name: object + :param ml_workspace_name: Required. Azure ML Service workspace name. Type: + string (or Expression with resultType string). + :type ml_workspace_name: object + :param service_principal_id: The ID of the service principal used to + authenticate against the endpoint of a published Azure ML Service + pipeline. Type: string (or Expression with resultType string). + :type service_principal_id: object + :param service_principal_key: The key of the service principal used to + authenticate against the endpoint of a published Azure ML Service + pipeline. + :type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase + :param tenant: The name or ID of the tenant to which the service principal + belongs. Type: string (or Expression with resultType string). + :type tenant: object + :param encrypted_credential: The encrypted credential used for + authentication. Credentials are encrypted using the integration runtime + credential manager. Type: string (or Expression with resultType string). + :type encrypted_credential: object + """ + + _validation = { + 'type': {'required': True}, + 'subscription_id': {'required': True}, + 'resource_group_name': {'required': True}, + 'ml_workspace_name': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'connect_via': {'key': 'connectVia', 'type': 'IntegrationRuntimeReference'}, + 'description': {'key': 'description', 'type': 'str'}, + 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'subscription_id': {'key': 'typeProperties.subscriptionId', 'type': 'object'}, + 'resource_group_name': {'key': 'typeProperties.resourceGroupName', 'type': 'object'}, + 'ml_workspace_name': {'key': 'typeProperties.mlWorkspaceName', 'type': 'object'}, + 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, + 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, + 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, + 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, + } + + def __init__(self, *, subscription_id, resource_group_name, ml_workspace_name, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential=None, **kwargs) -> None: + super(AzureMLServiceLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) + self.subscription_id = subscription_id + self.resource_group_name = resource_group_name + self.ml_workspace_name = ml_workspace_name + self.service_principal_id = service_principal_id + self.service_principal_key = service_principal_key + self.tenant = tenant + self.encrypted_credential = encrypted_credential + self.type = 'AzureMLService' + + class AzureMLUpdateResourceActivity(ExecutionActivity): """Azure ML Update Resource management activity. From 6bdcc3945f3921a12a28b3bb73b3e01e85f7a43f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot Date: Wed, 9 Oct 2019 23:07:44 +0000 Subject: [PATCH 2/2] Generated from 0dd3e19d7826706a7eb3249eafbddc18be2f2cf8 Add AzureMLExecutePipeline activity and AzureMLService linked service --- .../azure/mgmt/datafactory/models/__init__.py | 6 ++ .../azure/mgmt/datafactory/models/_models.py | 87 ++++++++++++++++++- .../mgmt/datafactory/models/_models_py3.py | 87 ++++++++++++++++++- 3 files changed, 176 insertions(+), 4 deletions(-) diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py index ab74ddc7c0fe..b0bcc09dfede 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py @@ -526,6 +526,8 @@ from ._models_py3 import StoreWriteSettings from ._models_py3 import SubResource from ._models_py3 import SubResourceDebugResource + from ._models_py3 import SwitchActivity + from ._models_py3 import SwitchCase from ._models_py3 import SybaseLinkedService from ._models_py3 import SybaseSource from ._models_py3 import SybaseTableDataset @@ -1090,6 +1092,8 @@ from ._models import StoreWriteSettings from ._models import SubResource from ._models import SubResourceDebugResource + from ._models import SwitchActivity + from ._models import SwitchCase from ._models import SybaseLinkedService from ._models import SybaseSource from ._models import SybaseTableDataset @@ -1741,6 +1745,8 @@ 'StoreWriteSettings', 'SubResource', 'SubResourceDebugResource', + 'SwitchActivity', + 'SwitchCase', 'SybaseLinkedService', 'SybaseSource', 'SybaseTableDataset', diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py index 5f92f907d5c1..4875ad2aaafe 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py @@ -1370,7 +1370,8 @@ class ControlActivity(Activity): You probably want to use the sub-classes and not this class directly. Known sub-classes are: WebHookActivity, AppendVariableActivity, SetVariableActivity, FilterActivity, ValidationActivity, UntilActivity, - WaitActivity, ForEachActivity, IfConditionActivity, ExecutePipelineActivity + WaitActivity, ForEachActivity, SwitchActivity, IfConditionActivity, + ExecutePipelineActivity All required parameters must be populated in order to send to Azure. @@ -1404,7 +1405,7 @@ class ControlActivity(Activity): } _subtype_map = { - 'type': {'WebHook': 'WebHookActivity', 'AppendVariable': 'AppendVariableActivity', 'SetVariable': 'SetVariableActivity', 'Filter': 'FilterActivity', 'Validation': 'ValidationActivity', 'Until': 'UntilActivity', 'Wait': 'WaitActivity', 'ForEach': 'ForEachActivity', 'IfCondition': 'IfConditionActivity', 'ExecutePipeline': 'ExecutePipelineActivity'} + 'type': {'WebHook': 'WebHookActivity', 'AppendVariable': 'AppendVariableActivity', 'SetVariable': 'SetVariableActivity', 'Filter': 'FilterActivity', 'Validation': 'ValidationActivity', 'Until': 'UntilActivity', 'Wait': 'WaitActivity', 'ForEach': 'ForEachActivity', 'Switch': 'SwitchActivity', 'IfCondition': 'IfConditionActivity', 'ExecutePipeline': 'ExecutePipelineActivity'} } def __init__(self, **kwargs): @@ -29056,6 +29057,88 @@ def __init__(self, **kwargs): self.type = kwargs.get('type', None) +class SwitchActivity(ControlActivity): + """This activity evaluates an expression and executes activities under the + cases property that correspond to the expression evaluation expected in the + equals property. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param name: Required. Activity name. + :type name: str + :param description: Activity description. + :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: list[~azure.mgmt.datafactory.models.UserProperty] + :param type: Required. Constant filled by server. + :type type: str + :param on: Required. An expression that would evaluate to a string or + integer. This is used to determine the block of activities in cases that + will be executed. + :type on: ~azure.mgmt.datafactory.models.Expression + :param cases: List of cases that correspond to expected values of the 'on' + property. This is an optional property and if not provided, the activity + will execute activities provided in defaultActivities. + :type cases: list[~azure.mgmt.datafactory.models.SwitchCase] + :param default_activities: List of activities to execute if no case + condition is satisfied. This is an optional property and if not provided, + the activity will exit without any action. + :type default_activities: list[~azure.mgmt.datafactory.models.Activity] + """ + + _validation = { + 'name': {'required': True}, + 'type': {'required': True}, + 'on': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'name': {'key': 'name', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, + 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '[UserProperty]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'on': {'key': 'typeProperties.on', 'type': 'Expression'}, + 'cases': {'key': 'typeProperties.cases', 'type': '[SwitchCase]'}, + 'default_activities': {'key': 'typeProperties.defaultActivities', 'type': '[Activity]'}, + } + + def __init__(self, **kwargs): + super(SwitchActivity, self).__init__(**kwargs) + self.on = kwargs.get('on', None) + self.cases = kwargs.get('cases', None) + self.default_activities = kwargs.get('default_activities', None) + self.type = 'Switch' + + +class SwitchCase(Model): + """Switch cases with have a value and corresponding activities. + + :param value: Expected value that satisfies the expression result of the + 'on' property. + :type value: str + :param activities: List of activities to execute for satisfied case + condition. + :type activities: list[~azure.mgmt.datafactory.models.Activity] + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': 'str'}, + 'activities': {'key': 'activities', 'type': '[Activity]'}, + } + + def __init__(self, **kwargs): + super(SwitchCase, self).__init__(**kwargs) + self.value = kwargs.get('value', None) + self.activities = kwargs.get('activities', None) + + class SybaseLinkedService(LinkedService): """Linked service for Sybase data source. diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py index 5ccabcf0be25..69f21ca0bab6 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py @@ -1370,7 +1370,8 @@ class ControlActivity(Activity): You probably want to use the sub-classes and not this class directly. Known sub-classes are: WebHookActivity, AppendVariableActivity, SetVariableActivity, FilterActivity, ValidationActivity, UntilActivity, - WaitActivity, ForEachActivity, IfConditionActivity, ExecutePipelineActivity + WaitActivity, ForEachActivity, SwitchActivity, IfConditionActivity, + ExecutePipelineActivity All required parameters must be populated in order to send to Azure. @@ -1404,7 +1405,7 @@ class ControlActivity(Activity): } _subtype_map = { - 'type': {'WebHook': 'WebHookActivity', 'AppendVariable': 'AppendVariableActivity', 'SetVariable': 'SetVariableActivity', 'Filter': 'FilterActivity', 'Validation': 'ValidationActivity', 'Until': 'UntilActivity', 'Wait': 'WaitActivity', 'ForEach': 'ForEachActivity', 'IfCondition': 'IfConditionActivity', 'ExecutePipeline': 'ExecutePipelineActivity'} + 'type': {'WebHook': 'WebHookActivity', 'AppendVariable': 'AppendVariableActivity', 'SetVariable': 'SetVariableActivity', 'Filter': 'FilterActivity', 'Validation': 'ValidationActivity', 'Until': 'UntilActivity', 'Wait': 'WaitActivity', 'ForEach': 'ForEachActivity', 'Switch': 'SwitchActivity', 'IfCondition': 'IfConditionActivity', 'ExecutePipeline': 'ExecutePipelineActivity'} } def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, user_properties=None, **kwargs) -> None: @@ -29056,6 +29057,88 @@ def __init__(self, *, value=None, type=None, **kwargs) -> None: self.type = type +class SwitchActivity(ControlActivity): + """This activity evaluates an expression and executes activities under the + cases property that correspond to the expression evaluation expected in the + equals property. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param name: Required. Activity name. + :type name: str + :param description: Activity description. + :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: list[~azure.mgmt.datafactory.models.UserProperty] + :param type: Required. Constant filled by server. + :type type: str + :param on: Required. An expression that would evaluate to a string or + integer. This is used to determine the block of activities in cases that + will be executed. + :type on: ~azure.mgmt.datafactory.models.Expression + :param cases: List of cases that correspond to expected values of the 'on' + property. This is an optional property and if not provided, the activity + will execute activities provided in defaultActivities. + :type cases: list[~azure.mgmt.datafactory.models.SwitchCase] + :param default_activities: List of activities to execute if no case + condition is satisfied. This is an optional property and if not provided, + the activity will exit without any action. + :type default_activities: list[~azure.mgmt.datafactory.models.Activity] + """ + + _validation = { + 'name': {'required': True}, + 'type': {'required': True}, + 'on': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'name': {'key': 'name', 'type': 'str'}, + 'description': {'key': 'description', 'type': 'str'}, + 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, + 'user_properties': {'key': 'userProperties', 'type': '[UserProperty]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'on': {'key': 'typeProperties.on', 'type': 'Expression'}, + 'cases': {'key': 'typeProperties.cases', 'type': '[SwitchCase]'}, + 'default_activities': {'key': 'typeProperties.defaultActivities', 'type': '[Activity]'}, + } + + def __init__(self, *, name: str, on, additional_properties=None, description: str=None, depends_on=None, user_properties=None, cases=None, default_activities=None, **kwargs) -> None: + super(SwitchActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, **kwargs) + self.on = on + self.cases = cases + self.default_activities = default_activities + self.type = 'Switch' + + +class SwitchCase(Model): + """Switch cases with have a value and corresponding activities. + + :param value: Expected value that satisfies the expression result of the + 'on' property. + :type value: str + :param activities: List of activities to execute for satisfied case + condition. + :type activities: list[~azure.mgmt.datafactory.models.Activity] + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': 'str'}, + 'activities': {'key': 'activities', 'type': '[Activity]'}, + } + + def __init__(self, *, value: str=None, activities=None, **kwargs) -> None: + super(SwitchCase, self).__init__(**kwargs) + self.value = value + self.activities = activities + + class SybaseLinkedService(LinkedService): """Linked service for Sybase data source.