diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py index 5dc9afab940c..e505c7cae283 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py @@ -26,9 +26,9 @@ from .integration_runtime_status_list_response import IntegrationRuntimeStatusListResponse from .update_integration_runtime_request import UpdateIntegrationRuntimeRequest from .update_integration_runtime_node_request import UpdateIntegrationRuntimeNodeRequest +from .parameter_specification import ParameterSpecification from .linked_service import LinkedService from .linked_service_resource import LinkedServiceResource -from .parameter_specification import ParameterSpecification from .dataset import Dataset from .dataset_resource import DatasetResource from .activity_dependency import ActivityDependency @@ -57,8 +57,10 @@ from .operation_service_specification import OperationServiceSpecification from .operation import Operation from .operation_list_response import OperationListResponse +from .azure_databricks_linked_service import AzureDatabricksLinkedService from .azure_data_lake_analytics_linked_service import AzureDataLakeAnalyticsLinkedService from .hd_insight_on_demand_linked_service import HDInsightOnDemandLinkedService +from .salesforce_marketing_cloud_linked_service import SalesforceMarketingCloudLinkedService from .netezza_linked_service import NetezzaLinkedService from .vertica_linked_service import VerticaLinkedService from .zoho_linked_service import ZohoLinkedService @@ -128,6 +130,7 @@ from .sql_server_linked_service import SqlServerLinkedService from .azure_sql_dw_linked_service import AzureSqlDWLinkedService from .azure_storage_linked_service import AzureStorageLinkedService +from .salesforce_marketing_cloud_object_dataset import SalesforceMarketingCloudObjectDataset from .vertica_table_dataset import VerticaTableDataset from .netezza_table_dataset import NetezzaTableDataset from .zoho_object_dataset import ZohoObjectDataset @@ -199,6 +202,7 @@ from .schedule_trigger import ScheduleTrigger from .multiple_pipeline_trigger import MultiplePipelineTrigger from .activity_policy import ActivityPolicy +from .databricks_notebook_activity import DatabricksNotebookActivity from .data_lake_analytics_usql_activity import DataLakeAnalyticsUSQLActivity from .azure_ml_update_resource_activity import AzureMLUpdateResourceActivity from .azure_ml_web_service_file import AzureMLWebServiceFile @@ -208,6 +212,7 @@ from .web_activity import WebActivity from .redshift_unload_settings import RedshiftUnloadSettings from .amazon_redshift_source import AmazonRedshiftSource +from .salesforce_marketing_cloud_source import SalesforceMarketingCloudSource from .vertica_source import VerticaSource from .netezza_source import NetezzaSource from .zoho_source import ZohoSource @@ -291,6 +296,7 @@ from .copy_sink import CopySink from .copy_activity import CopyActivity from .execution_activity import ExecutionActivity +from .filter_activity import FilterActivity from .until_activity import UntilActivity from .wait_activity import WaitActivity from .for_each_activity import ForEachActivity @@ -407,9 +413,9 @@ 'IntegrationRuntimeStatusListResponse', 'UpdateIntegrationRuntimeRequest', 'UpdateIntegrationRuntimeNodeRequest', + 'ParameterSpecification', 'LinkedService', 'LinkedServiceResource', - 'ParameterSpecification', 'Dataset', 'DatasetResource', 'ActivityDependency', @@ -438,8 +444,10 @@ 'OperationServiceSpecification', 'Operation', 'OperationListResponse', + 'AzureDatabricksLinkedService', 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemandLinkedService', + 'SalesforceMarketingCloudLinkedService', 'NetezzaLinkedService', 'VerticaLinkedService', 'ZohoLinkedService', @@ -509,6 +517,7 @@ 'SqlServerLinkedService', 'AzureSqlDWLinkedService', 'AzureStorageLinkedService', + 'SalesforceMarketingCloudObjectDataset', 'VerticaTableDataset', 'NetezzaTableDataset', 'ZohoObjectDataset', @@ -580,6 +589,7 @@ 'ScheduleTrigger', 'MultiplePipelineTrigger', 'ActivityPolicy', + 'DatabricksNotebookActivity', 'DataLakeAnalyticsUSQLActivity', 'AzureMLUpdateResourceActivity', 'AzureMLWebServiceFile', @@ -589,6 +599,7 @@ 'WebActivity', 'RedshiftUnloadSettings', 'AmazonRedshiftSource', + 'SalesforceMarketingCloudSource', 'VerticaSource', 'NetezzaSource', 'ZohoSource', @@ -672,6 +683,7 @@ 'CopySink', 'CopyActivity', 'ExecutionActivity', + 'FilterActivity', 'UntilActivity', 'WaitActivity', 'ForEachActivity', diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy.py index 01d2218bce3b..c5fd3c861df1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy.py @@ -28,6 +28,9 @@ class ActivityPolicy(Model): :param retry_interval_in_seconds: Interval between each retry attempt (in seconds). The default is 30 sec. :type retry_interval_in_seconds: int + :param secure_output: When set to true, Output from activity is considered + as secure and will not be logged to monitoring. + :type secure_output: bool """ _validation = { @@ -39,11 +42,13 @@ class ActivityPolicy(Model): 'timeout': {'key': 'timeout', 'type': 'object'}, 'retry': {'key': 'retry', 'type': 'object'}, 'retry_interval_in_seconds': {'key': 'retryIntervalInSeconds', 'type': 'int'}, + 'secure_output': {'key': 'secureOutput', 'type': 'bool'}, } - def __init__(self, additional_properties=None, timeout=None, retry=None, retry_interval_in_seconds=None): + def __init__(self, additional_properties=None, timeout=None, retry=None, retry_interval_in_seconds=None, secure_output=None): super(ActivityPolicy, self).__init__() self.additional_properties = additional_properties self.timeout = timeout self.retry = retry self.retry_interval_in_seconds = retry_interval_in_seconds + self.secure_output = secure_output diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_linked_service.py index 68edc349b376..30427d0ebbc8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_linked_service.py @@ -23,6 +23,12 @@ class AmazonMWSLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param endpoint: The endpoint of the Amazon MWS server, (i.e. @@ -68,6 +74,8 @@ class AmazonMWSLinkedService(LinkedService): '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'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'marketplace_id': {'key': 'typeProperties.marketplaceID', 'type': 'object'}, @@ -81,8 +89,8 @@ class AmazonMWSLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, endpoint, marketplace_id, seller_id, access_key_id, additional_properties=None, connect_via=None, description=None, mws_auth_token=None, secret_key=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(AmazonMWSLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, endpoint, marketplace_id, seller_id, access_key_id, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, mws_auth_token=None, secret_key=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(AmazonMWSLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.endpoint = endpoint self.marketplace_id = marketplace_id self.seller_id = seller_id diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_object_dataset.py index 684ac304dc06..357fa0a5fdf5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_object_dataset.py @@ -29,6 +29,9 @@ class AmazonMWSObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class AmazonMWSObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(AmazonMWSObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(AmazonMWSObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'AmazonMWSObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service.py index 3864f7757892..8040c2f3f095 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service.py @@ -23,6 +23,12 @@ class AmazonRedshiftLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param server: The name of the Amazon Redshift server. Type: string (or @@ -56,6 +62,8 @@ class AmazonRedshiftLinkedService(LinkedService): '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'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, @@ -65,8 +73,8 @@ class AmazonRedshiftLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, username=None, password=None, port=None, encrypted_credential=None): - super(AmazonRedshiftLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, username=None, password=None, port=None, encrypted_credential=None): + super(AmazonRedshiftLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.server = server self.username = username self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset.py index 6565b008a405..97c33747b546 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset.py @@ -29,6 +29,9 @@ class AmazonS3Dataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param bucket_name: The name of the Amazon S3 bucket. Type: string (or @@ -62,6 +65,7 @@ class AmazonS3Dataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'bucket_name': {'key': 'typeProperties.bucketName', 'type': 'object'}, 'key': {'key': 'typeProperties.key', 'type': 'object'}, @@ -71,8 +75,8 @@ class AmazonS3Dataset(Dataset): 'compression': {'key': 'typeProperties.compression', 'type': 'DatasetCompression'}, } - def __init__(self, linked_service_name, bucket_name, additional_properties=None, description=None, structure=None, parameters=None, key=None, prefix=None, version=None, format=None, compression=None): - super(AmazonS3Dataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, bucket_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, key=None, prefix=None, version=None, format=None, compression=None): + super(AmazonS3Dataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.bucket_name = bucket_name self.key = key self.prefix = prefix diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_linked_service.py index 959d7f0aba5f..a3636590ab9b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_linked_service.py @@ -23,6 +23,12 @@ class AmazonS3LinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param access_key_id: The access key identifier of the Amazon S3 Identity @@ -46,14 +52,16 @@ class AmazonS3LinkedService(LinkedService): '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'}, 'access_key_id': {'key': 'typeProperties.accessKeyId', 'type': 'object'}, 'secret_access_key': {'key': 'typeProperties.secretAccessKey', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, access_key_id=None, secret_access_key=None, encrypted_credential=None): - super(AmazonS3LinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, access_key_id=None, secret_access_key=None, encrypted_credential=None): + super(AmazonS3LinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.access_key_id = access_key_id self.secret_access_key = secret_access_key self.encrypted_credential = encrypted_credential diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_batch_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_batch_linked_service.py index 6b802862a960..e50696a857b2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_batch_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_batch_linked_service.py @@ -23,6 +23,12 @@ class AzureBatchLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param account_name: The Azure Batch account name. Type: string (or @@ -57,6 +63,8 @@ class AzureBatchLinkedService(LinkedService): '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'}, 'account_name': {'key': 'typeProperties.accountName', 'type': 'object'}, 'access_key': {'key': 'typeProperties.accessKey', 'type': 'SecretBase'}, @@ -66,8 +74,8 @@ class AzureBatchLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, account_name, batch_uri, pool_name, linked_service_name, additional_properties=None, connect_via=None, description=None, access_key=None, encrypted_credential=None): - super(AzureBatchLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, account_name, batch_uri, pool_name, linked_service_name, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, access_key=None, encrypted_credential=None): + super(AzureBatchLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.account_name = account_name self.access_key = access_key self.batch_uri = batch_uri diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_blob_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_blob_dataset.py index 07665cb13abf..99a2e5f0c7bc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_blob_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_blob_dataset.py @@ -29,6 +29,9 @@ class AzureBlobDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param folder_path: The path of the Azure Blob storage. Type: string (or @@ -57,6 +60,7 @@ class AzureBlobDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'folder_path': {'key': 'typeProperties.folderPath', 'type': 'object'}, 'table_root_location': {'key': 'typeProperties.tableRootLocation', 'type': 'object'}, @@ -65,8 +69,8 @@ class AzureBlobDataset(Dataset): 'compression': {'key': 'typeProperties.compression', 'type': 'DatasetCompression'}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, folder_path=None, table_root_location=None, file_name=None, format=None, compression=None): - super(AzureBlobDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, folder_path=None, table_root_location=None, file_name=None, format=None, compression=None): + super(AzureBlobDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.folder_path = folder_path self.table_root_location = table_root_location self.file_name = file_name diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_analytics_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_analytics_linked_service.py index da1a8cb676ca..a25d07a2923a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_analytics_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_analytics_linked_service.py @@ -23,6 +23,12 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param account_name: The Azure Data Lake Analytics account name. Type: @@ -65,6 +71,8 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService): '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'}, 'account_name': {'key': 'typeProperties.accountName', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, @@ -76,8 +84,8 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, account_name, tenant, additional_properties=None, connect_via=None, description=None, service_principal_id=None, service_principal_key=None, subscription_id=None, resource_group_name=None, data_lake_analytics_uri=None, encrypted_credential=None): - super(AzureDataLakeAnalyticsLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, account_name, tenant, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, service_principal_id=None, service_principal_key=None, subscription_id=None, resource_group_name=None, data_lake_analytics_uri=None, encrypted_credential=None): + super(AzureDataLakeAnalyticsLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.account_name = account_name self.service_principal_id = service_principal_id self.service_principal_key = service_principal_key diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_dataset.py index 00632909c618..0df9746c81b9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_dataset.py @@ -29,6 +29,9 @@ class AzureDataLakeStoreDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param folder_path: Path to the folder in the Azure Data Lake Store. Type: @@ -56,6 +59,7 @@ class AzureDataLakeStoreDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'folder_path': {'key': 'typeProperties.folderPath', 'type': 'object'}, 'file_name': {'key': 'typeProperties.fileName', 'type': 'object'}, @@ -63,8 +67,8 @@ class AzureDataLakeStoreDataset(Dataset): 'compression': {'key': 'typeProperties.compression', 'type': 'DatasetCompression'}, } - def __init__(self, linked_service_name, folder_path, additional_properties=None, description=None, structure=None, parameters=None, file_name=None, format=None, compression=None): - super(AzureDataLakeStoreDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, folder_path, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, file_name=None, format=None, compression=None): + super(AzureDataLakeStoreDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.folder_path = folder_path self.file_name = file_name self.format = format diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_linked_service.py index bb31997ef7b4..d8d0d1c19765 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_linked_service.py @@ -23,6 +23,12 @@ class AzureDataLakeStoreLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param data_lake_store_uri: Data Lake Store service URI. Type: string (or @@ -64,6 +70,8 @@ class AzureDataLakeStoreLinkedService(LinkedService): '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'}, 'data_lake_store_uri': {'key': 'typeProperties.dataLakeStoreUri', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, @@ -75,8 +83,8 @@ class AzureDataLakeStoreLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, data_lake_store_uri, additional_properties=None, connect_via=None, description=None, service_principal_id=None, service_principal_key=None, tenant=None, account_name=None, subscription_id=None, resource_group_name=None, encrypted_credential=None): - super(AzureDataLakeStoreLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, data_lake_store_uri, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, service_principal_id=None, service_principal_key=None, tenant=None, account_name=None, subscription_id=None, resource_group_name=None, encrypted_credential=None): + super(AzureDataLakeStoreLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.data_lake_store_uri = data_lake_store_uri self.service_principal_id = service_principal_id self.service_principal_key = service_principal_key diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_databricks_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_databricks_linked_service.py new file mode 100644 index 000000000000..f5a4e5850739 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_databricks_linked_service.py @@ -0,0 +1,99 @@ +# 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_service import LinkedService + + +class AzureDatabricksLinkedService(LinkedService): + """Azure Databricks linked service. + + :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 + Dataset. + :type annotations: list[object] + :param type: Constant filled by server. + :type type: str + :param domain: .azuredatabricks.net, domain name of your + Databricks deployment. Type: string (or Expression with resultType + string). + :type domain: object + :param access_token: Access token for databricks REST API. Refer to + https://docs.azuredatabricks.net/api/latest/authentication.html. Type: + string (or Expression with resultType string). + :type access_token: ~azure.mgmt.datafactory.models.SecretBase + :param existing_cluster_id: The id of an existing cluster that will be + used for all runs of this job. Type: string (or Expression with resultType + string). + :type existing_cluster_id: object + :param new_cluster_version: The Spark version of new cluster. Type: string + (or Expression with resultType string). + :type new_cluster_version: object + :param new_cluster_num_of_worker: Number of worker nodes that new cluster + should have. A string formatted Int32, like '1' means numOfWorker is 1 or + '1:10' means auto-scale from 1 as min and 10 as max. Type: string (or + Expression with resultType string). + :type new_cluster_num_of_worker: object + :param new_cluster_node_type: The node types of new cluster. Type: string + (or Expression with resultType string). + :type new_cluster_node_type: object + :param new_cluster_spark_conf: a set of optional, user-specified Spark + configuration key-value pairs. + :type new_cluster_spark_conf: dict[str, 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}, + 'domain': {'required': True}, + 'access_token': {'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'}, + 'domain': {'key': 'typeProperties.domain', 'type': 'object'}, + 'access_token': {'key': 'typeProperties.accessToken', 'type': 'SecretBase'}, + 'existing_cluster_id': {'key': 'typeProperties.existingClusterId', 'type': 'object'}, + 'new_cluster_version': {'key': 'typeProperties.newClusterVersion', 'type': 'object'}, + 'new_cluster_num_of_worker': {'key': 'typeProperties.newClusterNumOfWorker', 'type': 'object'}, + 'new_cluster_node_type': {'key': 'typeProperties.newClusterNodeType', 'type': 'object'}, + 'new_cluster_spark_conf': {'key': 'typeProperties.newClusterSparkConf', 'type': '{object}'}, + 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, + } + + def __init__(self, domain, access_token, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, existing_cluster_id=None, new_cluster_version=None, new_cluster_num_of_worker=None, new_cluster_node_type=None, new_cluster_spark_conf=None, encrypted_credential=None): + super(AzureDatabricksLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) + self.domain = domain + self.access_token = access_token + self.existing_cluster_id = existing_cluster_id + self.new_cluster_version = new_cluster_version + self.new_cluster_num_of_worker = new_cluster_num_of_worker + self.new_cluster_node_type = new_cluster_node_type + self.new_cluster_spark_conf = new_cluster_spark_conf + self.encrypted_credential = encrypted_credential + self.type = 'AzureDatabricks' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_linked_service.py index 30a9f73b984f..c387356020fe 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_linked_service.py @@ -23,6 +23,12 @@ class AzureKeyVaultLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param base_url: The base URL of the Azure Key Vault. e.g. @@ -40,11 +46,13 @@ class AzureKeyVaultLinkedService(LinkedService): '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'}, 'base_url': {'key': 'typeProperties.baseUrl', 'type': 'object'}, } - def __init__(self, base_url, additional_properties=None, connect_via=None, description=None): - super(AzureKeyVaultLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, base_url, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None): + super(AzureKeyVaultLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.base_url = base_url self.type = 'AzureKeyVault' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_linked_service.py index 39d8d0fe1235..ee0fea573933 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_linked_service.py @@ -23,6 +23,12 @@ class AzureMLLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param ml_endpoint: The Batch Execution REST URL for an Azure ML Web @@ -61,6 +67,8 @@ class AzureMLLinkedService(LinkedService): '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'}, 'ml_endpoint': {'key': 'typeProperties.mlEndpoint', 'type': 'object'}, 'api_key': {'key': 'typeProperties.apiKey', 'type': 'SecretBase'}, @@ -71,8 +79,8 @@ class AzureMLLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, ml_endpoint, api_key, additional_properties=None, connect_via=None, description=None, update_resource_endpoint=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential=None): - super(AzureMLLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, ml_endpoint, api_key, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, update_resource_endpoint=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential=None): + super(AzureMLLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.ml_endpoint = ml_endpoint self.api_key = api_key self.update_resource_endpoint = update_resource_endpoint diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py index 5a416cc544ab..a74ae09ea0f4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py @@ -23,6 +23,12 @@ class AzureMySqlLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: The connection string. @@ -42,13 +48,15 @@ class AzureMySqlLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, encrypted_credential=None): - super(AzureMySqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, encrypted_credential=None): + super(AzureMySqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'AzureMySql' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_table_dataset.py index 69a238dc3fd6..9e5cd9b74643 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_table_dataset.py @@ -29,6 +29,9 @@ class AzureMySqlTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param table_name: The Azure MySQL database table name. Type: string (or @@ -47,11 +50,12 @@ class AzureMySqlTableDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'table_name': {'key': 'typeProperties.tableName', 'type': 'object'}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, table_name=None): - super(AzureMySqlTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, table_name=None): + super(AzureMySqlTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.table_name = table_name self.type = 'AzureMySqlTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py index 40652eddbc14..971de84ac9c2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py @@ -23,6 +23,12 @@ class AzurePostgreSqlLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: An ODBC connection string. @@ -41,13 +47,15 @@ class AzurePostgreSqlLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, connection_string=None, encrypted_credential=None): - super(AzurePostgreSqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, connection_string=None, encrypted_credential=None): + super(AzurePostgreSqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'AzurePostgreSql' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_table_dataset.py index 9adcfd21c893..17ec62fce24b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_table_dataset.py @@ -29,6 +29,9 @@ class AzurePostgreSqlTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class AzurePostgreSqlTableDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(AzurePostgreSqlTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(AzurePostgreSqlTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'AzurePostgreSqlTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_dataset.py index 2058678b113a..abc71cc5163d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_dataset.py @@ -29,6 +29,9 @@ class AzureSearchIndexDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param index_name: The name of the Azure Search Index. Type: string (or @@ -48,11 +51,12 @@ class AzureSearchIndexDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'index_name': {'key': 'typeProperties.indexName', 'type': 'object'}, } - def __init__(self, linked_service_name, index_name, additional_properties=None, description=None, structure=None, parameters=None): - super(AzureSearchIndexDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, index_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(AzureSearchIndexDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.index_name = index_name self.type = 'AzureSearchIndex' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_linked_service.py index 9c925fd264e4..4ed7fc9e1962 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_linked_service.py @@ -23,6 +23,12 @@ class AzureSearchLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param url: URL for Azure Search service. Type: string (or Expression with @@ -45,14 +51,16 @@ class AzureSearchLinkedService(LinkedService): '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'}, 'url': {'key': 'typeProperties.url', 'type': 'object'}, 'key': {'key': 'typeProperties.key', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, url, additional_properties=None, connect_via=None, description=None, key=None, encrypted_credential=None): - super(AzureSearchLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, url, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, key=None, encrypted_credential=None): + super(AzureSearchLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.url = url self.key = key self.encrypted_credential = encrypted_credential diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py index 9bf552fa9c18..6c2d2f45c718 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py @@ -23,6 +23,12 @@ class AzureSqlDatabaseLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: The connection string. @@ -52,6 +58,8 @@ class AzureSqlDatabaseLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, @@ -60,8 +68,8 @@ class AzureSqlDatabaseLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential=None): - super(AzureSqlDatabaseLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential=None): + super(AzureSqlDatabaseLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.service_principal_id = service_principal_id self.service_principal_key = service_principal_key diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py index af6e9cd9d17f..41273d3090d7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py @@ -23,6 +23,12 @@ class AzureSqlDWLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: The connection string. @@ -52,6 +58,8 @@ class AzureSqlDWLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, @@ -60,8 +68,8 @@ class AzureSqlDWLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential=None): - super(AzureSqlDWLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential=None): + super(AzureSqlDWLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.service_principal_id = service_principal_id self.service_principal_key = service_principal_key diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_table_dataset.py index 957360d2ffd9..bfc814b0fd3f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_table_dataset.py @@ -29,6 +29,9 @@ class AzureSqlDWTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param table_name: The table name of the Azure SQL Data Warehouse. Type: @@ -48,11 +51,12 @@ class AzureSqlDWTableDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'table_name': {'key': 'typeProperties.tableName', 'type': 'object'}, } - def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None): - super(AzureSqlDWTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(AzureSqlDWTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.table_name = table_name self.type = 'AzureSqlDWTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_table_dataset.py index 22e3684089eb..c375715078f3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_table_dataset.py @@ -29,6 +29,9 @@ class AzureSqlTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param table_name: The table name of the Azure SQL database. Type: string @@ -48,11 +51,12 @@ class AzureSqlTableDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'table_name': {'key': 'typeProperties.tableName', 'type': 'object'}, } - def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None): - super(AzureSqlTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(AzureSqlTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.table_name = table_name self.type = 'AzureSqlTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py index 23e60bd03ffe..f8d4005c9abb 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py @@ -23,6 +23,12 @@ class AzureStorageLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: The connection string. It is mutually exclusive @@ -45,14 +51,16 @@ class AzureStorageLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'sas_uri': {'key': 'typeProperties.sasUri', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, connection_string=None, sas_uri=None, encrypted_credential=None): - super(AzureStorageLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, connection_string=None, sas_uri=None, encrypted_credential=None): + super(AzureStorageLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.sas_uri = sas_uri self.encrypted_credential = encrypted_credential diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_dataset.py index fa8bbc443305..94a4e34d6f52 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_dataset.py @@ -29,6 +29,9 @@ class AzureTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param table_name: The table name of the Azure Table storage. Type: string @@ -48,11 +51,12 @@ class AzureTableDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'table_name': {'key': 'typeProperties.tableName', 'type': 'object'}, } - def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None): - super(AzureTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(AzureTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.table_name = table_name self.type = 'AzureTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_linked_service.py index 91eb663db2e0..33f8489b168d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_linked_service.py @@ -23,6 +23,12 @@ class CassandraLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: Host name for connection. Type: string (or Expression with @@ -54,6 +60,8 @@ class CassandraLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'object'}, @@ -63,8 +71,8 @@ class CassandraLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, additional_properties=None, connect_via=None, description=None, authentication_type=None, port=None, username=None, password=None, encrypted_credential=None): - super(CassandraLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, authentication_type=None, port=None, username=None, password=None, encrypted_credential=None): + super(CassandraLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.authentication_type = authentication_type self.port = port diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_table_dataset.py index 425fe8cad6bf..816ca6112fc9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_table_dataset.py @@ -29,6 +29,9 @@ class CassandraTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param table_name: The table name of the Cassandra database. Type: string @@ -50,13 +53,14 @@ class CassandraTableDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'table_name': {'key': 'typeProperties.tableName', 'type': 'object'}, 'keyspace': {'key': 'typeProperties.keyspace', 'type': 'object'}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, table_name=None, keyspace=None): - super(CassandraTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, table_name=None, keyspace=None): + super(CassandraTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.table_name = table_name self.keyspace = keyspace self.type = 'CassandraTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_linked_service.py index b7ce2678e944..6e5321bb8ca1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_linked_service.py @@ -23,6 +23,12 @@ class ConcurLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param client_id: Application client_id supplied by Concur App Management. @@ -58,6 +64,8 @@ class ConcurLinkedService(LinkedService): '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'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, @@ -68,8 +76,8 @@ class ConcurLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, client_id, username, additional_properties=None, connect_via=None, description=None, password=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(ConcurLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, client_id, username, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, password=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(ConcurLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.client_id = client_id self.username = username self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_object_dataset.py index 9612ba779261..694b6c2c4c6f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_object_dataset.py @@ -29,6 +29,9 @@ class ConcurObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class ConcurObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(ConcurObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(ConcurObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'ConcurObject' 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 40cf08c31366..7938a2cf01b7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity.py @@ -16,8 +16,8 @@ class ControlActivity(Activity): """Base class for all control activities like IfCondition, ForEach , Until. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: UntilActivity, WaitActivity, ForEachActivity, - IfConditionActivity, ExecutePipelineActivity + sub-classes are: FilterActivity, UntilActivity, WaitActivity, + ForEachActivity, IfConditionActivity, ExecutePipelineActivity :param additional_properties: Unmatched properties from the message are deserialized this collection @@ -38,7 +38,7 @@ class ControlActivity(Activity): } _subtype_map = { - 'type': {'Until': 'UntilActivity', 'Wait': 'WaitActivity', 'ForEach': 'ForEachActivity', 'IfCondition': 'IfConditionActivity', 'ExecutePipeline': 'ExecutePipelineActivity'} + 'type': {'Filter': 'FilterActivity', 'Until': 'UntilActivity', 'Wait': 'WaitActivity', 'ForEach': 'ForEachActivity', 'IfCondition': 'IfConditionActivity', 'ExecutePipeline': 'ExecutePipelineActivity'} } def __init__(self, name, additional_properties=None, description=None, depends_on=None): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py index c808083d9330..a03ac0dccdca 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py @@ -16,18 +16,18 @@ class CopySource(Model): """A copy activity source. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: AmazonRedshiftSource, VerticaSource, NetezzaSource, - ZohoSource, XeroSource, SquareSource, SparkSource, ShopifySource, - ServiceNowSource, QuickBooksSource, PrestoSource, PhoenixSource, - PaypalSource, MarketoSource, MariaDBSource, MagentoSource, JiraSource, - ImpalaSource, HubspotSource, HiveSource, HBaseSource, GreenplumSource, - GoogleBigQuerySource, EloquaSource, DrillSource, CouchbaseSource, - ConcurSource, AzurePostgreSqlSource, AmazonMWSSource, HttpSource, - AzureDataLakeStoreSource, MongoDbSource, CassandraSource, WebSource, - OracleSource, AzureMySqlSource, HdfsSource, FileSystemSource, SqlDWSource, - SqlSource, SapEccSource, SapCloudForCustomerSource, SalesforceSource, - RelationalSource, DynamicsSource, DocumentDbCollectionSource, BlobSource, - AzureTableSource + sub-classes are: AmazonRedshiftSource, SalesforceMarketingCloudSource, + VerticaSource, NetezzaSource, ZohoSource, XeroSource, SquareSource, + SparkSource, ShopifySource, ServiceNowSource, QuickBooksSource, + PrestoSource, PhoenixSource, PaypalSource, MarketoSource, MariaDBSource, + MagentoSource, JiraSource, ImpalaSource, HubspotSource, HiveSource, + HBaseSource, GreenplumSource, GoogleBigQuerySource, EloquaSource, + DrillSource, CouchbaseSource, ConcurSource, AzurePostgreSqlSource, + AmazonMWSSource, HttpSource, AzureDataLakeStoreSource, MongoDbSource, + CassandraSource, WebSource, OracleSource, AzureMySqlSource, HdfsSource, + FileSystemSource, SqlDWSource, SqlSource, SapEccSource, + SapCloudForCustomerSource, SalesforceSource, RelationalSource, + DynamicsSource, DocumentDbCollectionSource, BlobSource, AzureTableSource :param additional_properties: Unmatched properties from the message are deserialized this collection @@ -55,7 +55,7 @@ class CopySource(Model): } _subtype_map = { - 'type': {'AmazonRedshiftSource': 'AmazonRedshiftSource', 'VerticaSource': 'VerticaSource', 'NetezzaSource': 'NetezzaSource', 'ZohoSource': 'ZohoSource', 'XeroSource': 'XeroSource', 'SquareSource': 'SquareSource', 'SparkSource': 'SparkSource', 'ShopifySource': 'ShopifySource', 'ServiceNowSource': 'ServiceNowSource', 'QuickBooksSource': 'QuickBooksSource', 'PrestoSource': 'PrestoSource', 'PhoenixSource': 'PhoenixSource', 'PaypalSource': 'PaypalSource', 'MarketoSource': 'MarketoSource', 'MariaDBSource': 'MariaDBSource', 'MagentoSource': 'MagentoSource', 'JiraSource': 'JiraSource', 'ImpalaSource': 'ImpalaSource', 'HubspotSource': 'HubspotSource', 'HiveSource': 'HiveSource', 'HBaseSource': 'HBaseSource', 'GreenplumSource': 'GreenplumSource', 'GoogleBigQuerySource': 'GoogleBigQuerySource', 'EloquaSource': 'EloquaSource', 'DrillSource': 'DrillSource', 'CouchbaseSource': 'CouchbaseSource', 'ConcurSource': 'ConcurSource', 'AzurePostgreSqlSource': 'AzurePostgreSqlSource', 'AmazonMWSSource': 'AmazonMWSSource', 'HttpSource': 'HttpSource', 'AzureDataLakeStoreSource': 'AzureDataLakeStoreSource', 'MongoDbSource': 'MongoDbSource', 'CassandraSource': 'CassandraSource', 'WebSource': 'WebSource', 'OracleSource': 'OracleSource', 'AzureMySqlSource': 'AzureMySqlSource', 'HdfsSource': 'HdfsSource', 'FileSystemSource': 'FileSystemSource', 'SqlDWSource': 'SqlDWSource', 'SqlSource': 'SqlSource', 'SapEccSource': 'SapEccSource', 'SapCloudForCustomerSource': 'SapCloudForCustomerSource', 'SalesforceSource': 'SalesforceSource', 'RelationalSource': 'RelationalSource', 'DynamicsSource': 'DynamicsSource', 'DocumentDbCollectionSource': 'DocumentDbCollectionSource', 'BlobSource': 'BlobSource', 'AzureTableSource': 'AzureTableSource'} + 'type': {'AmazonRedshiftSource': 'AmazonRedshiftSource', 'SalesforceMarketingCloudSource': 'SalesforceMarketingCloudSource', 'VerticaSource': 'VerticaSource', 'NetezzaSource': 'NetezzaSource', 'ZohoSource': 'ZohoSource', 'XeroSource': 'XeroSource', 'SquareSource': 'SquareSource', 'SparkSource': 'SparkSource', 'ShopifySource': 'ShopifySource', 'ServiceNowSource': 'ServiceNowSource', 'QuickBooksSource': 'QuickBooksSource', 'PrestoSource': 'PrestoSource', 'PhoenixSource': 'PhoenixSource', 'PaypalSource': 'PaypalSource', 'MarketoSource': 'MarketoSource', 'MariaDBSource': 'MariaDBSource', 'MagentoSource': 'MagentoSource', 'JiraSource': 'JiraSource', 'ImpalaSource': 'ImpalaSource', 'HubspotSource': 'HubspotSource', 'HiveSource': 'HiveSource', 'HBaseSource': 'HBaseSource', 'GreenplumSource': 'GreenplumSource', 'GoogleBigQuerySource': 'GoogleBigQuerySource', 'EloquaSource': 'EloquaSource', 'DrillSource': 'DrillSource', 'CouchbaseSource': 'CouchbaseSource', 'ConcurSource': 'ConcurSource', 'AzurePostgreSqlSource': 'AzurePostgreSqlSource', 'AmazonMWSSource': 'AmazonMWSSource', 'HttpSource': 'HttpSource', 'AzureDataLakeStoreSource': 'AzureDataLakeStoreSource', 'MongoDbSource': 'MongoDbSource', 'CassandraSource': 'CassandraSource', 'WebSource': 'WebSource', 'OracleSource': 'OracleSource', 'AzureMySqlSource': 'AzureMySqlSource', 'HdfsSource': 'HdfsSource', 'FileSystemSource': 'FileSystemSource', 'SqlDWSource': 'SqlDWSource', 'SqlSource': 'SqlSource', 'SapEccSource': 'SapEccSource', 'SapCloudForCustomerSource': 'SapCloudForCustomerSource', 'SalesforceSource': 'SalesforceSource', 'RelationalSource': 'RelationalSource', 'DynamicsSource': 'DynamicsSource', 'DocumentDbCollectionSource': 'DocumentDbCollectionSource', 'BlobSource': 'BlobSource', 'AzureTableSource': 'AzureTableSource'} } def __init__(self, additional_properties=None, source_retry_count=None, source_retry_wait=None): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service.py index 6a33ebdad6ba..0461d58e7f0d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service.py @@ -23,6 +23,12 @@ class CosmosDbLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: The connection string. @@ -42,13 +48,15 @@ class CosmosDbLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, encrypted_credential=None): - super(CosmosDbLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, encrypted_credential=None): + super(CosmosDbLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'CosmosDb' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service.py index 3865f7cf435b..562648752f21 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service.py @@ -23,6 +23,12 @@ class CouchbaseLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: An ODBC connection string. @@ -41,13 +47,15 @@ class CouchbaseLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, connection_string=None, encrypted_credential=None): - super(CouchbaseLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, connection_string=None, encrypted_credential=None): + super(CouchbaseLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'Couchbase' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_table_dataset.py index ec79d6a1b1aa..425eefb0594d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_table_dataset.py @@ -29,6 +29,9 @@ class CouchbaseTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class CouchbaseTableDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(CouchbaseTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(CouchbaseTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'CouchbaseTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_data_source_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_data_source_linked_service.py index 07d9085ab6d6..4a5b4a2ed37a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_data_source_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_data_source_linked_service.py @@ -23,6 +23,12 @@ class CustomDataSourceLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param type_properties: Custom linked service properties. @@ -38,11 +44,13 @@ class CustomDataSourceLinkedService(LinkedService): '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'}, 'type_properties': {'key': 'typeProperties', 'type': 'object'}, } - def __init__(self, type_properties, additional_properties=None, connect_via=None, description=None): - super(CustomDataSourceLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, type_properties, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None): + super(CustomDataSourceLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.type_properties = type_properties self.type = 'CustomDataSource' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_dataset.py index 75d31f2c77e8..9447713b24f0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_dataset.py @@ -29,6 +29,9 @@ class CustomDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param type_properties: Custom dataset properties. @@ -47,11 +50,12 @@ class CustomDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'type_properties': {'key': 'typeProperties', 'type': 'object'}, } - def __init__(self, linked_service_name, type_properties, additional_properties=None, description=None, structure=None, parameters=None): - super(CustomDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, type_properties, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(CustomDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type_properties = type_properties self.type = 'CustomDataset' 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 5d81968a6bf7..c51c0f9e368b 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 @@ -39,6 +39,7 @@ class ParameterType(Enum): float_enum = "Float" bool_enum = "Bool" array = "Array" + secure_string = "SecureString" class DependencyCondition(Enum): @@ -285,6 +286,7 @@ class WebActivityMethod(Enum): get = "GET" post = "POST" put = "PUT" + delete = "DELETE" class CassandraSourceReadConsistencyLevels(Enum): 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 new file mode 100644 index 000000000000..b23a8fc21092 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity.py @@ -0,0 +1,66 @@ +# 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 .execution_activity import ExecutionActivity + + +class DatabricksNotebookActivity(ExecutionActivity): + """DatabricksNotebook activity. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param name: 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 type: 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 notebook_path: The absolute path of the notebook to be run in the + Databricks Workspace. This path must begin with a slash. Type: string (or + Expression with resultType string). + :type notebook_path: object + :param base_parameters: Base parameters to be used for each run of this + job.If the notebook takes a parameter that is not specified, the default + value from the notebook will be used. + :type base_parameters: dict[str, object] + """ + + _validation = { + 'name': {'required': True}, + 'type': {'required': True}, + 'notebook_path': {'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]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, + 'policy': {'key': 'policy', 'type': 'ActivityPolicy'}, + 'notebook_path': {'key': 'typeProperties.notebookPath', 'type': 'object'}, + 'base_parameters': {'key': 'typeProperties.baseParameters', 'type': '{object}'}, + } + + def __init__(self, name, notebook_path, additional_properties=None, description=None, depends_on=None, linked_service_name=None, policy=None, base_parameters=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) + self.notebook_path = notebook_path + self.base_parameters = base_parameters + self.type = 'DatabricksNotebook' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py index 755320602566..e3f4fabdd82d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py @@ -17,21 +17,22 @@ class Dataset(Model): data stores, such as tables, files, folders, and documents. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: VerticaTableDataset, NetezzaTableDataset, - ZohoObjectDataset, XeroObjectDataset, SquareObjectDataset, - SparkObjectDataset, ShopifyObjectDataset, ServiceNowObjectDataset, - QuickBooksObjectDataset, PrestoObjectDataset, PhoenixObjectDataset, - PaypalObjectDataset, MarketoObjectDataset, MariaDBTableDataset, - MagentoObjectDataset, JiraObjectDataset, ImpalaObjectDataset, - HubspotObjectDataset, HiveObjectDataset, HBaseObjectDataset, - GreenplumTableDataset, GoogleBigQueryObjectDataset, EloquaObjectDataset, - DrillTableDataset, CouchbaseTableDataset, ConcurObjectDataset, - AzurePostgreSqlTableDataset, AmazonMWSObjectDataset, HttpDataset, - AzureSearchIndexDataset, WebTableDataset, SqlServerTableDataset, - SapEccResourceDataset, SapCloudForCustomerResourceDataset, - SalesforceObjectDataset, RelationalTableDataset, AzureMySqlTableDataset, - OracleTableDataset, ODataResourceDataset, MongoDbCollectionDataset, - FileShareDataset, AzureDataLakeStoreDataset, DynamicsEntityDataset, + sub-classes are: SalesforceMarketingCloudObjectDataset, + VerticaTableDataset, NetezzaTableDataset, ZohoObjectDataset, + XeroObjectDataset, SquareObjectDataset, SparkObjectDataset, + ShopifyObjectDataset, ServiceNowObjectDataset, QuickBooksObjectDataset, + PrestoObjectDataset, PhoenixObjectDataset, PaypalObjectDataset, + MarketoObjectDataset, MariaDBTableDataset, MagentoObjectDataset, + JiraObjectDataset, ImpalaObjectDataset, HubspotObjectDataset, + HiveObjectDataset, HBaseObjectDataset, GreenplumTableDataset, + GoogleBigQueryObjectDataset, EloquaObjectDataset, DrillTableDataset, + CouchbaseTableDataset, ConcurObjectDataset, AzurePostgreSqlTableDataset, + AmazonMWSObjectDataset, HttpDataset, AzureSearchIndexDataset, + WebTableDataset, SqlServerTableDataset, SapEccResourceDataset, + SapCloudForCustomerResourceDataset, SalesforceObjectDataset, + RelationalTableDataset, AzureMySqlTableDataset, OracleTableDataset, + ODataResourceDataset, MongoDbCollectionDataset, FileShareDataset, + AzureDataLakeStoreDataset, DynamicsEntityDataset, DocumentDbCollectionDataset, CustomDataset, CassandraTableDataset, AzureSqlDWTableDataset, AzureSqlTableDataset, AzureTableDataset, AzureBlobDataset, AmazonS3Dataset @@ -50,6 +51,9 @@ class Dataset(Model): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -65,18 +69,20 @@ class Dataset(Model): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, } _subtype_map = { - 'type': {'VerticaTable': 'VerticaTableDataset', 'NetezzaTable': 'NetezzaTableDataset', 'ZohoObject': 'ZohoObjectDataset', 'XeroObject': 'XeroObjectDataset', 'SquareObject': 'SquareObjectDataset', 'SparkObject': 'SparkObjectDataset', 'ShopifyObject': 'ShopifyObjectDataset', 'ServiceNowObject': 'ServiceNowObjectDataset', 'QuickBooksObject': 'QuickBooksObjectDataset', 'PrestoObject': 'PrestoObjectDataset', 'PhoenixObject': 'PhoenixObjectDataset', 'PaypalObject': 'PaypalObjectDataset', 'MarketoObject': 'MarketoObjectDataset', 'MariaDBTable': 'MariaDBTableDataset', 'MagentoObject': 'MagentoObjectDataset', 'JiraObject': 'JiraObjectDataset', 'ImpalaObject': 'ImpalaObjectDataset', 'HubspotObject': 'HubspotObjectDataset', 'HiveObject': 'HiveObjectDataset', 'HBaseObject': 'HBaseObjectDataset', 'GreenplumTable': 'GreenplumTableDataset', 'GoogleBigQueryObject': 'GoogleBigQueryObjectDataset', 'EloquaObject': 'EloquaObjectDataset', 'DrillTable': 'DrillTableDataset', 'CouchbaseTable': 'CouchbaseTableDataset', 'ConcurObject': 'ConcurObjectDataset', 'AzurePostgreSqlTable': 'AzurePostgreSqlTableDataset', 'AmazonMWSObject': 'AmazonMWSObjectDataset', 'HttpFile': 'HttpDataset', 'AzureSearchIndex': 'AzureSearchIndexDataset', 'WebTable': 'WebTableDataset', 'SqlServerTable': 'SqlServerTableDataset', 'SapEccResource': 'SapEccResourceDataset', 'SapCloudForCustomerResource': 'SapCloudForCustomerResourceDataset', 'SalesforceObject': 'SalesforceObjectDataset', 'RelationalTable': 'RelationalTableDataset', 'AzureMySqlTable': 'AzureMySqlTableDataset', 'OracleTable': 'OracleTableDataset', 'ODataResource': 'ODataResourceDataset', 'MongoDbCollection': 'MongoDbCollectionDataset', 'FileShare': 'FileShareDataset', 'AzureDataLakeStoreFile': 'AzureDataLakeStoreDataset', 'DynamicsEntity': 'DynamicsEntityDataset', 'DocumentDbCollection': 'DocumentDbCollectionDataset', 'CustomDataset': 'CustomDataset', 'CassandraTable': 'CassandraTableDataset', 'AzureSqlDWTable': 'AzureSqlDWTableDataset', 'AzureSqlTable': 'AzureSqlTableDataset', 'AzureTable': 'AzureTableDataset', 'AzureBlob': 'AzureBlobDataset', 'AmazonS3Object': 'AmazonS3Dataset'} + 'type': {'SalesforceMarketingCloudObject': 'SalesforceMarketingCloudObjectDataset', 'VerticaTable': 'VerticaTableDataset', 'NetezzaTable': 'NetezzaTableDataset', 'ZohoObject': 'ZohoObjectDataset', 'XeroObject': 'XeroObjectDataset', 'SquareObject': 'SquareObjectDataset', 'SparkObject': 'SparkObjectDataset', 'ShopifyObject': 'ShopifyObjectDataset', 'ServiceNowObject': 'ServiceNowObjectDataset', 'QuickBooksObject': 'QuickBooksObjectDataset', 'PrestoObject': 'PrestoObjectDataset', 'PhoenixObject': 'PhoenixObjectDataset', 'PaypalObject': 'PaypalObjectDataset', 'MarketoObject': 'MarketoObjectDataset', 'MariaDBTable': 'MariaDBTableDataset', 'MagentoObject': 'MagentoObjectDataset', 'JiraObject': 'JiraObjectDataset', 'ImpalaObject': 'ImpalaObjectDataset', 'HubspotObject': 'HubspotObjectDataset', 'HiveObject': 'HiveObjectDataset', 'HBaseObject': 'HBaseObjectDataset', 'GreenplumTable': 'GreenplumTableDataset', 'GoogleBigQueryObject': 'GoogleBigQueryObjectDataset', 'EloquaObject': 'EloquaObjectDataset', 'DrillTable': 'DrillTableDataset', 'CouchbaseTable': 'CouchbaseTableDataset', 'ConcurObject': 'ConcurObjectDataset', 'AzurePostgreSqlTable': 'AzurePostgreSqlTableDataset', 'AmazonMWSObject': 'AmazonMWSObjectDataset', 'HttpFile': 'HttpDataset', 'AzureSearchIndex': 'AzureSearchIndexDataset', 'WebTable': 'WebTableDataset', 'SqlServerTable': 'SqlServerTableDataset', 'SapEccResource': 'SapEccResourceDataset', 'SapCloudForCustomerResource': 'SapCloudForCustomerResourceDataset', 'SalesforceObject': 'SalesforceObjectDataset', 'RelationalTable': 'RelationalTableDataset', 'AzureMySqlTable': 'AzureMySqlTableDataset', 'OracleTable': 'OracleTableDataset', 'ODataResource': 'ODataResourceDataset', 'MongoDbCollection': 'MongoDbCollectionDataset', 'FileShare': 'FileShareDataset', 'AzureDataLakeStoreFile': 'AzureDataLakeStoreDataset', 'DynamicsEntity': 'DynamicsEntityDataset', 'DocumentDbCollection': 'DocumentDbCollectionDataset', 'CustomDataset': 'CustomDataset', 'CassandraTable': 'CassandraTableDataset', 'AzureSqlDWTable': 'AzureSqlDWTableDataset', 'AzureSqlTable': 'AzureSqlTableDataset', 'AzureTable': 'AzureTableDataset', 'AzureBlob': 'AzureBlobDataset', 'AmazonS3Object': 'AmazonS3Dataset'} } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): super(Dataset, self).__init__() self.additional_properties = additional_properties self.description = description self.structure = structure self.linked_service_name = linked_service_name self.parameters = parameters + self.annotations = annotations self.type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service.py index 34b1ee25b937..031025b25175 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service.py @@ -23,6 +23,12 @@ class Db2LinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param server: Server name for connection. Type: string (or Expression @@ -59,6 +65,8 @@ class Db2LinkedService(LinkedService): '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'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'database': {'key': 'typeProperties.database', 'type': 'object'}, @@ -69,8 +77,8 @@ class Db2LinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, schema=None, authentication_type=None, username=None, password=None, encrypted_credential=None): - super(Db2LinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, schema=None, authentication_type=None, username=None, password=None, encrypted_credential=None): + super(Db2LinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.server = server self.database = database self.schema = schema diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_dataset.py index 8d391819639d..60c3df76af60 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_dataset.py @@ -29,6 +29,9 @@ class DocumentDbCollectionDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param collection_name: Document Database collection name. Type: string @@ -48,11 +51,12 @@ class DocumentDbCollectionDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'collection_name': {'key': 'typeProperties.collectionName', 'type': 'object'}, } - def __init__(self, linked_service_name, collection_name, additional_properties=None, description=None, structure=None, parameters=None): - super(DocumentDbCollectionDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, collection_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(DocumentDbCollectionDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.collection_name = collection_name self.type = 'DocumentDbCollection' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service.py index cc70212ec248..ab34fd2c56a4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service.py @@ -23,6 +23,12 @@ class DrillLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: An ODBC connection string. @@ -41,13 +47,15 @@ class DrillLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, connection_string=None, encrypted_credential=None): - super(DrillLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, connection_string=None, encrypted_credential=None): + super(DrillLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'Drill' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_table_dataset.py index 1c92dfe4ca3a..2731f23a6f10 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_table_dataset.py @@ -29,6 +29,9 @@ class DrillTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class DrillTableDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(DrillTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(DrillTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'DrillTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_entity_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_entity_dataset.py index d0cd91956d0e..212dc23594c4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_entity_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_entity_dataset.py @@ -29,6 +29,9 @@ class DynamicsEntityDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param entity_name: The logical name of the entity. Type: string (or @@ -47,11 +50,12 @@ class DynamicsEntityDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'entity_name': {'key': 'typeProperties.entityName', 'type': 'object'}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, entity_name=None): - super(DynamicsEntityDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, entity_name=None): + super(DynamicsEntityDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.entity_name = entity_name self.type = 'DynamicsEntity' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_linked_service.py index d0e9424c453b..8161c702bd69 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_linked_service.py @@ -23,6 +23,12 @@ class DynamicsLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param deployment_type: The deployment type of the Dynamics instance. @@ -37,6 +43,10 @@ class DynamicsLinkedService(LinkedService): required for on-prem and not allowed for online. Default is 443. Type: integer (or Expression with resultType integer), minimum: 0. :type port: object + :param service_uri: The URL to the Microsoft Dynamics server. The property + is required for on-line and not allowed for on-prem. Type: string (or + Expression with resultType string). + :type service_uri: object :param organization_name: The organization name of the Dynamics instance. The property is required for on-prem and required for online when there are more than one Dynamics instances associated with the user. Type: @@ -68,10 +78,13 @@ class DynamicsLinkedService(LinkedService): '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'}, 'deployment_type': {'key': 'typeProperties.deploymentType', 'type': 'object'}, 'host_name': {'key': 'typeProperties.hostName', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, + 'service_uri': {'key': 'typeProperties.serviceUri', 'type': 'object'}, 'organization_name': {'key': 'typeProperties.organizationName', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'object'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, @@ -79,11 +92,12 @@ class DynamicsLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, deployment_type, authentication_type, username, additional_properties=None, connect_via=None, description=None, host_name=None, port=None, organization_name=None, password=None, encrypted_credential=None): - super(DynamicsLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, deployment_type, authentication_type, username, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, host_name=None, port=None, service_uri=None, organization_name=None, password=None, encrypted_credential=None): + super(DynamicsLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.deployment_type = deployment_type self.host_name = host_name self.port = port + self.service_uri = service_uri self.organization_name = organization_name self.authentication_type = authentication_type self.username = username diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_linked_service.py index 50082af30bae..d7914f0db7ce 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_linked_service.py @@ -23,6 +23,12 @@ class EloquaLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param endpoint: The endpoint of the Eloqua server. (i.e. @@ -59,6 +65,8 @@ class EloquaLinkedService(LinkedService): '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'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, @@ -69,8 +77,8 @@ class EloquaLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, endpoint, username, additional_properties=None, connect_via=None, description=None, password=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(EloquaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, endpoint, username, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, password=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(EloquaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.endpoint = endpoint self.username = username self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_object_dataset.py index a7b4d82578c2..d8a0b7d91d75 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_object_dataset.py @@ -29,6 +29,9 @@ class EloquaObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class EloquaObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(EloquaObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(EloquaObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'EloquaObject' 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 245b5621d3ec..c65430db8229 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity.py @@ -16,7 +16,7 @@ class ExecutionActivity(Activity): """Base class for all execution activities. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: DataLakeAnalyticsUSQLActivity, + sub-classes are: DatabricksNotebookActivity, DataLakeAnalyticsUSQLActivity, AzureMLUpdateResourceActivity, AzureMLBatchExecutionActivity, GetMetadataActivity, WebActivity, LookupActivity, SqlServerStoredProcedureActivity, CustomActivity, @@ -58,7 +58,7 @@ class ExecutionActivity(Activity): } _subtype_map = { - 'type': {'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'} + '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, additional_properties=None, description=None, depends_on=None, linked_service_name=None, policy=None): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_server_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_server_linked_service.py index 03d56b450f39..cc1aeac1d648 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_server_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_server_linked_service.py @@ -23,6 +23,12 @@ class FileServerLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: Host name of the server. Type: string (or Expression with @@ -48,6 +54,8 @@ class FileServerLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'user_id': {'key': 'typeProperties.userId', 'type': 'object'}, @@ -55,8 +63,8 @@ class FileServerLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, additional_properties=None, connect_via=None, description=None, user_id=None, password=None, encrypted_credential=None): - super(FileServerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, user_id=None, password=None, encrypted_credential=None): + super(FileServerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.user_id = user_id self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_share_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_share_dataset.py index 02c5e9125f10..8d53d8b797fd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_share_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_share_dataset.py @@ -29,6 +29,9 @@ class FileShareDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param folder_path: The path of the on-premises file system. Type: string @@ -58,6 +61,7 @@ class FileShareDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'folder_path': {'key': 'typeProperties.folderPath', 'type': 'object'}, 'file_name': {'key': 'typeProperties.fileName', 'type': 'object'}, @@ -66,8 +70,8 @@ class FileShareDataset(Dataset): 'compression': {'key': 'typeProperties.compression', 'type': 'DatasetCompression'}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, folder_path=None, file_name=None, format=None, file_filter=None, compression=None): - super(FileShareDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, folder_path=None, file_name=None, format=None, file_filter=None, compression=None): + super(FileShareDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.folder_path = folder_path self.file_name = file_name self.format = format diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity.py new file mode 100644 index 000000000000..74f7300b0758 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity.py @@ -0,0 +1,56 @@ +# 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 .control_activity import ControlActivity + + +class FilterActivity(ControlActivity): + """Filter and return results from input array based on the conditions. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param name: 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 type: Constant filled by server. + :type type: str + :param items: Input array on which filter should be applied. + :type items: ~azure.mgmt.datafactory.models.Expression + :param condition: Condition to be used for filtering the input. + :type condition: ~azure.mgmt.datafactory.models.Expression + """ + + _validation = { + 'name': {'required': True}, + 'type': {'required': True}, + 'items': {'required': True}, + 'condition': {'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]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'items': {'key': 'typeProperties.items', 'type': 'Expression'}, + 'condition': {'key': 'typeProperties.condition', 'type': 'Expression'}, + } + + def __init__(self, name, items, condition, additional_properties=None, description=None, depends_on=None): + super(FilterActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on) + 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 f96be9e94512..f26f45af5f4a 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 @@ -28,8 +28,11 @@ class ForEachActivity(ControlActivity): :param type: Constant filled by server. :type type: str :param is_sequential: Should the loop be executed in sequence or in - parallel (max 20) + parallel (max 50) :type is_sequential: bool + :param batch_count: Batch count to be used for controlling the number of + parallel execution (when isSequential is set to false). + :type batch_count: int :param items: Collection to iterate. :type items: ~azure.mgmt.datafactory.models.Expression :param activities: List of activities to execute . @@ -39,6 +42,7 @@ class ForEachActivity(ControlActivity): _validation = { 'name': {'required': True}, 'type': {'required': True}, + 'batch_count': {'maximum': 50}, 'items': {'required': True}, 'activities': {'required': True}, } @@ -50,13 +54,15 @@ class ForEachActivity(ControlActivity): 'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'}, 'type': {'key': 'type', 'type': 'str'}, 'is_sequential': {'key': 'typeProperties.isSequential', 'type': 'bool'}, + 'batch_count': {'key': 'typeProperties.batchCount', 'type': 'int'}, 'items': {'key': 'typeProperties.items', 'type': 'Expression'}, 'activities': {'key': 'typeProperties.activities', 'type': '[Activity]'}, } - def __init__(self, name, items, activities, additional_properties=None, description=None, depends_on=None, is_sequential=None): + def __init__(self, name, items, activities, additional_properties=None, description=None, depends_on=None, is_sequential=None, batch_count=None): super(ForEachActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on) self.is_sequential = is_sequential + self.batch_count = batch_count self.items = items self.activities = activities self.type = 'ForEach' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/ftp_server_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/ftp_server_linked_service.py index b35fc3c4d13c..010d528202d8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/ftp_server_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/ftp_server_linked_service.py @@ -23,6 +23,12 @@ class FtpServerLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: Host name of the FTP server. Type: string (or Expression with @@ -64,6 +70,8 @@ class FtpServerLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, @@ -75,8 +83,8 @@ class FtpServerLinkedService(LinkedService): 'enable_server_certificate_validation': {'key': 'typeProperties.enableServerCertificateValidation', 'type': 'object'}, } - def __init__(self, host, additional_properties=None, connect_via=None, description=None, port=None, authentication_type=None, user_name=None, password=None, encrypted_credential=None, enable_ssl=None, enable_server_certificate_validation=None): - super(FtpServerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, port=None, authentication_type=None, user_name=None, password=None, encrypted_credential=None, enable_ssl=None, enable_server_certificate_validation=None): + super(FtpServerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.port = port self.authentication_type = authentication_type diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_linked_service.py index 06aa143d8ab4..0fbef57855ef 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_linked_service.py @@ -23,6 +23,12 @@ class GoogleBigQueryLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param project: The default BigQuery project to query against. @@ -81,6 +87,8 @@ class GoogleBigQueryLinkedService(LinkedService): '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'}, 'project': {'key': 'typeProperties.project', 'type': 'object'}, 'additional_projects': {'key': 'typeProperties.additionalProjects', 'type': 'object'}, @@ -96,8 +104,8 @@ class GoogleBigQueryLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, project, authentication_type, additional_properties=None, connect_via=None, description=None, additional_projects=None, request_google_drive_scope=None, refresh_token=None, client_id=None, client_secret=None, email=None, key_file_path=None, trusted_cert_path=None, use_system_trust_store=None, encrypted_credential=None): - super(GoogleBigQueryLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, project, authentication_type, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, additional_projects=None, request_google_drive_scope=None, refresh_token=None, client_id=None, client_secret=None, email=None, key_file_path=None, trusted_cert_path=None, use_system_trust_store=None, encrypted_credential=None): + super(GoogleBigQueryLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.project = project self.additional_projects = additional_projects self.request_google_drive_scope = request_google_drive_scope diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_object_dataset.py index 47e302d47d08..ce49eb0321c1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_object_dataset.py @@ -29,6 +29,9 @@ class GoogleBigQueryObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class GoogleBigQueryObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(GoogleBigQueryObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(GoogleBigQueryObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'GoogleBigQueryObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service.py index 43f1d515a5e3..a24878a71d40 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service.py @@ -23,6 +23,12 @@ class GreenplumLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: An ODBC connection string. @@ -41,13 +47,15 @@ class GreenplumLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, connection_string=None, encrypted_credential=None): - super(GreenplumLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, connection_string=None, encrypted_credential=None): + super(GreenplumLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'Greenplum' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_table_dataset.py index efec9b621fee..27bcb145ea28 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_table_dataset.py @@ -29,6 +29,9 @@ class GreenplumTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class GreenplumTableDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(GreenplumTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(GreenplumTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'GreenplumTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_linked_service.py index 5e68e990b3e7..27060fa9e91a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_linked_service.py @@ -23,6 +23,12 @@ class HBaseLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The IP address or host name of the HBase server. (i.e. @@ -73,6 +79,8 @@ class HBaseLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, @@ -87,8 +95,8 @@ class HBaseLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, authentication_type, additional_properties=None, connect_via=None, description=None, port=None, http_path=None, username=None, password=None, enable_ssl=None, trusted_cert_path=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): - super(HBaseLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, authentication_type, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, port=None, http_path=None, username=None, password=None, enable_ssl=None, trusted_cert_path=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): + super(HBaseLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.port = port self.http_path = http_path diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_object_dataset.py index a5eaab38a4ab..d5ed5ed80ab7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_object_dataset.py @@ -29,6 +29,9 @@ class HBaseObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class HBaseObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(HBaseObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(HBaseObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'HBaseObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_linked_service.py index 25dbbb523033..017d86784e54 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_linked_service.py @@ -23,6 +23,12 @@ class HDInsightLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param cluster_uri: HDInsight cluster URI. Type: string (or Expression @@ -55,6 +61,8 @@ class HDInsightLinkedService(LinkedService): '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'}, 'cluster_uri': {'key': 'typeProperties.clusterUri', 'type': 'object'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, @@ -64,8 +72,8 @@ class HDInsightLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, cluster_uri, additional_properties=None, connect_via=None, description=None, user_name=None, password=None, linked_service_name=None, hcatalog_linked_service_name=None, encrypted_credential=None): - super(HDInsightLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, cluster_uri, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, user_name=None, password=None, linked_service_name=None, hcatalog_linked_service_name=None, encrypted_credential=None): + super(HDInsightLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.cluster_uri = cluster_uri self.user_name = user_name self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_on_demand_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_on_demand_linked_service.py index a93210ee151a..fc7eb34cb00e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_on_demand_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_on_demand_linked_service.py @@ -23,6 +23,12 @@ class HDInsightOnDemandLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param cluster_size: Number of worker/data nodes in the cluster. @@ -115,6 +121,15 @@ class HDInsightOnDemandLinkedService(LinkedService): authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). :type encrypted_credential: object + :param head_node_size: Specifies the size of the head node for the + HDInsight cluster. + :type head_node_size: object + :param data_node_size: Specifies the size of the data node for the + HDInsight cluster. + :type data_node_size: object + :param zookeeper_node_size: Specifies the size of the Zoo Keeper node for + the HDInsight cluster. + :type zookeeper_node_size: object """ _validation = { @@ -132,6 +147,8 @@ class HDInsightOnDemandLinkedService(LinkedService): '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'}, 'cluster_size': {'key': 'typeProperties.clusterSize', 'type': 'object'}, 'time_to_live': {'key': 'typeProperties.timeToLive', 'type': 'object'}, @@ -160,10 +177,13 @@ class HDInsightOnDemandLinkedService(LinkedService): 'storm_configuration': {'key': 'typeProperties.stormConfiguration', 'type': 'object'}, 'yarn_configuration': {'key': 'typeProperties.yarnConfiguration', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, + 'head_node_size': {'key': 'typeProperties.headNodeSize', 'type': 'object'}, + 'data_node_size': {'key': 'typeProperties.dataNodeSize', 'type': 'object'}, + 'zookeeper_node_size': {'key': 'typeProperties.zookeeperNodeSize', 'type': 'object'}, } - def __init__(self, cluster_size, time_to_live, version, linked_service_name, host_subscription_id, tenant, cluster_resource_group, additional_properties=None, connect_via=None, description=None, service_principal_id=None, service_principal_key=None, cluster_name_prefix=None, cluster_user_name=None, cluster_password=None, cluster_ssh_user_name=None, cluster_ssh_password=None, additional_linked_service_names=None, hcatalog_linked_service_name=None, cluster_type=None, spark_version=None, core_configuration=None, h_base_configuration=None, hdfs_configuration=None, hive_configuration=None, map_reduce_configuration=None, oozie_configuration=None, storm_configuration=None, yarn_configuration=None, encrypted_credential=None): - super(HDInsightOnDemandLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, cluster_size, time_to_live, version, linked_service_name, host_subscription_id, tenant, cluster_resource_group, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, service_principal_id=None, service_principal_key=None, cluster_name_prefix=None, cluster_user_name=None, cluster_password=None, cluster_ssh_user_name=None, cluster_ssh_password=None, additional_linked_service_names=None, hcatalog_linked_service_name=None, cluster_type=None, spark_version=None, core_configuration=None, h_base_configuration=None, hdfs_configuration=None, hive_configuration=None, map_reduce_configuration=None, oozie_configuration=None, storm_configuration=None, yarn_configuration=None, encrypted_credential=None, head_node_size=None, data_node_size=None, zookeeper_node_size=None): + super(HDInsightOnDemandLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.cluster_size = cluster_size self.time_to_live = time_to_live self.version = version @@ -191,4 +211,7 @@ def __init__(self, cluster_size, time_to_live, version, linked_service_name, hos self.storm_configuration = storm_configuration self.yarn_configuration = yarn_configuration self.encrypted_credential = encrypted_credential + self.head_node_size = head_node_size + self.data_node_size = data_node_size + self.zookeeper_node_size = zookeeper_node_size self.type = 'HDInsightOnDemand' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_linked_service.py index db5ee12c0d35..d0253c69ee5d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_linked_service.py @@ -23,6 +23,12 @@ class HdfsLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param url: The URL of the HDFS service endpoint, e.g. @@ -53,6 +59,8 @@ class HdfsLinkedService(LinkedService): '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'}, 'url': {'key': 'typeProperties.url', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'object'}, @@ -61,8 +69,8 @@ class HdfsLinkedService(LinkedService): 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, } - def __init__(self, url, additional_properties=None, connect_via=None, description=None, authentication_type=None, encrypted_credential=None, user_name=None, password=None): - super(HdfsLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, url, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, authentication_type=None, encrypted_credential=None, user_name=None, password=None): + super(HdfsLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.url = url self.authentication_type = authentication_type self.encrypted_credential = encrypted_credential diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_linked_service.py index 9396222ce197..a3068d5fc5f4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_linked_service.py @@ -23,6 +23,12 @@ class HiveLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: IP address or host name of the Hive server, separated by ';' @@ -94,6 +100,8 @@ class HiveLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, @@ -114,8 +122,8 @@ class HiveLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, authentication_type, additional_properties=None, connect_via=None, description=None, port=None, server_type=None, thrift_transport_protocol=None, service_discovery_mode=None, zoo_keeper_name_space=None, use_native_query=None, username=None, password=None, http_path=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): - super(HiveLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, authentication_type, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, port=None, server_type=None, thrift_transport_protocol=None, service_discovery_mode=None, zoo_keeper_name_space=None, use_native_query=None, username=None, password=None, http_path=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): + super(HiveLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.port = port self.server_type = server_type diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_object_dataset.py index f3628b31fd86..b88fd992a0a8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_object_dataset.py @@ -29,6 +29,9 @@ class HiveObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class HiveObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(HiveObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(HiveObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'HiveObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_dataset.py index 20503c03ca19..7b84ce8051cc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_dataset.py @@ -29,6 +29,9 @@ class HttpDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param relative_url: The relative URL based on the URL in the @@ -64,6 +67,7 @@ class HttpDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'relative_url': {'key': 'typeProperties.relativeUrl', 'type': 'object'}, 'request_method': {'key': 'typeProperties.requestMethod', 'type': 'object'}, @@ -73,8 +77,8 @@ class HttpDataset(Dataset): 'compression': {'key': 'typeProperties.compression', 'type': 'DatasetCompression'}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, relative_url=None, request_method=None, request_body=None, additional_headers=None, format=None, compression=None): - super(HttpDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, relative_url=None, request_method=None, request_body=None, additional_headers=None, format=None, compression=None): + super(HttpDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.relative_url = relative_url self.request_method = request_method self.request_body = request_body diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_linked_service.py index f85e5886bcaa..07ad90ad5596 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_linked_service.py @@ -23,6 +23,12 @@ class HttpLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param url: The base URL of the HTTP endpoint, e.g. @@ -71,6 +77,8 @@ class HttpLinkedService(LinkedService): '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'}, 'url': {'key': 'typeProperties.url', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, @@ -82,8 +90,8 @@ class HttpLinkedService(LinkedService): 'enable_server_certificate_validation': {'key': 'typeProperties.enableServerCertificateValidation', 'type': 'object'}, } - def __init__(self, url, additional_properties=None, connect_via=None, description=None, authentication_type=None, user_name=None, password=None, embedded_cert_data=None, cert_thumbprint=None, encrypted_credential=None, enable_server_certificate_validation=None): - super(HttpLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, url, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, authentication_type=None, user_name=None, password=None, embedded_cert_data=None, cert_thumbprint=None, encrypted_credential=None, enable_server_certificate_validation=None): + super(HttpLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.url = url self.authentication_type = authentication_type self.user_name = user_name diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_linked_service.py index d6d27657d575..7af6e0637ff0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_linked_service.py @@ -23,6 +23,12 @@ class HubspotLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param client_id: The client ID associated with your Hubspot application. @@ -61,6 +67,8 @@ class HubspotLinkedService(LinkedService): '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'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, @@ -72,8 +80,8 @@ class HubspotLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, client_id, additional_properties=None, connect_via=None, description=None, client_secret=None, access_token=None, refresh_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(HubspotLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, client_id, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, client_secret=None, access_token=None, refresh_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(HubspotLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.client_id = client_id self.client_secret = client_secret self.access_token = access_token diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_object_dataset.py index d04a27cc99b3..72374f68d90e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_object_dataset.py @@ -29,6 +29,9 @@ class HubspotObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class HubspotObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(HubspotObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(HubspotObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'HubspotObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_linked_service.py index d4f97c1d3c8c..312842a46b92 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_linked_service.py @@ -23,6 +23,12 @@ class ImpalaLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The IP address or host name of the Impala server. (i.e. @@ -76,6 +82,8 @@ class ImpalaLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, @@ -90,8 +98,8 @@ class ImpalaLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, authentication_type, additional_properties=None, connect_via=None, description=None, port=None, username=None, password=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): - super(ImpalaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, authentication_type, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, port=None, username=None, password=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): + super(ImpalaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.port = port self.authentication_type = authentication_type diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_object_dataset.py index 46ee76491cc4..01e13a4c5838 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_object_dataset.py @@ -29,6 +29,9 @@ class ImpalaObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class ImpalaObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(ImpalaObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(ImpalaObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'ImpalaObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_linked_service.py index 2a5fef38d272..f42602398af7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_linked_service.py @@ -23,6 +23,12 @@ class JiraLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The IP address or host name of the Jira service. (e.g. @@ -63,6 +69,8 @@ class JiraLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, @@ -74,8 +82,8 @@ class JiraLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, username, additional_properties=None, connect_via=None, description=None, port=None, password=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(JiraLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, username, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, port=None, password=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(JiraLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.port = port self.username = username diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_object_dataset.py index a64f7bc3aeae..dcdc5b4f0772 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_object_dataset.py @@ -29,6 +29,9 @@ class JiraObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class JiraObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(JiraObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(JiraObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'JiraObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py index 87254ade162e..308313501773 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py @@ -18,20 +18,22 @@ class LinkedService(Model): resource. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: AzureDataLakeAnalyticsLinkedService, - HDInsightOnDemandLinkedService, NetezzaLinkedService, VerticaLinkedService, - ZohoLinkedService, XeroLinkedService, SquareLinkedService, - SparkLinkedService, ShopifyLinkedService, ServiceNowLinkedService, - QuickBooksLinkedService, PrestoLinkedService, PhoenixLinkedService, - PaypalLinkedService, MarketoLinkedService, MariaDBLinkedService, - MagentoLinkedService, JiraLinkedService, ImpalaLinkedService, - HubspotLinkedService, HiveLinkedService, HBaseLinkedService, - GreenplumLinkedService, GoogleBigQueryLinkedService, EloquaLinkedService, - DrillLinkedService, CouchbaseLinkedService, ConcurLinkedService, - AzurePostgreSqlLinkedService, AmazonMWSLinkedService, SapHanaLinkedService, - SapBWLinkedService, SftpServerLinkedService, FtpServerLinkedService, - HttpLinkedService, AzureSearchLinkedService, CustomDataSourceLinkedService, - AmazonRedshiftLinkedService, AmazonS3LinkedService, SapEccLinkedService, + sub-classes are: AzureDatabricksLinkedService, + AzureDataLakeAnalyticsLinkedService, HDInsightOnDemandLinkedService, + SalesforceMarketingCloudLinkedService, NetezzaLinkedService, + VerticaLinkedService, ZohoLinkedService, XeroLinkedService, + SquareLinkedService, SparkLinkedService, ShopifyLinkedService, + ServiceNowLinkedService, QuickBooksLinkedService, PrestoLinkedService, + PhoenixLinkedService, PaypalLinkedService, MarketoLinkedService, + MariaDBLinkedService, MagentoLinkedService, JiraLinkedService, + ImpalaLinkedService, HubspotLinkedService, HiveLinkedService, + HBaseLinkedService, GreenplumLinkedService, GoogleBigQueryLinkedService, + EloquaLinkedService, DrillLinkedService, CouchbaseLinkedService, + ConcurLinkedService, AzurePostgreSqlLinkedService, AmazonMWSLinkedService, + SapHanaLinkedService, SapBWLinkedService, SftpServerLinkedService, + FtpServerLinkedService, HttpLinkedService, AzureSearchLinkedService, + CustomDataSourceLinkedService, AmazonRedshiftLinkedService, + AmazonS3LinkedService, SapEccLinkedService, SapCloudForCustomerLinkedService, SalesforceLinkedService, AzureDataLakeStoreLinkedService, MongoDbLinkedService, CassandraLinkedService, WebLinkedService, ODataLinkedService, @@ -51,6 +53,12 @@ class LinkedService(Model): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -63,16 +71,20 @@ class LinkedService(Model): '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'}, } _subtype_map = { - 'type': {'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', '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', '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', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'Salesforce': 'SalesforceLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} + 'type': {'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', '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', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'Salesforce': 'SalesforceLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} } - def __init__(self, additional_properties=None, connect_via=None, description=None): + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None): super(LinkedService, self).__init__() self.additional_properties = additional_properties self.connect_via = connect_via self.description = description + self.parameters = parameters + self.annotations = annotations self.type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_reference.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_reference.py index 4df53f413ea9..bedc0f2d8fe1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_reference.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_reference.py @@ -23,6 +23,8 @@ class LinkedServiceReference(Model): :vartype type: str :param reference_name: Reference LinkedService name. :type reference_name: str + :param parameters: Arguments for LinkedService. + :type parameters: dict[str, object] """ _validation = { @@ -33,10 +35,12 @@ class LinkedServiceReference(Model): _attribute_map = { 'type': {'key': 'type', 'type': 'str'}, 'reference_name': {'key': 'referenceName', 'type': 'str'}, + 'parameters': {'key': 'parameters', 'type': '{object}'}, } type = "LinkedServiceReference" - def __init__(self, reference_name): + def __init__(self, reference_name, parameters=None): super(LinkedServiceReference, self).__init__() self.reference_name = reference_name + self.parameters = parameters diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_linked_service.py index 2078e6000927..c908668f828f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_linked_service.py @@ -23,6 +23,12 @@ class MagentoLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The URL of the Magento instance. (i.e. @@ -55,6 +61,8 @@ class MagentoLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'access_token': {'key': 'typeProperties.accessToken', 'type': 'SecretBase'}, @@ -64,8 +72,8 @@ class MagentoLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, additional_properties=None, connect_via=None, description=None, access_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(MagentoLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, access_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(MagentoLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.access_token = access_token self.use_encrypted_endpoints = use_encrypted_endpoints diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_object_dataset.py index d3634d03f20e..531ee5cea94f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_object_dataset.py @@ -29,6 +29,9 @@ class MagentoObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class MagentoObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(MagentoObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(MagentoObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'MagentoObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_error.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_error.py index 67acbc319866..642975fcf5ef 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_error.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_error.py @@ -18,6 +18,9 @@ class ManagedIntegrationRuntimeError(Model): Variables are only populated by the server, and will be ignored when sending a request. + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] :ivar time: The time when the error occurred. :vartype time: datetime :ivar code: Error code. @@ -36,14 +39,16 @@ class ManagedIntegrationRuntimeError(Model): } _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, 'time': {'key': 'time', 'type': 'iso-8601'}, 'code': {'key': 'code', 'type': 'str'}, 'parameters': {'key': 'parameters', 'type': '[str]'}, 'message': {'key': 'message', 'type': 'str'}, } - def __init__(self): + def __init__(self, additional_properties=None): super(ManagedIntegrationRuntimeError, self).__init__() + self.additional_properties = additional_properties self.time = None self.code = None self.parameters = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_node.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_node.py index 4b1bf181cf47..306b51ec9e45 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_node.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_node.py @@ -18,6 +18,9 @@ class ManagedIntegrationRuntimeNode(Model): Variables are only populated by the server, and will be ignored when sending a request. + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] :ivar node_id: The managed integration runtime node id. :vartype node_id: str :ivar status: The managed integration runtime node status. Possible values @@ -35,13 +38,15 @@ class ManagedIntegrationRuntimeNode(Model): } _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, 'node_id': {'key': 'nodeId', 'type': 'str'}, 'status': {'key': 'status', 'type': 'str'}, 'errors': {'key': 'errors', 'type': '[ManagedIntegrationRuntimeError]'}, } - def __init__(self, errors=None): + def __init__(self, additional_properties=None, errors=None): super(ManagedIntegrationRuntimeNode, self).__init__() + self.additional_properties = additional_properties self.node_id = None self.status = None self.errors = errors diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_operation_result.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_operation_result.py index eba60cf1cc4d..83dc66fbb496 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_operation_result.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_operation_result.py @@ -18,6 +18,9 @@ class ManagedIntegrationRuntimeOperationResult(Model): Variables are only populated by the server, and will be ignored when sending a request. + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] :ivar type: The operation type. Could be start or stop. :vartype type: str :ivar start_time: The start time of the operation. @@ -42,6 +45,7 @@ class ManagedIntegrationRuntimeOperationResult(Model): } _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, 'type': {'key': 'type', 'type': 'str'}, 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, 'result': {'key': 'result', 'type': 'str'}, @@ -50,8 +54,9 @@ class ManagedIntegrationRuntimeOperationResult(Model): 'activity_id': {'key': 'activityId', 'type': 'str'}, } - def __init__(self): + def __init__(self, additional_properties=None): super(ManagedIntegrationRuntimeOperationResult, self).__init__() + self.additional_properties = additional_properties self.type = None self.start_time = None self.result = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service.py index b21d3dbe2968..2e9a61f56ddc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service.py @@ -23,6 +23,12 @@ class MariaDBLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: An ODBC connection string. @@ -41,13 +47,15 @@ class MariaDBLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, connection_string=None, encrypted_credential=None): - super(MariaDBLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, connection_string=None, encrypted_credential=None): + super(MariaDBLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'MariaDB' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_table_dataset.py index 2af8566dd4cc..a0839e26cb50 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_table_dataset.py @@ -29,6 +29,9 @@ class MariaDBTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class MariaDBTableDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(MariaDBTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(MariaDBTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'MariaDBTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_linked_service.py index aacfa4763242..6a5c9796c590 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_linked_service.py @@ -23,6 +23,12 @@ class MarketoLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param endpoint: The endpoint of the Marketo server. (i.e. @@ -58,6 +64,8 @@ class MarketoLinkedService(LinkedService): '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'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, @@ -68,8 +76,8 @@ class MarketoLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, endpoint, client_id, additional_properties=None, connect_via=None, description=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(MarketoLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, endpoint, client_id, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(MarketoLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.endpoint = endpoint self.client_id = client_id self.client_secret = client_secret diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_object_dataset.py index c648284a7bb5..d83eca684f22 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_object_dataset.py @@ -29,6 +29,9 @@ class MarketoObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class MarketoObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(MarketoObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(MarketoObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'MarketoObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_collection_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_collection_dataset.py index a25676de69e8..2f8e88b06735 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_collection_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_collection_dataset.py @@ -29,6 +29,9 @@ class MongoDbCollectionDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param collection_name: The table name of the MongoDB database. Type: @@ -48,11 +51,12 @@ class MongoDbCollectionDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'collection_name': {'key': 'typeProperties.collectionName', 'type': 'object'}, } - def __init__(self, linked_service_name, collection_name, additional_properties=None, description=None, structure=None, parameters=None): - super(MongoDbCollectionDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, collection_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(MongoDbCollectionDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.collection_name = collection_name self.type = 'MongoDbCollection' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_linked_service.py index c7dfa8fa6220..d0978bab47b4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_linked_service.py @@ -23,6 +23,12 @@ class MongoDbLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param server: The IP address or server name of the MongoDB server. Type: @@ -47,6 +53,14 @@ class MongoDbLinkedService(LinkedService): for client connections. The default value is 27017. Type: integer (or Expression with resultType integer), minimum: 0. :type port: object + :param enable_ssl: Specifies whether the connections to the server are + encrypted using SSL. The default value is false. Type: boolean (or + Expression with resultType boolean). + :type enable_ssl: object + :param allow_self_signed_server_cert: Specifies whether to allow + self-signed certificates from the server. The default value is false. + Type: boolean (or Expression with resultType boolean). + :type allow_self_signed_server_cert: 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). @@ -63,6 +77,8 @@ class MongoDbLinkedService(LinkedService): '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'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, @@ -71,11 +87,13 @@ class MongoDbLinkedService(LinkedService): 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, 'auth_source': {'key': 'typeProperties.authSource', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, + 'enable_ssl': {'key': 'typeProperties.enableSsl', 'type': 'object'}, + 'allow_self_signed_server_cert': {'key': 'typeProperties.allowSelfSignedServerCert', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, server, database_name, additional_properties=None, connect_via=None, description=None, authentication_type=None, username=None, password=None, auth_source=None, port=None, encrypted_credential=None): - super(MongoDbLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, server, database_name, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, authentication_type=None, username=None, password=None, auth_source=None, port=None, enable_ssl=None, allow_self_signed_server_cert=None, encrypted_credential=None): + super(MongoDbLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.server = server self.authentication_type = authentication_type self.database_name = database_name @@ -83,5 +101,7 @@ def __init__(self, server, database_name, additional_properties=None, connect_vi self.password = password self.auth_source = auth_source self.port = port + self.enable_ssl = enable_ssl + self.allow_self_signed_server_cert = allow_self_signed_server_cert self.encrypted_credential = encrypted_credential self.type = 'MongoDb' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service.py index 71fb92d81ee3..f6f16648d036 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service.py @@ -23,6 +23,12 @@ class MySqlLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param server: Server name for connection. Type: string (or Expression @@ -55,6 +61,8 @@ class MySqlLinkedService(LinkedService): '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'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'database': {'key': 'typeProperties.database', 'type': 'object'}, @@ -64,8 +72,8 @@ class MySqlLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, schema=None, username=None, password=None, encrypted_credential=None): - super(MySqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, schema=None, username=None, password=None, encrypted_credential=None): + super(MySqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.server = server self.database = database self.schema = schema diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py index 802d99cd2fd9..8ab0af664672 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py @@ -23,6 +23,12 @@ class NetezzaLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: An ODBC connection string. @@ -41,13 +47,15 @@ class NetezzaLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, connection_string=None, encrypted_credential=None): - super(NetezzaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, connection_string=None, encrypted_credential=None): + super(NetezzaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'Netezza' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset.py index dbef5a780cb0..0f1564aa8530 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset.py @@ -29,6 +29,9 @@ class NetezzaTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class NetezzaTableDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(NetezzaTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(NetezzaTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'NetezzaTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_linked_service.py index 5b62c42d3625..8b3723629d72 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_linked_service.py @@ -23,6 +23,12 @@ class ODataLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param url: The URL of the OData service endpoint. Type: string (or @@ -52,6 +58,8 @@ class ODataLinkedService(LinkedService): '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'}, 'url': {'key': 'typeProperties.url', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, @@ -60,8 +68,8 @@ class ODataLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, url, additional_properties=None, connect_via=None, description=None, authentication_type=None, user_name=None, password=None, encrypted_credential=None): - super(ODataLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, url, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, authentication_type=None, user_name=None, password=None, encrypted_credential=None): + super(ODataLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.url = url self.authentication_type = authentication_type self.user_name = user_name diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_resource_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_resource_dataset.py index ef2b6931d446..18d6bf3cc301 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_resource_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_resource_dataset.py @@ -29,6 +29,9 @@ class ODataResourceDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param path: The OData resource path. Type: string (or Expression with @@ -47,11 +50,12 @@ class ODataResourceDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'path': {'key': 'typeProperties.path', 'type': 'object'}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, path=None): - super(ODataResourceDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, path=None): + super(ODataResourceDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.path = path self.type = 'ODataResource' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service.py index 347d8e6bc15c..09b31d48542d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service.py @@ -23,6 +23,12 @@ class OdbcLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: The non-access credential portion of the @@ -55,6 +61,8 @@ class OdbcLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'object'}, @@ -64,8 +72,8 @@ class OdbcLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, authentication_type=None, credential=None, user_name=None, password=None, encrypted_credential=None): - super(OdbcLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, authentication_type=None, credential=None, user_name=None, password=None, encrypted_credential=None): + super(OdbcLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.authentication_type = authentication_type self.credential = credential diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service.py index 0beac9df1321..b7b0ce6a0230 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service.py @@ -23,6 +23,12 @@ class OracleLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: The connection string. @@ -42,13 +48,15 @@ class OracleLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, encrypted_credential=None): - super(OracleLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, encrypted_credential=None): + super(OracleLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'Oracle' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_table_dataset.py index a11abd26d913..b9e81ec44959 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_table_dataset.py @@ -29,6 +29,9 @@ class OracleTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param table_name: The table name of the on-premises Oracle database. @@ -48,11 +51,12 @@ class OracleTableDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'table_name': {'key': 'typeProperties.tableName', 'type': 'object'}, } - def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None): - super(OracleTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(OracleTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.table_name = table_name self.type = 'OracleTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/parameter_specification.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/parameter_specification.py index 06901a0c763c..5747dc8efedf 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/parameter_specification.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/parameter_specification.py @@ -16,7 +16,7 @@ class ParameterSpecification(Model): """Definition of a single parameter for an entity. :param type: Parameter type. Possible values include: 'Object', 'String', - 'Int', 'Float', 'Bool', 'Array' + 'Int', 'Float', 'Bool', 'Array', 'SecureString' :type type: str or ~azure.mgmt.datafactory.models.ParameterType :param default_value: Default value of parameter. :type default_value: object diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_linked_service.py index 6eb623630174..c59f7146d169 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_linked_service.py @@ -23,6 +23,12 @@ class PaypalLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The URL of the PayPal instance. (i.e. api.sandbox.paypal.com) @@ -58,6 +64,8 @@ class PaypalLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, @@ -68,8 +76,8 @@ class PaypalLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, client_id, additional_properties=None, connect_via=None, description=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(PaypalLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, client_id, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(PaypalLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.client_id = client_id self.client_secret = client_secret diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_object_dataset.py index 6ad548abe52a..d65a546a2006 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_object_dataset.py @@ -29,6 +29,9 @@ class PaypalObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class PaypalObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(PaypalObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(PaypalObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'PaypalObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_linked_service.py index cee2f6182c51..e2ffa8ca2ccd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_linked_service.py @@ -23,6 +23,12 @@ class PhoenixLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The IP address or host name of the Phoenix server. (i.e. @@ -79,6 +85,8 @@ class PhoenixLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, @@ -94,8 +102,8 @@ class PhoenixLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, authentication_type, additional_properties=None, connect_via=None, description=None, port=None, http_path=None, username=None, password=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): - super(PhoenixLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, authentication_type, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, port=None, http_path=None, username=None, password=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): + super(PhoenixLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.port = port self.http_path = http_path diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_object_dataset.py index c49af465d668..c6b7e51b75b6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_object_dataset.py @@ -29,6 +29,9 @@ class PhoenixObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class PhoenixObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(PhoenixObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(PhoenixObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'PhoenixObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_resource.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_resource.py index da04ee6c7964..dedd0c1af9e6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_resource.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_resource.py @@ -38,6 +38,9 @@ class PipelineResource(SubResource): ~azure.mgmt.datafactory.models.ParameterSpecification] :param concurrency: The max number of concurrent runs for the pipeline. :type concurrency: int + :param annotations: List of tags that can be used for describing the + Pipeline. + :type annotations: list[object] """ _validation = { @@ -58,12 +61,14 @@ class PipelineResource(SubResource): 'activities': {'key': 'properties.activities', 'type': '[Activity]'}, 'parameters': {'key': 'properties.parameters', 'type': '{ParameterSpecification}'}, 'concurrency': {'key': 'properties.concurrency', 'type': 'int'}, + 'annotations': {'key': 'properties.annotations', 'type': '[object]'}, } - def __init__(self, additional_properties=None, description=None, activities=None, parameters=None, concurrency=None): + def __init__(self, additional_properties=None, description=None, activities=None, parameters=None, concurrency=None, annotations=None): super(PipelineResource, self).__init__() self.additional_properties = additional_properties self.description = description self.activities = activities self.parameters = parameters self.concurrency = concurrency + self.annotations = annotations diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service.py index 6d63e34e095c..27f23ae0e840 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service.py @@ -23,6 +23,12 @@ class PostgreSqlLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param server: Server name for connection. Type: string (or Expression @@ -55,6 +61,8 @@ class PostgreSqlLinkedService(LinkedService): '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'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'database': {'key': 'typeProperties.database', 'type': 'object'}, @@ -64,8 +72,8 @@ class PostgreSqlLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, schema=None, username=None, password=None, encrypted_credential=None): - super(PostgreSqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, schema=None, username=None, password=None, encrypted_credential=None): + super(PostgreSqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.server = server self.database = database self.schema = schema diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_linked_service.py index ed773642a2f1..6bf59ae71e6f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_linked_service.py @@ -23,6 +23,12 @@ class PrestoLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The IP address or host name of the Presto server. (i.e. @@ -84,6 +90,8 @@ class PrestoLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'server_version': {'key': 'typeProperties.serverVersion', 'type': 'object'}, @@ -101,8 +109,8 @@ class PrestoLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, server_version, catalog, authentication_type, additional_properties=None, connect_via=None, description=None, port=None, username=None, password=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, time_zone_id=None, encrypted_credential=None): - super(PrestoLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, server_version, catalog, authentication_type, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, port=None, username=None, password=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, time_zone_id=None, encrypted_credential=None): + super(PrestoLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.server_version = server_version self.catalog = catalog diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_object_dataset.py index b32c2299dab9..68034f6379bb 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_object_dataset.py @@ -29,6 +29,9 @@ class PrestoObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class PrestoObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(PrestoObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(PrestoObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'PrestoObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service.py index d7d963ea2dfd..b13c2f90f595 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service.py @@ -23,6 +23,12 @@ class QuickBooksLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param endpoint: The endpoint of the QuickBooks server. (i.e. @@ -54,6 +60,8 @@ class QuickBooksLinkedService(LinkedService): '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'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'company_id': {'key': 'typeProperties.companyId', 'type': 'object'}, @@ -63,8 +71,8 @@ class QuickBooksLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, endpoint, company_id, additional_properties=None, connect_via=None, description=None, access_token=None, access_token_secret=None, use_encrypted_endpoints=None, encrypted_credential=None): - super(QuickBooksLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, endpoint, company_id, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, access_token=None, access_token_secret=None, use_encrypted_endpoints=None, encrypted_credential=None): + super(QuickBooksLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.endpoint = endpoint self.company_id = company_id self.access_token = access_token diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_object_dataset.py index 61d3ebbb6d80..7420d28b53f3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_object_dataset.py @@ -29,6 +29,9 @@ class QuickBooksObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class QuickBooksObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(QuickBooksObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(QuickBooksObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'QuickBooksObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_table_dataset.py index c070ae2279ed..ea5cd0fe5591 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_table_dataset.py @@ -29,6 +29,9 @@ class RelationalTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param table_name: The relational table name. Type: string (or Expression @@ -47,11 +50,12 @@ class RelationalTableDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'table_name': {'key': 'typeProperties.tableName', 'type': 'object'}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, table_name=None): - super(RelationalTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, table_name=None): + super(RelationalTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.table_name = table_name self.type = 'RelationalTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_linked_service.py index 80405aa04cd3..0aeadaecafd5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_linked_service.py @@ -23,6 +23,12 @@ class SalesforceLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param environment_url: The URL of Salesforce instance. Default is @@ -54,6 +60,8 @@ class SalesforceLinkedService(LinkedService): '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'}, 'environment_url': {'key': 'typeProperties.environmentUrl', 'type': 'object'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, @@ -62,8 +70,8 @@ class SalesforceLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, environment_url=None, username=None, password=None, security_token=None, encrypted_credential=None): - super(SalesforceLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, environment_url=None, username=None, password=None, security_token=None, encrypted_credential=None): + super(SalesforceLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.environment_url = environment_url self.username = username self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_linked_service.py new file mode 100644 index 000000000000..2a178a681bd3 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_linked_service.py @@ -0,0 +1,88 @@ +# 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_service import LinkedService + + +class SalesforceMarketingCloudLinkedService(LinkedService): + """Salesforce Marketing Cloud linked service. + + :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 + Dataset. + :type annotations: list[object] + :param type: Constant filled by server. + :type type: str + :param client_id: The client ID associated with the Salesforce Marketing + Cloud application. Type: string (or Expression with resultType string). + :type client_id: object + :param client_secret: The client secret associated with the Salesforce + Marketing Cloud application. Type: string (or Expression with resultType + string). + :type client_secret: ~azure.mgmt.datafactory.models.SecretBase + :param use_encrypted_endpoints: Specifies whether the data source + endpoints are encrypted using HTTPS. The default value is true. Type: + boolean (or Expression with resultType boolean). + :type use_encrypted_endpoints: object + :param use_host_verification: Specifies whether to require the host name + in the server's certificate to match the host name of the server when + connecting over SSL. The default value is true. Type: boolean (or + Expression with resultType boolean). + :type use_host_verification: object + :param use_peer_verification: Specifies whether to verify the identity of + the server when connecting over SSL. The default value is true. Type: + boolean (or Expression with resultType boolean). + :type use_peer_verification: 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}, + 'client_id': {'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'}, + 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, + 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, + 'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'}, + 'use_host_verification': {'key': 'typeProperties.useHostVerification', 'type': 'object'}, + 'use_peer_verification': {'key': 'typeProperties.usePeerVerification', 'type': 'object'}, + 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, + } + + def __init__(self, client_id, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(SalesforceMarketingCloudLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) + self.client_id = client_id + self.client_secret = client_secret + self.use_encrypted_endpoints = use_encrypted_endpoints + self.use_host_verification = use_host_verification + self.use_peer_verification = use_peer_verification + self.encrypted_credential = encrypted_credential + self.type = 'SalesforceMarketingCloud' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_object_dataset.py new file mode 100644 index 000000000000..384042dbf082 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_object_dataset.py @@ -0,0 +1,46 @@ +# 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 .dataset import Dataset + + +class SalesforceMarketingCloudObjectDataset(Dataset): + """Salesforce Marketing Cloud dataset. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param description: Dataset description. + :type description: str + :param structure: Columns that define the structure of the dataset. Type: + array (or Expression with resultType array), itemType: DatasetDataElement. + :type structure: object + :param linked_service_name: Linked service reference. + :type linked_service_name: + ~azure.mgmt.datafactory.models.LinkedServiceReference + :param parameters: Parameters for dataset. + :type parameters: dict[str, + ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] + :param type: Constant filled by server. + :type type: str + """ + + _validation = { + 'linked_service_name': {'required': True}, + 'type': {'required': True}, + } + + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(SalesforceMarketingCloudObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) + self.type = 'SalesforceMarketingCloudObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_source.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_source.py new file mode 100644 index 000000000000..7a606977d304 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_source.py @@ -0,0 +1,50 @@ +# 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 .copy_source import CopySource + + +class SalesforceMarketingCloudSource(CopySource): + """A copy activity Salesforce Marketing Cloud source. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param source_retry_count: Source retry count. Type: integer (or + Expression with resultType integer). + :type source_retry_count: object + :param source_retry_wait: Source retry wait. Type: string (or Expression + with resultType string), pattern: + ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + :type source_retry_wait: object + :param type: Constant filled by server. + :type type: str + :param query: A query to retrieve data from source. Type: string (or + Expression with resultType string). + :type query: object + """ + + _validation = { + 'type': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'source_retry_count': {'key': 'sourceRetryCount', 'type': 'object'}, + 'source_retry_wait': {'key': 'sourceRetryWait', 'type': 'object'}, + 'type': {'key': 'type', 'type': 'str'}, + 'query': {'key': 'query', 'type': 'object'}, + } + + def __init__(self, additional_properties=None, source_retry_count=None, source_retry_wait=None, query=None): + super(SalesforceMarketingCloudSource, self).__init__(additional_properties=additional_properties, source_retry_count=source_retry_count, source_retry_wait=source_retry_wait) + self.query = query + self.type = 'SalesforceMarketingCloudSource' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_object_dataset.py index 3b0c9c3c729a..1ffed292b9cc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_object_dataset.py @@ -29,6 +29,9 @@ class SalesforceObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param object_api_name: The Salesforce object API name. Type: string (or @@ -47,11 +50,12 @@ class SalesforceObjectDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'object_api_name': {'key': 'typeProperties.objectApiName', 'type': 'object'}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, object_api_name=None): - super(SalesforceObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, object_api_name=None): + super(SalesforceObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.object_api_name = object_api_name self.type = 'SalesforceObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_bw_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_bw_linked_service.py index cb6bcc4a2b79..cc6245496b58 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_bw_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_bw_linked_service.py @@ -23,6 +23,12 @@ class SapBWLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param server: Host name of the SAP BW instance. Type: string (or @@ -58,6 +64,8 @@ class SapBWLinkedService(LinkedService): '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'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'system_number': {'key': 'typeProperties.systemNumber', 'type': 'object'}, @@ -67,8 +75,8 @@ class SapBWLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, server, system_number, client_id, additional_properties=None, connect_via=None, description=None, user_name=None, password=None, encrypted_credential=None): - super(SapBWLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, server, system_number, client_id, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, user_name=None, password=None, encrypted_credential=None): + super(SapBWLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.server = server self.system_number = system_number self.client_id = client_id diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_linked_service.py index 883425226650..9d082074ecc1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_linked_service.py @@ -23,6 +23,12 @@ class SapCloudForCustomerLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param url: The URL of SAP Cloud for Customer OData API. For example, @@ -50,6 +56,8 @@ class SapCloudForCustomerLinkedService(LinkedService): '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'}, 'url': {'key': 'typeProperties.url', 'type': 'object'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, @@ -57,8 +65,8 @@ class SapCloudForCustomerLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, url, additional_properties=None, connect_via=None, description=None, username=None, password=None, encrypted_credential=None): - super(SapCloudForCustomerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, url, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, username=None, password=None, encrypted_credential=None): + super(SapCloudForCustomerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.url = url self.username = username self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_resource_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_resource_dataset.py index 50681c0f57fa..24da7d8224cc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_resource_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_resource_dataset.py @@ -29,6 +29,9 @@ class SapCloudForCustomerResourceDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param path: The path of the SAP Cloud for Customer OData entity. Type: @@ -48,11 +51,12 @@ class SapCloudForCustomerResourceDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'path': {'key': 'typeProperties.path', 'type': 'object'}, } - def __init__(self, linked_service_name, path, additional_properties=None, description=None, structure=None, parameters=None): - super(SapCloudForCustomerResourceDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, path, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(SapCloudForCustomerResourceDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.path = path self.type = 'SapCloudForCustomerResource' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service.py index 0d11a8534e8d..b00caa936d75 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service.py @@ -23,6 +23,12 @@ class SapEccLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param url: The URL of SAP ECC OData API. For example, @@ -50,6 +56,8 @@ class SapEccLinkedService(LinkedService): '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'}, 'url': {'key': 'typeProperties.url', 'type': 'str'}, 'username': {'key': 'typeProperties.username', 'type': 'str'}, @@ -57,8 +65,8 @@ class SapEccLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'str'}, } - def __init__(self, url, additional_properties=None, connect_via=None, description=None, username=None, password=None, encrypted_credential=None): - super(SapEccLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, url, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, username=None, password=None, encrypted_credential=None): + super(SapEccLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.url = url self.username = username self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset.py index 6707cfb8c52f..9e0f4fdb5baa 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset.py @@ -29,6 +29,9 @@ class SapEccResourceDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param path: The path of the SAP ECC OData entity. Type: string (or @@ -48,11 +51,12 @@ class SapEccResourceDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'path': {'key': 'typeProperties.path', 'type': 'str'}, } - def __init__(self, linked_service_name, path, additional_properties=None, description=None, structure=None, parameters=None): - super(SapEccResourceDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, path, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(SapEccResourceDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.path = path self.type = 'SapEccResource' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_hana_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_hana_linked_service.py index 73457d3c7ac0..9a205852d841 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_hana_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_hana_linked_service.py @@ -23,6 +23,12 @@ class SapHanaLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param server: Host name of the SAP HANA server. Type: string (or @@ -52,6 +58,8 @@ class SapHanaLinkedService(LinkedService): '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'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, @@ -60,8 +68,8 @@ class SapHanaLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, server, additional_properties=None, connect_via=None, description=None, authentication_type=None, user_name=None, password=None, encrypted_credential=None): - super(SapHanaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, server, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, authentication_type=None, user_name=None, password=None, encrypted_credential=None): + super(SapHanaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.server = server self.authentication_type = authentication_type self.user_name = user_name diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_node.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_node.py index 75e8ae765574..21d23ca9f9de 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_node.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_node.py @@ -18,6 +18,9 @@ class SelfHostedIntegrationRuntimeNode(Model): Variables are only populated by the server, and will be ignored when sending a request. + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] :ivar node_name: Name of the integration runtime node. :vartype node_name: str :ivar machine_name: Machine name of the integration runtime node. @@ -92,6 +95,7 @@ class SelfHostedIntegrationRuntimeNode(Model): } _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, 'node_name': {'key': 'nodeName', 'type': 'str'}, 'machine_name': {'key': 'machineName', 'type': 'str'}, 'host_service_uri': {'key': 'hostServiceUri', 'type': 'str'}, @@ -112,8 +116,9 @@ class SelfHostedIntegrationRuntimeNode(Model): 'max_concurrent_jobs': {'key': 'maxConcurrentJobs', 'type': 'int'}, } - def __init__(self): + def __init__(self, additional_properties=None): super(SelfHostedIntegrationRuntimeNode, self).__init__() + self.additional_properties = additional_properties self.node_name = None self.machine_name = None self.host_service_uri = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service.py index 8c267f65727f..1a691c632e4f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service.py @@ -23,6 +23,12 @@ class ServiceNowLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param endpoint: The endpoint of the ServiceNow server. (i.e. @@ -68,6 +74,8 @@ class ServiceNowLinkedService(LinkedService): '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'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, @@ -81,8 +89,8 @@ class ServiceNowLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, endpoint, authentication_type, additional_properties=None, connect_via=None, description=None, username=None, password=None, client_id=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(ServiceNowLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, endpoint, authentication_type, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, username=None, password=None, client_id=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(ServiceNowLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.endpoint = endpoint self.authentication_type = authentication_type self.username = username diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_object_dataset.py index 33c4075b1c36..30564609bc8a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_object_dataset.py @@ -29,6 +29,9 @@ class ServiceNowObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class ServiceNowObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(ServiceNowObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(ServiceNowObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'ServiceNowObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sftp_server_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sftp_server_linked_service.py index bddbab1bd5bc..3e691e9378f3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sftp_server_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sftp_server_linked_service.py @@ -23,6 +23,12 @@ class SftpServerLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The SFTP server host name. Type: string (or Expression with @@ -79,6 +85,8 @@ class SftpServerLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, @@ -93,8 +101,8 @@ class SftpServerLinkedService(LinkedService): 'host_key_fingerprint': {'key': 'typeProperties.hostKeyFingerprint', 'type': 'object'}, } - def __init__(self, host, additional_properties=None, connect_via=None, description=None, port=None, authentication_type=None, user_name=None, password=None, encrypted_credential=None, private_key_path=None, private_key_content=None, pass_phrase=None, skip_host_key_validation=None, host_key_fingerprint=None): - super(SftpServerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, port=None, authentication_type=None, user_name=None, password=None, encrypted_credential=None, private_key_path=None, private_key_content=None, pass_phrase=None, skip_host_key_validation=None, host_key_fingerprint=None): + super(SftpServerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.port = port self.authentication_type = authentication_type diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_linked_service.py index 5f2c1bdad971..c6fadecfd577 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_linked_service.py @@ -23,6 +23,12 @@ class ShopifyLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The endpoint of the Shopify server. (i.e. @@ -56,6 +62,8 @@ class ShopifyLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'access_token': {'key': 'typeProperties.accessToken', 'type': 'SecretBase'}, @@ -65,8 +73,8 @@ class ShopifyLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, additional_properties=None, connect_via=None, description=None, access_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(ShopifyLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, access_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(ShopifyLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.access_token = access_token self.use_encrypted_endpoints = use_encrypted_endpoints diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_object_dataset.py index 98d0ce984286..cd68975841da 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_object_dataset.py @@ -29,6 +29,9 @@ class ShopifyObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class ShopifyObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(ShopifyObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(ShopifyObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'ShopifyObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_linked_service.py index 42842db12926..ec6464d81425 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_linked_service.py @@ -23,6 +23,12 @@ class SparkLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: IP address or host name of the Spark server @@ -85,6 +91,8 @@ class SparkLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'port': {'key': 'typeProperties.port', 'type': 'object'}, @@ -102,8 +110,8 @@ class SparkLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, port, authentication_type, additional_properties=None, connect_via=None, description=None, server_type=None, thrift_transport_protocol=None, username=None, password=None, http_path=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): - super(SparkLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, port, authentication_type, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, server_type=None, thrift_transport_protocol=None, username=None, password=None, http_path=None, enable_ssl=None, trusted_cert_path=None, use_system_trust_store=None, allow_host_name_cn_mismatch=None, allow_self_signed_server_cert=None, encrypted_credential=None): + super(SparkLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.port = port self.server_type = server_type diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_object_dataset.py index ec0f667d09a0..0f998f03375c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_object_dataset.py @@ -29,6 +29,9 @@ class SparkObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class SparkObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(SparkObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(SparkObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'SparkObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service.py index f5b12b952c5b..2356a7cce5d3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service.py @@ -23,6 +23,12 @@ class SqlServerLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: The connection string. @@ -47,6 +53,8 @@ class SqlServerLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, @@ -54,8 +62,8 @@ class SqlServerLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, user_name=None, password=None, encrypted_credential=None): - super(SqlServerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, user_name=None, password=None, encrypted_credential=None): + super(SqlServerLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.user_name = user_name self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_table_dataset.py index 42268616f1e8..4fcde4bc8df9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_table_dataset.py @@ -29,6 +29,9 @@ class SqlServerTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param table_name: The table name of the SQL Server dataset. Type: string @@ -48,11 +51,12 @@ class SqlServerTableDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'table_name': {'key': 'typeProperties.tableName', 'type': 'object'}, } - def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None): - super(SqlServerTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, table_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(SqlServerTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.table_name = table_name self.type = 'SqlServerTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_linked_service.py index 39fb2b30f6d9..bda1682c7018 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_linked_service.py @@ -23,6 +23,12 @@ class SquareLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The URL of the Square instance. (i.e. mystore.mysquare.com) @@ -62,6 +68,8 @@ class SquareLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, @@ -73,8 +81,8 @@ class SquareLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, client_id, redirect_uri, additional_properties=None, connect_via=None, description=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(SquareLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, client_id, redirect_uri, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(SquareLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.client_id = client_id self.client_secret = client_secret diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_object_dataset.py index 8fdfbe29e3d5..e6f95997d532 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_object_dataset.py @@ -29,6 +29,9 @@ class SquareObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class SquareObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(SquareObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(SquareObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'SquareObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sybase_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sybase_linked_service.py index 4f231910dae6..27d8b3d179bf 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sybase_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sybase_linked_service.py @@ -23,6 +23,12 @@ class SybaseLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param server: Server name for connection. Type: string (or Expression @@ -59,6 +65,8 @@ class SybaseLinkedService(LinkedService): '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'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'database': {'key': 'typeProperties.database', 'type': 'object'}, @@ -69,8 +77,8 @@ class SybaseLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, schema=None, authentication_type=None, username=None, password=None, encrypted_credential=None): - super(SybaseLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, schema=None, authentication_type=None, username=None, password=None, encrypted_credential=None): + super(SybaseLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.server = server self.database = database self.schema = schema diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service.py index 4c425f066aaa..7a1141496821 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service.py @@ -23,6 +23,12 @@ class TeradataLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param server: Server name for connection. Type: string (or Expression @@ -55,6 +61,8 @@ class TeradataLinkedService(LinkedService): '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'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'schema': {'key': 'typeProperties.schema', 'type': 'object'}, @@ -64,8 +72,8 @@ class TeradataLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, server, additional_properties=None, connect_via=None, description=None, schema=None, authentication_type=None, username=None, password=None, encrypted_credential=None): - super(TeradataLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, server, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, schema=None, authentication_type=None, username=None, password=None, encrypted_credential=None): + super(TeradataLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.server = server self.schema = schema self.authentication_type = authentication_type diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py index 58906ce907b3..8310c2f1b2dc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py @@ -23,6 +23,12 @@ class VerticaLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param connection_string: An ODBC connection string. @@ -41,13 +47,15 @@ class VerticaLinkedService(LinkedService): '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'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, additional_properties=None, connect_via=None, description=None, connection_string=None, encrypted_credential=None): - super(VerticaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, connection_string=None, encrypted_credential=None): + super(VerticaLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'Vertica' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset.py index 29648bf2e190..04b6c209f19f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset.py @@ -29,6 +29,9 @@ class VerticaTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class VerticaTableDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(VerticaTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(VerticaTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'VerticaTable' 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 b47d7876079a..8774e991fb03 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity.py @@ -32,7 +32,7 @@ class WebActivity(ExecutionActivity): :param policy: Activity policy. :type policy: ~azure.mgmt.datafactory.models.ActivityPolicy :param method: Rest API method for target endpoint. Possible values - include: 'GET', 'POST', 'PUT' + include: 'GET', 'POST', 'PUT', 'DELETE' :type method: str or ~azure.mgmt.datafactory.models.WebActivityMethod :param url: Web activity target endpoint and path. Type: string (or Expression with resultType string). diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_authentication.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_authentication.py index ddaefaea0b41..3f2d35b9b62e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_authentication.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_authentication.py @@ -15,7 +15,7 @@ class WebActivityAuthentication(Model): """Web activity authentication properties. - :param type: Web activity authentication (Basic/ClientCertificate) + :param type: Web activity authentication (Basic/ClientCertificate/MSI) :type type: str :param pfx: Base64-encoded contents of a PFX file. :type pfx: ~azure.mgmt.datafactory.models.SecureString @@ -24,6 +24,9 @@ class WebActivityAuthentication(Model): :type username: str :param password: Password for the PFX file or basic authentication. :type password: ~azure.mgmt.datafactory.models.SecureString + :param resource: Resource for which Azure Auth token will be requested + when using MSI Authentication. + :type resource: str """ _validation = { @@ -35,11 +38,13 @@ class WebActivityAuthentication(Model): 'pfx': {'key': 'pfx', 'type': 'SecureString'}, 'username': {'key': 'username', 'type': 'str'}, 'password': {'key': 'password', 'type': 'SecureString'}, + 'resource': {'key': 'resource', 'type': 'str'}, } - def __init__(self, type, pfx=None, username=None, password=None): + def __init__(self, type, pfx=None, username=None, password=None, resource=None): super(WebActivityAuthentication, self).__init__() self.type = type self.pfx = pfx self.username = username self.password = password + self.resource = resource diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_linked_service.py index 174b543a8f83..a4eb3f8a16a5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_linked_service.py @@ -23,6 +23,12 @@ class WebLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param type_properties: Web linked service properties. @@ -39,11 +45,13 @@ class WebLinkedService(LinkedService): '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'}, 'type_properties': {'key': 'typeProperties', 'type': 'WebLinkedServiceTypeProperties'}, } - def __init__(self, type_properties, additional_properties=None, connect_via=None, description=None): - super(WebLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, type_properties, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None): + super(WebLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.type_properties = type_properties self.type = 'Web' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_table_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_table_dataset.py index 277029d5af07..aba15558471a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_table_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_table_dataset.py @@ -29,6 +29,9 @@ class WebTableDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param index: The zero-based index of the table in the web page. Type: @@ -51,13 +54,14 @@ class WebTableDataset(Dataset): 'structure': {'key': 'structure', 'type': 'object'}, 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'index': {'key': 'typeProperties.index', 'type': 'object'}, 'path': {'key': 'typeProperties.path', 'type': 'object'}, } - def __init__(self, linked_service_name, index, additional_properties=None, description=None, structure=None, parameters=None, path=None): - super(WebTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, index, additional_properties=None, description=None, structure=None, parameters=None, annotations=None, path=None): + super(WebTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.index = index self.path = path self.type = 'WebTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_linked_service.py index 7e5710b93322..0451a3b175f7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_linked_service.py @@ -23,6 +23,12 @@ class XeroLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param host: The endpoint of the Xero server. (i.e. api.xero.com) @@ -60,6 +66,8 @@ class XeroLinkedService(LinkedService): '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'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'consumer_key': {'key': 'typeProperties.consumerKey', 'type': 'SecretBase'}, @@ -70,8 +78,8 @@ class XeroLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, host, additional_properties=None, connect_via=None, description=None, consumer_key=None, private_key=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(XeroLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, host, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, consumer_key=None, private_key=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(XeroLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.host = host self.consumer_key = consumer_key self.private_key = private_key diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_object_dataset.py index ac9cc7f3b547..128e7e34e5b0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_object_dataset.py @@ -29,6 +29,9 @@ class XeroObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class XeroObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(XeroObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(XeroObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'XeroObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_linked_service.py index 83ff6d03d9d6..56a265798762 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_linked_service.py @@ -23,6 +23,12 @@ class ZohoLinkedService(LinkedService): ~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 + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str :param endpoint: The endpoint of the Zoho server. (i.e. @@ -55,6 +61,8 @@ class ZohoLinkedService(LinkedService): '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'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'access_token': {'key': 'typeProperties.accessToken', 'type': 'SecretBase'}, @@ -64,8 +72,8 @@ class ZohoLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, endpoint, additional_properties=None, connect_via=None, description=None, access_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): - super(ZohoLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description) + def __init__(self, endpoint, additional_properties=None, connect_via=None, description=None, parameters=None, annotations=None, access_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None): + super(ZohoLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations) self.endpoint = endpoint self.access_token = access_token self.use_encrypted_endpoints = use_encrypted_endpoints diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_object_dataset.py index d3574660b695..b742050b6948 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_object_dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_object_dataset.py @@ -29,6 +29,9 @@ class ZohoObjectDataset(Dataset): :param parameters: Parameters for dataset. :type parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] :param type: Constant filled by server. :type type: str """ @@ -38,6 +41,6 @@ class ZohoObjectDataset(Dataset): 'type': {'required': True}, } - def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None): - super(ZohoObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + def __init__(self, linked_service_name, additional_properties=None, description=None, structure=None, parameters=None, annotations=None): + super(ZohoObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations) self.type = 'ZohoObject' 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 4c69018289e5..3cf6354d05f6 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 @@ -21,7 +21,7 @@ class ActivityRunsOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -71,7 +71,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns/{runId}/activityruns' + 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\._\(\)]+$'), @@ -125,3 +125,4 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_by_pipeline_run.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns/{runId}/activityruns'} 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 8311f6f42b0c..9179f1e9dc95 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/datasets_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/datasets_operations.py @@ -21,7 +21,7 @@ class DatasetsOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -59,7 +59,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/datasets' + url = self.list_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\._\(\)]+$'), @@ -104,6 +104,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_by_factory.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/datasets'} def create_or_update( self, resource_group_name, factory_name, dataset_name, properties, if_match=None, custom_headers=None, raw=False, **operation_config): @@ -135,7 +136,7 @@ def create_or_update( dataset = models.DatasetResource(properties=properties) # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/datasets/{datasetName}' + url = self.create_or_update.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\._\(\)]+$'), @@ -181,6 +182,7 @@ def create_or_update( return client_raw_response return deserialized + 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): @@ -204,7 +206,7 @@ def get( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/datasets/{datasetName}' + url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), @@ -244,6 +246,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/datasets/{datasetName}'} def delete( self, resource_group_name, factory_name, dataset_name, custom_headers=None, raw=False, **operation_config): @@ -266,7 +269,7 @@ def delete( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/datasets/{datasetName}' + url = self.delete.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\._\(\)]+$'), @@ -299,3 +302,4 @@ def delete( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/datasets/{datasetName}'} 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 45fa6b5971bc..2714690eda35 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/factories_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/factories_operations.py @@ -21,7 +21,7 @@ class FactoriesOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -55,7 +55,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/factories' + url = self.list.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -98,6 +98,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/factories'} def list_by_resource_group( self, resource_group_name, custom_headers=None, raw=False, **operation_config): @@ -120,7 +121,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories' + url = self.list_by_resource_group.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$') @@ -164,6 +165,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + 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): @@ -187,7 +189,7 @@ def create_or_update( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}' + url = self.create_or_update.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\._\(\)]+$'), @@ -230,6 +232,7 @@ def create_or_update( return client_raw_response return deserialized + create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} def update( self, resource_group_name, factory_name, tags=None, identity=None, custom_headers=None, raw=False, **operation_config): @@ -257,7 +260,7 @@ def update( factory_update_parameters = models.FactoryUpdateParameters(tags=tags, identity=identity) # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}' + url = self.update.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\._\(\)]+$'), @@ -300,6 +303,7 @@ def update( return client_raw_response return deserialized + 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): @@ -321,7 +325,7 @@ def get( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}' + url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), @@ -360,6 +364,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}'} def delete( self, resource_group_name, factory_name, custom_headers=None, raw=False, **operation_config): @@ -380,7 +385,7 @@ def delete( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}' + url = self.delete.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\._\(\)]+$'), @@ -412,6 +417,7 @@ def delete( 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): @@ -434,7 +440,7 @@ def cancel_pipeline_run( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/cancelpipelinerun/{runId}' + 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\._\(\)]+$'), @@ -467,3 +473,4 @@ def cancel_pipeline_run( 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 fbbfa83d834c..d1cc12ef640d 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 @@ -21,7 +21,7 @@ class IntegrationRuntimeNodesOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -59,7 +59,7 @@ def delete( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/nodes/{nodeName}' + url = self.delete.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\._\(\)]+$'), @@ -93,6 +93,7 @@ def delete( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/nodes/{nodeName}'} def update( self, resource_group_name, factory_name, integration_runtime_name, node_name, concurrent_jobs_limit=None, custom_headers=None, raw=False, **operation_config): @@ -126,7 +127,7 @@ def update( update_integration_runtime_node_request = models.UpdateIntegrationRuntimeNodeRequest(concurrent_jobs_limit=concurrent_jobs_limit) # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/nodes/{nodeName}' + url = self.update.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\._\(\)]+$'), @@ -171,6 +172,7 @@ def update( return client_raw_response return deserialized + update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/nodes/{nodeName}'} def get_ip_address( self, resource_group_name, factory_name, integration_runtime_name, node_name, custom_headers=None, raw=False, **operation_config): @@ -197,7 +199,7 @@ def get_ip_address( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/nodes/{nodeName}/ipAddress' + url = self.get_ip_address.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\._\(\)]+$'), @@ -238,3 +240,4 @@ def get_ip_address( return client_raw_response return deserialized + get_ip_address.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/nodes/{nodeName}/ipAddress'} 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 f1473d380de0..3cc1ef61e744 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 @@ -23,7 +23,7 @@ class IntegrationRuntimesOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -61,7 +61,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes' + url = self.list_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\._\(\)]+$'), @@ -106,6 +106,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_by_factory.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes'} def create_or_update( self, resource_group_name, factory_name, integration_runtime_name, properties, if_match=None, custom_headers=None, raw=False, **operation_config): @@ -137,7 +138,7 @@ def create_or_update( integration_runtime = models.IntegrationRuntimeResource(properties=properties) # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}' + url = self.create_or_update.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\._\(\)]+$'), @@ -183,6 +184,7 @@ def create_or_update( return client_raw_response return deserialized + 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): @@ -206,7 +208,7 @@ def get( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}' + url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), @@ -246,6 +248,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}'} def update( self, resource_group_name, factory_name, integration_runtime_name, auto_update=None, update_delay_offset=None, custom_headers=None, raw=False, **operation_config): @@ -283,7 +286,7 @@ def update( update_integration_runtime_request = models.UpdateIntegrationRuntimeRequest(auto_update=auto_update, update_delay_offset=update_delay_offset) # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}' + url = self.update.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\._\(\)]+$'), @@ -327,6 +330,7 @@ def update( return client_raw_response return deserialized + update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}'} def delete( self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): @@ -349,7 +353,7 @@ def delete( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}' + url = self.delete.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\._\(\)]+$'), @@ -382,6 +386,7 @@ def delete( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}'} def get_status( self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): @@ -407,7 +412,7 @@ def get_status( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/getStatus' + url = self.get_status.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\._\(\)]+$'), @@ -447,6 +452,7 @@ def get_status( return client_raw_response return deserialized + get_status.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/getStatus'} def get_connection_info( self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): @@ -473,7 +479,7 @@ def get_connection_info( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/getConnectionInfo' + url = self.get_connection_info.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\._\(\)]+$'), @@ -513,6 +519,7 @@ def get_connection_info( return client_raw_response return deserialized + get_connection_info.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/getConnectionInfo'} def regenerate_auth_key( self, resource_group_name, factory_name, integration_runtime_name, key_name=None, custom_headers=None, raw=False, **operation_config): @@ -542,7 +549,7 @@ def regenerate_auth_key( regenerate_key_parameters = models.IntegrationRuntimeRegenerateKeyParameters(key_name=key_name) # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/regenerateAuthKey' + url = self.regenerate_auth_key.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\._\(\)]+$'), @@ -586,6 +593,7 @@ def regenerate_auth_key( return client_raw_response return deserialized + regenerate_auth_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/regenerateAuthKey'} def list_auth_keys( self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): @@ -609,7 +617,7 @@ def list_auth_keys( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/listAuthKeys' + url = self.list_auth_keys.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\._\(\)]+$'), @@ -649,12 +657,13 @@ def list_auth_keys( return client_raw_response return deserialized + list_auth_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/listAuthKeys'} def _start_initial( self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/start' + url = self.start.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\._\(\)]+$'), @@ -760,12 +769,13 @@ def get_long_running_output(response): return AzureOperationPoller( long_running_send, get_long_running_output, get_long_running_status, long_running_operation_timeout) + start.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/start'} def _stop_initial( self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/stop' + url = self.stop.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\._\(\)]+$'), @@ -859,6 +869,7 @@ def get_long_running_output(response): return AzureOperationPoller( long_running_send, get_long_running_output, get_long_running_status, long_running_operation_timeout) + 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): @@ -888,7 +899,7 @@ def remove_node( remove_node_parameters = models.IntegrationRuntimeRemoveNodeRequest(additional_properties=additional_properties, node_name=node_name) # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/removeNode' + 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\._\(\)]+$'), @@ -925,6 +936,7 @@ def remove_node( 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): @@ -952,7 +964,7 @@ def sync_credentials( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/syncCredentials' + url = self.sync_credentials.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\._\(\)]+$'), @@ -985,6 +997,7 @@ def sync_credentials( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response + sync_credentials.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/syncCredentials'} def get_monitoring_data( self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): @@ -1011,7 +1024,7 @@ def get_monitoring_data( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/monitoringData' + url = self.get_monitoring_data.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\._\(\)]+$'), @@ -1051,6 +1064,7 @@ def get_monitoring_data( return client_raw_response return deserialized + get_monitoring_data.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/monitoringData'} def upgrade( self, resource_group_name, factory_name, integration_runtime_name, custom_headers=None, raw=False, **operation_config): @@ -1073,7 +1087,7 @@ def upgrade( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/upgrade' + url = self.upgrade.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\._\(\)]+$'), @@ -1106,3 +1120,4 @@ def upgrade( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response + upgrade.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/upgrade'} 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 f3e59d34a5c6..93a9eb3dd631 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 @@ -21,7 +21,7 @@ class LinkedServicesOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -59,7 +59,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/linkedservices' + url = self.list_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\._\(\)]+$'), @@ -104,6 +104,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_by_factory.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/linkedservices'} def create_or_update( self, resource_group_name, factory_name, linked_service_name, properties, if_match=None, custom_headers=None, raw=False, **operation_config): @@ -135,7 +136,7 @@ def create_or_update( linked_service = models.LinkedServiceResource(properties=properties) # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/linkedservices/{linkedServiceName}' + url = self.create_or_update.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\._\(\)]+$'), @@ -181,6 +182,7 @@ def create_or_update( return client_raw_response return deserialized + 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): @@ -204,7 +206,7 @@ def get( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/linkedservices/{linkedServiceName}' + url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), @@ -244,6 +246,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/linkedservices/{linkedServiceName}'} def delete( self, resource_group_name, factory_name, linked_service_name, custom_headers=None, raw=False, **operation_config): @@ -266,7 +269,7 @@ def delete( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/linkedservices/{linkedServiceName}' + url = self.delete.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\._\(\)]+$'), @@ -299,3 +302,4 @@ def delete( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/linkedservices/{linkedServiceName}'} diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/operations.py index c2f3733f27b6..5e3dbd283530 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/operations.py @@ -21,7 +21,7 @@ class Operations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -52,7 +52,7 @@ def list( :class:`ErrorResponseException` """ # Construct URL - url = '/providers/Microsoft.DataFactory/operations' + url = self.list.metadata['url'] # Construct parameters query_parameters = {} @@ -85,3 +85,4 @@ def list( return client_raw_response return deserialized + list.metadata = {'url': '/providers/Microsoft.DataFactory/operations'} 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 c7577edc0369..70daad3a45f8 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 @@ -21,7 +21,7 @@ class PipelineRunsOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -59,7 +59,7 @@ def query_by_factory( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns' + 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\._\(\)]+$'), @@ -102,6 +102,7 @@ def query_by_factory( return client_raw_response return deserialized + query_by_factory.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns'} def get( self, resource_group_name, factory_name, run_id, custom_headers=None, raw=False, **operation_config): @@ -125,7 +126,7 @@ def get( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns/{runId}' + url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), @@ -165,3 +166,4 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns/{runId}'} 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 7137ad00e314..5dbca8f0a008 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipelines_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipelines_operations.py @@ -21,7 +21,7 @@ class PipelinesOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -59,7 +59,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines' + url = self.list_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\._\(\)]+$'), @@ -104,6 +104,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_by_factory.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines'} def create_or_update( self, resource_group_name, factory_name, pipeline_name, pipeline, if_match=None, custom_headers=None, raw=False, **operation_config): @@ -133,7 +134,7 @@ def create_or_update( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines/{pipelineName}' + url = self.create_or_update.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\._\(\)]+$'), @@ -179,6 +180,7 @@ def create_or_update( return client_raw_response return deserialized + 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): @@ -202,7 +204,7 @@ def get( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines/{pipelineName}' + url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), @@ -242,6 +244,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines/{pipelineName}'} def delete( self, resource_group_name, factory_name, pipeline_name, custom_headers=None, raw=False, **operation_config): @@ -264,7 +267,7 @@ def delete( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines/{pipelineName}' + url = self.delete.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\._\(\)]+$'), @@ -297,6 +300,7 @@ def delete( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response + 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): @@ -322,7 +326,7 @@ def create_run( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines/{pipelineName}/createRun' + url = self.create_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\._\(\)]+$'), @@ -369,3 +373,4 @@ def create_run( return client_raw_response return deserialized + create_run.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelines/{pipelineName}/createRun'} 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 e108b9aa2cdb..60482647dd80 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/triggers_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/triggers_operations.py @@ -23,7 +23,7 @@ class TriggersOperations(object): :param client: Client for service requests. :param config: Configuration of service client. :param serializer: An object model serializer. - :param deserializer: An objec model deserializer. + :param deserializer: An object model deserializer. :ivar api_version: The API version. Constant value: "2017-09-01-preview". """ @@ -61,7 +61,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers' + url = self.list_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\._\(\)]+$'), @@ -106,6 +106,7 @@ def internal_paging(next_link=None, raw=False): return client_raw_response return deserialized + list_by_factory.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers'} def create_or_update( self, resource_group_name, factory_name, trigger_name, properties, if_match=None, custom_headers=None, raw=False, **operation_config): @@ -137,7 +138,7 @@ def create_or_update( trigger = models.TriggerResource(properties=properties) # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}' + url = self.create_or_update.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\._\(\)]+$'), @@ -183,6 +184,7 @@ def create_or_update( return client_raw_response return deserialized + 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): @@ -206,7 +208,7 @@ def get( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}' + url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), @@ -246,6 +248,7 @@ def get( return client_raw_response return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}'} def delete( self, resource_group_name, factory_name, trigger_name, custom_headers=None, raw=False, **operation_config): @@ -268,7 +271,7 @@ def delete( :class:`ErrorResponseException` """ # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}' + url = self.delete.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\._\(\)]+$'), @@ -301,12 +304,13 @@ def delete( if raw: client_raw_response = ClientRawResponse(None, response) return client_raw_response + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}'} def _start_initial( self, resource_group_name, factory_name, trigger_name, custom_headers=None, raw=False, **operation_config): # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/start' + url = self.start.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\._\(\)]+$'), @@ -400,12 +404,13 @@ def get_long_running_output(response): return AzureOperationPoller( long_running_send, get_long_running_output, get_long_running_status, long_running_operation_timeout) + start.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/start'} def _stop_initial( self, resource_group_name, factory_name, trigger_name, custom_headers=None, raw=False, **operation_config): # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/stop' + url = self.stop.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\._\(\)]+$'), @@ -499,6 +504,7 @@ def get_long_running_output(response): return AzureOperationPoller( long_running_send, get_long_running_output, get_long_running_status, long_running_operation_timeout) + 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): @@ -529,7 +535,7 @@ def internal_paging(next_link=None, raw=False): if not next_link: # Construct URL - url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/triggerruns' + 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\._\(\)]+$'), @@ -577,3 +583,4 @@ def internal_paging(next_link=None, raw=False): 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 266f5a486d79..5a7feab42d26 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.5.0" +VERSION = "0.6.0"