From 344416255f4a425c96581075ae2256d8c28de524 Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Tue, 13 Feb 2018 08:01:17 -0800 Subject: [PATCH 1/4] ADF after https://github.com/Azure/azure-rest-api-specs/pull/2473 --- .../azure/mgmt/datafactory/models/__init__.py | 30 +++++++++ .../models/azure_batch_linked_service.py | 4 +- ...zure_data_lake_analytics_linked_service.py | 4 +- .../models/azure_ml_linked_service.py | 8 +-- .../azure_sql_database_linked_service.py | 18 ++++- .../models/azure_sql_dw_linked_service.py | 18 ++++- .../mgmt/datafactory/models/copy_source.py | 21 +++--- .../data_factory_management_client_enums.py | 6 ++ .../azure/mgmt/datafactory/models/dataset.py | 13 ++-- .../models/google_big_query_linked_service.py | 12 +++- .../models/hd_insight_linked_service.py | 4 +- .../hd_insight_on_demand_linked_service.py | 12 ++-- .../datafactory/models/hive_linked_service.py | 4 +- ..._runtime_custom_setup_script_properties.py | 33 ++++++++++ .../integration_runtime_ssis_properties.py | 14 +++- .../models/integration_runtime_status.py | 6 ++ .../models/linked_integration_runtime.py | 58 ++++++++++++++++ .../models/linked_integration_runtime_key.py | 37 +++++++++++ .../linked_integration_runtime_properties.py | 39 +++++++++++ .../models/linked_integration_runtime_rbac.py | 38 +++++++++++ .../mgmt/datafactory/models/linked_service.py | 48 +++++++------- .../managed_integration_runtime_status.py | 5 ++ .../models/netezza_linked_service.py | 53 +++++++++++++++ .../mgmt/datafactory/models/netezza_source.py | 50 ++++++++++++++ .../models/netezza_table_dataset.py | 43 ++++++++++++ .../models/sap_ecc_linked_service.py | 66 +++++++++++++++++++ .../models/sap_ecc_resource_dataset.py | 58 ++++++++++++++++ .../mgmt/datafactory/models/sap_ecc_source.py | 50 ++++++++++++++ .../models/self_hosted_integration_runtime.py | 13 +++- .../self_hosted_integration_runtime_status.py | 12 +++- .../models/vertica_linked_service.py | 53 +++++++++++++++ .../mgmt/datafactory/models/vertica_source.py | 50 ++++++++++++++ .../models/vertica_table_dataset.py | 43 ++++++++++++ .../models/web_basic_authentication.py | 4 +- .../web_client_certificate_authentication.py | 8 +-- .../azure/mgmt/datafactory/version.py | 2 +- 36 files changed, 866 insertions(+), 71 deletions(-) create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_custom_setup_script_properties.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_source.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_source.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_source.py create mode 100644 azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset.py diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py index 187d0a962945..5dc9afab940c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py @@ -59,6 +59,8 @@ from .operation_list_response import OperationListResponse from .azure_data_lake_analytics_linked_service import AzureDataLakeAnalyticsLinkedService from .hd_insight_on_demand_linked_service import HDInsightOnDemandLinkedService +from .netezza_linked_service import NetezzaLinkedService +from .vertica_linked_service import VerticaLinkedService from .zoho_linked_service import ZohoLinkedService from .xero_linked_service import XeroLinkedService from .square_linked_service import SquareLinkedService @@ -94,6 +96,7 @@ from .custom_data_source_linked_service import CustomDataSourceLinkedService from .amazon_redshift_linked_service import AmazonRedshiftLinkedService from .amazon_s3_linked_service import AmazonS3LinkedService +from .sap_ecc_linked_service import SapEccLinkedService from .sap_cloud_for_customer_linked_service import SapCloudForCustomerLinkedService from .salesforce_linked_service import SalesforceLinkedService from .azure_data_lake_store_linked_service import AzureDataLakeStoreLinkedService @@ -125,6 +128,8 @@ from .sql_server_linked_service import SqlServerLinkedService from .azure_sql_dw_linked_service import AzureSqlDWLinkedService from .azure_storage_linked_service import AzureStorageLinkedService +from .vertica_table_dataset import VerticaTableDataset +from .netezza_table_dataset import NetezzaTableDataset from .zoho_object_dataset import ZohoObjectDataset from .xero_object_dataset import XeroObjectDataset from .square_object_dataset import SquareObjectDataset @@ -166,6 +171,7 @@ from .azure_search_index_dataset import AzureSearchIndexDataset from .web_table_dataset import WebTableDataset from .sql_server_table_dataset import SqlServerTableDataset +from .sap_ecc_resource_dataset import SapEccResourceDataset from .sap_cloud_for_customer_resource_dataset import SapCloudForCustomerResourceDataset from .salesforce_object_dataset import SalesforceObjectDataset from .relational_table_dataset import RelationalTableDataset @@ -202,6 +208,8 @@ from .web_activity import WebActivity from .redshift_unload_settings import RedshiftUnloadSettings from .amazon_redshift_source import AmazonRedshiftSource +from .vertica_source import VerticaSource +from .netezza_source import NetezzaSource from .zoho_source import ZohoSource from .xero_source import XeroSource from .square_source import SquareSource @@ -241,6 +249,7 @@ from .sql_dw_source import SqlDWSource from .stored_procedure_parameter import StoredProcedureParameter from .sql_source import SqlSource +from .sap_ecc_source import SapEccSource from .sap_cloud_for_customer_source import SapCloudForCustomerSource from .salesforce_source import SalesforceSource from .relational_source import RelationalSource @@ -288,13 +297,18 @@ from .if_condition_activity import IfConditionActivity from .execute_pipeline_activity import ExecutePipelineActivity from .control_activity import ControlActivity +from .linked_integration_runtime import LinkedIntegrationRuntime from .self_hosted_integration_runtime_node import SelfHostedIntegrationRuntimeNode from .self_hosted_integration_runtime_status import SelfHostedIntegrationRuntimeStatus from .managed_integration_runtime_operation_result import ManagedIntegrationRuntimeOperationResult from .managed_integration_runtime_error import ManagedIntegrationRuntimeError from .managed_integration_runtime_node import ManagedIntegrationRuntimeNode from .managed_integration_runtime_status import ManagedIntegrationRuntimeStatus +from .linked_integration_runtime_rbac import LinkedIntegrationRuntimeRbac +from .linked_integration_runtime_key import LinkedIntegrationRuntimeKey +from .linked_integration_runtime_properties import LinkedIntegrationRuntimeProperties from .self_hosted_integration_runtime import SelfHostedIntegrationRuntime +from .integration_runtime_custom_setup_script_properties import IntegrationRuntimeCustomSetupScriptProperties from .integration_runtime_ssis_catalog_info import IntegrationRuntimeSsisCatalogInfo from .integration_runtime_ssis_properties import IntegrationRuntimeSsisProperties from .integration_runtime_vnet_properties import IntegrationRuntimeVNetProperties @@ -371,6 +385,7 @@ ManagedIntegrationRuntimeNodeStatus, IntegrationRuntimeSsisCatalogPricingTier, IntegrationRuntimeLicenseType, + IntegrationRuntimeEdition, IntegrationRuntimeAuthKeyName, ) @@ -425,6 +440,8 @@ 'OperationListResponse', 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemandLinkedService', + 'NetezzaLinkedService', + 'VerticaLinkedService', 'ZohoLinkedService', 'XeroLinkedService', 'SquareLinkedService', @@ -460,6 +477,7 @@ 'CustomDataSourceLinkedService', 'AmazonRedshiftLinkedService', 'AmazonS3LinkedService', + 'SapEccLinkedService', 'SapCloudForCustomerLinkedService', 'SalesforceLinkedService', 'AzureDataLakeStoreLinkedService', @@ -491,6 +509,8 @@ 'SqlServerLinkedService', 'AzureSqlDWLinkedService', 'AzureStorageLinkedService', + 'VerticaTableDataset', + 'NetezzaTableDataset', 'ZohoObjectDataset', 'XeroObjectDataset', 'SquareObjectDataset', @@ -532,6 +552,7 @@ 'AzureSearchIndexDataset', 'WebTableDataset', 'SqlServerTableDataset', + 'SapEccResourceDataset', 'SapCloudForCustomerResourceDataset', 'SalesforceObjectDataset', 'RelationalTableDataset', @@ -568,6 +589,8 @@ 'WebActivity', 'RedshiftUnloadSettings', 'AmazonRedshiftSource', + 'VerticaSource', + 'NetezzaSource', 'ZohoSource', 'XeroSource', 'SquareSource', @@ -607,6 +630,7 @@ 'SqlDWSource', 'StoredProcedureParameter', 'SqlSource', + 'SapEccSource', 'SapCloudForCustomerSource', 'SalesforceSource', 'RelationalSource', @@ -654,13 +678,18 @@ 'IfConditionActivity', 'ExecutePipelineActivity', 'ControlActivity', + 'LinkedIntegrationRuntime', 'SelfHostedIntegrationRuntimeNode', 'SelfHostedIntegrationRuntimeStatus', 'ManagedIntegrationRuntimeOperationResult', 'ManagedIntegrationRuntimeError', 'ManagedIntegrationRuntimeNode', 'ManagedIntegrationRuntimeStatus', + 'LinkedIntegrationRuntimeRbac', + 'LinkedIntegrationRuntimeKey', + 'LinkedIntegrationRuntimeProperties', 'SelfHostedIntegrationRuntime', + 'IntegrationRuntimeCustomSetupScriptProperties', 'IntegrationRuntimeSsisCatalogInfo', 'IntegrationRuntimeSsisProperties', 'IntegrationRuntimeVNetProperties', @@ -736,5 +765,6 @@ 'ManagedIntegrationRuntimeNodeStatus', 'IntegrationRuntimeSsisCatalogPricingTier', 'IntegrationRuntimeLicenseType', + 'IntegrationRuntimeEdition', 'IntegrationRuntimeAuthKeyName', ] 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 f8985bd84a06..6b802862a960 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 @@ -29,7 +29,7 @@ class AzureBatchLinkedService(LinkedService): Expression with resultType string). :type account_name: object :param access_key: The Azure Batch account access key. - :type access_key: ~azure.mgmt.datafactory.models.SecureString + :type access_key: ~azure.mgmt.datafactory.models.SecretBase :param batch_uri: The Azure Batch URI. Type: string (or Expression with resultType string). :type batch_uri: object @@ -59,7 +59,7 @@ class AzureBatchLinkedService(LinkedService): 'description': {'key': 'description', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'account_name': {'key': 'typeProperties.accountName', 'type': 'object'}, - 'access_key': {'key': 'typeProperties.accessKey', 'type': 'SecureString'}, + 'access_key': {'key': 'typeProperties.accessKey', 'type': 'SecretBase'}, 'batch_uri': {'key': 'typeProperties.batchUri', 'type': 'object'}, 'pool_name': {'key': 'typeProperties.poolName', 'type': 'object'}, 'linked_service_name': {'key': 'typeProperties.linkedServiceName', 'type': 'LinkedServiceReference'}, 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 47bdf3a94cc3..da1a8cb676ca 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 @@ -34,7 +34,7 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService): :type service_principal_id: object :param service_principal_key: The Key of the application used to authenticate against the Azure Data Lake Analytics account. - :type service_principal_key: ~azure.mgmt.datafactory.models.SecureString + :type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase :param tenant: The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string). :type tenant: object @@ -68,7 +68,7 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService): 'type': {'key': 'type', 'type': 'str'}, 'account_name': {'key': 'typeProperties.accountName', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, - 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecureString'}, + 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, 'subscription_id': {'key': 'typeProperties.subscriptionId', 'type': 'object'}, 'resource_group_name': {'key': 'typeProperties.resourceGroupName', 'type': 'object'}, 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 ac65d5a0ff1a..39d8d0fe1235 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 @@ -29,7 +29,7 @@ class AzureMLLinkedService(LinkedService): Service endpoint. Type: string (or Expression with resultType string). :type ml_endpoint: object :param api_key: The API key for accessing the Azure ML model endpoint. - :type api_key: ~azure.mgmt.datafactory.models.SecureString + :type api_key: ~azure.mgmt.datafactory.models.SecretBase :param update_resource_endpoint: The Update Resource REST URL for an Azure ML Web Service endpoint. Type: string (or Expression with resultType string). @@ -41,7 +41,7 @@ class AzureMLLinkedService(LinkedService): :param service_principal_key: The key of the service principal used to authenticate against the ARM-based updateResourceEndpoint of an Azure ML web service. - :type service_principal_key: ~azure.mgmt.datafactory.models.SecureString + :type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase :param tenant: The name or ID of the tenant to which the service principal belongs. Type: string (or Expression with resultType string). :type tenant: object @@ -63,10 +63,10 @@ class AzureMLLinkedService(LinkedService): 'description': {'key': 'description', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'ml_endpoint': {'key': 'typeProperties.mlEndpoint', 'type': 'object'}, - 'api_key': {'key': 'typeProperties.apiKey', 'type': 'SecureString'}, + 'api_key': {'key': 'typeProperties.apiKey', 'type': 'SecretBase'}, 'update_resource_endpoint': {'key': 'typeProperties.updateResourceEndpoint', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, - 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecureString'}, + 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } 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 9aedd8d78500..9bf552fa9c18 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 @@ -27,6 +27,16 @@ class AzureSqlDatabaseLinkedService(LinkedService): :type type: str :param connection_string: The connection string. :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param service_principal_id: The ID of the service principal used to + authenticate against Azure SQL Database. Type: string (or Expression with + resultType string). + :type service_principal_id: object + :param service_principal_key: The key of the service principal used to + authenticate against Azure SQL Database. + :type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase + :param tenant: The name or ID of the tenant to which the service principal + belongs. Type: string (or Expression with resultType string). + :type tenant: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -44,11 +54,17 @@ class AzureSqlDatabaseLinkedService(LinkedService): 'description': {'key': 'description', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, + 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, + 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, encrypted_credential=None): + 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) self.connection_string = connection_string + self.service_principal_id = service_principal_id + self.service_principal_key = service_principal_key + self.tenant = tenant self.encrypted_credential = encrypted_credential self.type = 'AzureSqlDatabase' 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 11e35e991676..af6e9cd9d17f 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 @@ -27,6 +27,16 @@ class AzureSqlDWLinkedService(LinkedService): :type type: str :param connection_string: The connection string. :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param service_principal_id: The ID of the service principal used to + authenticate against Azure SQL Data Warehouse. Type: string (or Expression + with resultType string). + :type service_principal_id: object + :param service_principal_key: The key of the service principal used to + authenticate against Azure SQL Data Warehouse. + :type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase + :param tenant: The name or ID of the tenant to which the service principal + belongs. Type: string (or Expression with resultType string). + :type tenant: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -44,11 +54,17 @@ class AzureSqlDWLinkedService(LinkedService): 'description': {'key': 'description', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, + 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, + 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, connection_string, additional_properties=None, connect_via=None, description=None, encrypted_credential=None): + 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) self.connection_string = connection_string + self.service_principal_id = service_principal_id + self.service_principal_key = service_principal_key + self.tenant = tenant self.encrypted_credential = encrypted_credential self.type = 'AzureSqlDW' 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 1f9b7bd634cb..c808083d9330 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py @@ -16,17 +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, 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, + 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, SapCloudForCustomerSource, SalesforceSource, RelationalSource, - DynamicsSource, DocumentDbCollectionSource, BlobSource, AzureTableSource + SqlSource, SapEccSource, SapCloudForCustomerSource, SalesforceSource, + RelationalSource, DynamicsSource, DocumentDbCollectionSource, BlobSource, + AzureTableSource :param additional_properties: Unmatched properties from the message are deserialized this collection @@ -54,7 +55,7 @@ class CopySource(Model): } _subtype_map = { - 'type': {'AmazonRedshiftSource': 'AmazonRedshiftSource', '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', 'SapCloudForCustomerSource': 'SapCloudForCustomerSource', 'SalesforceSource': 'SalesforceSource', 'RelationalSource': 'RelationalSource', 'DynamicsSource': 'DynamicsSource', 'DocumentDbCollectionSource': 'DocumentDbCollectionSource', 'BlobSource': 'BlobSource', 'AzureTableSource': 'AzureTableSource'} + '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'} } def __init__(self, additional_properties=None, source_retry_count=None, source_retry_wait=None): 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 ded2dbe30e1a..5d81968a6bf7 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 @@ -413,6 +413,12 @@ class IntegrationRuntimeLicenseType(Enum): license_included = "LicenseIncluded" +class IntegrationRuntimeEdition(Enum): + + standard = "Standard" + enterprise = "Enterprise" + + class IntegrationRuntimeAuthKeyName(Enum): auth_key1 = "authKey1" diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py index ce71f8c8b9bf..755320602566 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py @@ -17,7 +17,8 @@ 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: ZohoObjectDataset, XeroObjectDataset, SquareObjectDataset, + sub-classes are: VerticaTableDataset, NetezzaTableDataset, + ZohoObjectDataset, XeroObjectDataset, SquareObjectDataset, SparkObjectDataset, ShopifyObjectDataset, ServiceNowObjectDataset, QuickBooksObjectDataset, PrestoObjectDataset, PhoenixObjectDataset, PaypalObjectDataset, MarketoObjectDataset, MariaDBTableDataset, @@ -27,10 +28,10 @@ class Dataset(Model): DrillTableDataset, CouchbaseTableDataset, ConcurObjectDataset, AzurePostgreSqlTableDataset, AmazonMWSObjectDataset, HttpDataset, AzureSearchIndexDataset, WebTableDataset, SqlServerTableDataset, - SapCloudForCustomerResourceDataset, SalesforceObjectDataset, - RelationalTableDataset, AzureMySqlTableDataset, OracleTableDataset, - ODataResourceDataset, MongoDbCollectionDataset, FileShareDataset, - AzureDataLakeStoreDataset, DynamicsEntityDataset, + SapEccResourceDataset, SapCloudForCustomerResourceDataset, + SalesforceObjectDataset, RelationalTableDataset, AzureMySqlTableDataset, + OracleTableDataset, ODataResourceDataset, MongoDbCollectionDataset, + FileShareDataset, AzureDataLakeStoreDataset, DynamicsEntityDataset, DocumentDbCollectionDataset, CustomDataset, CassandraTableDataset, AzureSqlDWTableDataset, AzureSqlTableDataset, AzureTableDataset, AzureBlobDataset, AmazonS3Dataset @@ -68,7 +69,7 @@ class Dataset(Model): } _subtype_map = { - 'type': {'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', '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': {'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): 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 1428a7ea4c4c..06aa143d8ab4 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 @@ -43,6 +43,12 @@ class GoogleBigQueryLinkedService(LinkedService): :param refresh_token: The refresh token obtained from Google for authorizing access to BigQuery for UserAuthentication. :type refresh_token: ~azure.mgmt.datafactory.models.SecretBase + :param client_id: The client id of the google application used to acquire + the refresh token. + :type client_id: ~azure.mgmt.datafactory.models.SecretBase + :param client_secret: The client secret of the google application used to + acquire the refresh token. + :type client_secret: ~azure.mgmt.datafactory.models.SecretBase :param email: The service account email ID that is used for ServiceAuthentication and can only be used on self-hosted IR. :type email: object @@ -81,6 +87,8 @@ class GoogleBigQueryLinkedService(LinkedService): 'request_google_drive_scope': {'key': 'typeProperties.requestGoogleDriveScope', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'refresh_token': {'key': 'typeProperties.refreshToken', 'type': 'SecretBase'}, + 'client_id': {'key': 'typeProperties.clientId', 'type': 'SecretBase'}, + 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, 'email': {'key': 'typeProperties.email', 'type': 'object'}, 'key_file_path': {'key': 'typeProperties.keyFilePath', 'type': 'object'}, 'trusted_cert_path': {'key': 'typeProperties.trustedCertPath', 'type': 'object'}, @@ -88,13 +96,15 @@ 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, email=None, key_file_path=None, trusted_cert_path=None, use_system_trust_store=None, encrypted_credential=None): + 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) self.project = project self.additional_projects = additional_projects self.request_google_drive_scope = request_google_drive_scope self.authentication_type = authentication_type self.refresh_token = refresh_token + self.client_id = client_id + self.client_secret = client_secret self.email = email self.key_file_path = key_file_path self.trusted_cert_path = trusted_cert_path 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 e178ad41f4b8..25dbbb523033 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 @@ -32,7 +32,7 @@ class HDInsightLinkedService(LinkedService): with resultType string). :type user_name: object :param password: HDInsight cluster password. - :type password: ~azure.mgmt.datafactory.models.SecureString + :type password: ~azure.mgmt.datafactory.models.SecretBase :param linked_service_name: The Azure Storage linked service reference. :type linked_service_name: ~azure.mgmt.datafactory.models.LinkedServiceReference @@ -58,7 +58,7 @@ class HDInsightLinkedService(LinkedService): 'type': {'key': 'type', 'type': 'str'}, 'cluster_uri': {'key': 'typeProperties.clusterUri', 'type': 'object'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, - 'password': {'key': 'typeProperties.password', 'type': 'SecureString'}, + 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, 'linked_service_name': {'key': 'typeProperties.linkedServiceName', 'type': 'LinkedServiceReference'}, 'hcatalog_linked_service_name': {'key': 'typeProperties.hcatalogLinkedServiceName', 'type': 'LinkedServiceReference'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, 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 fc1cf0d4caa4..a93210ee151a 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 @@ -48,7 +48,7 @@ class HDInsightOnDemandLinkedService(LinkedService): hostSubscriptionId. Type: string (or Expression with resultType string). :type service_principal_id: object :param service_principal_key: The key for the service principal id. - :type service_principal_key: ~azure.mgmt.datafactory.models.SecureString + :type service_principal_key: ~azure.mgmt.datafactory.models.SecretBase :param tenant: The Tenant id/name to which the service principal belongs. Type: string (or Expression with resultType string). :type tenant: object @@ -63,14 +63,14 @@ class HDInsightOnDemandLinkedService(LinkedService): (or Expression with resultType string). :type cluster_user_name: object :param cluster_password: The password to access the cluster. - :type cluster_password: ~azure.mgmt.datafactory.models.SecureString + :type cluster_password: ~azure.mgmt.datafactory.models.SecretBase :param cluster_ssh_user_name: The username to SSH remotely connect to cluster’s node (for Linux). Type: string (or Expression with resultType string). :type cluster_ssh_user_name: object :param cluster_ssh_password: The password to SSH remotely connect cluster’s node (for Linux). - :type cluster_ssh_password: ~azure.mgmt.datafactory.models.SecureString + :type cluster_ssh_password: ~azure.mgmt.datafactory.models.SecretBase :param additional_linked_service_names: Specifies additional storage accounts for the HDInsight linked service so that the Data Factory service can register them on your behalf. @@ -139,14 +139,14 @@ class HDInsightOnDemandLinkedService(LinkedService): 'linked_service_name': {'key': 'typeProperties.linkedServiceName', 'type': 'LinkedServiceReference'}, 'host_subscription_id': {'key': 'typeProperties.hostSubscriptionId', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, - 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecureString'}, + 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, 'cluster_resource_group': {'key': 'typeProperties.clusterResourceGroup', 'type': 'object'}, 'cluster_name_prefix': {'key': 'typeProperties.clusterNamePrefix', 'type': 'object'}, 'cluster_user_name': {'key': 'typeProperties.clusterUserName', 'type': 'object'}, - 'cluster_password': {'key': 'typeProperties.clusterPassword', 'type': 'SecureString'}, + 'cluster_password': {'key': 'typeProperties.clusterPassword', 'type': 'SecretBase'}, 'cluster_ssh_user_name': {'key': 'typeProperties.clusterSshUserName', 'type': 'object'}, - 'cluster_ssh_password': {'key': 'typeProperties.clusterSshPassword', 'type': 'SecureString'}, + 'cluster_ssh_password': {'key': 'typeProperties.clusterSshPassword', 'type': 'SecretBase'}, 'additional_linked_service_names': {'key': 'typeProperties.additionalLinkedServiceNames', 'type': '[LinkedServiceReference]'}, 'hcatalog_linked_service_name': {'key': 'typeProperties.hcatalogLinkedServiceName', 'type': 'LinkedServiceReference'}, 'cluster_type': {'key': 'typeProperties.clusterType', 'type': 'object'}, 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 fcd865460e55..9396222ce197 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 @@ -56,7 +56,7 @@ class HiveLinkedService(LinkedService): :type username: object :param password: The password corresponding to the user name that you provided in the Username field - :type password: ~azure.mgmt.datafactory.models.SecureString + :type password: ~azure.mgmt.datafactory.models.SecretBase :param http_path: The partial URL corresponding to the Hive server. :type http_path: object :param enable_ssl: Specifies whether the connections to the server are @@ -104,7 +104,7 @@ class HiveLinkedService(LinkedService): 'zoo_keeper_name_space': {'key': 'typeProperties.zooKeeperNameSpace', 'type': 'object'}, 'use_native_query': {'key': 'typeProperties.useNativeQuery', 'type': 'object'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, - 'password': {'key': 'typeProperties.password', 'type': 'SecureString'}, + 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, 'http_path': {'key': 'typeProperties.httpPath', 'type': 'object'}, 'enable_ssl': {'key': 'typeProperties.enableSsl', 'type': 'object'}, 'trusted_cert_path': {'key': 'typeProperties.trustedCertPath', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_custom_setup_script_properties.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_custom_setup_script_properties.py new file mode 100644 index 000000000000..b76cc5e39078 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_custom_setup_script_properties.py @@ -0,0 +1,33 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class IntegrationRuntimeCustomSetupScriptProperties(Model): + """Custom setup script properties for a managed dedicated integration runtime. + + :param blob_container_uri: The URI of the Azure blob container that + contains the custom setup script. + :type blob_container_uri: str + :param sas_token: The SAS token of the Azure blob container. + :type sas_token: ~azure.mgmt.datafactory.models.SecureString + """ + + _attribute_map = { + 'blob_container_uri': {'key': 'blobContainerUri', 'type': 'str'}, + 'sas_token': {'key': 'sasToken', 'type': 'SecureString'}, + } + + def __init__(self, blob_container_uri=None, sas_token=None): + super(IntegrationRuntimeCustomSetupScriptProperties, self).__init__() + self.blob_container_uri = blob_container_uri + self.sas_token = sas_token diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_ssis_properties.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_ssis_properties.py index 95687d964222..562e74c78ffe 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_ssis_properties.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_ssis_properties.py @@ -26,16 +26,28 @@ class IntegrationRuntimeSsisProperties(Model): Possible values include: 'BasePrice', 'LicenseIncluded' :type license_type: str or ~azure.mgmt.datafactory.models.IntegrationRuntimeLicenseType + :param custom_setup_script_properties: Custom setup script properties for + a managed dedicated integration runtime. + :type custom_setup_script_properties: + ~azure.mgmt.datafactory.models.IntegrationRuntimeCustomSetupScriptProperties + :param edition: The edition for the SSIS Integration Runtime. Possible + values include: 'Standard', 'Enterprise' + :type edition: str or + ~azure.mgmt.datafactory.models.IntegrationRuntimeEdition """ _attribute_map = { 'additional_properties': {'key': '', 'type': '{object}'}, 'catalog_info': {'key': 'catalogInfo', 'type': 'IntegrationRuntimeSsisCatalogInfo'}, 'license_type': {'key': 'licenseType', 'type': 'str'}, + 'custom_setup_script_properties': {'key': 'customSetupScriptProperties', 'type': 'IntegrationRuntimeCustomSetupScriptProperties'}, + 'edition': {'key': 'edition', 'type': 'str'}, } - def __init__(self, additional_properties=None, catalog_info=None, license_type=None): + def __init__(self, additional_properties=None, catalog_info=None, license_type=None, custom_setup_script_properties=None, edition=None): super(IntegrationRuntimeSsisProperties, self).__init__() self.additional_properties = additional_properties self.catalog_info = catalog_info self.license_type = license_type + self.custom_setup_script_properties = custom_setup_script_properties + self.edition = edition diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_status.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_status.py index c5630c79e809..e6f7010a0bdf 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_status.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_status.py @@ -25,6 +25,9 @@ class IntegrationRuntimeStatus(Model): :param additional_properties: Unmatched properties from the message are deserialized this collection :type additional_properties: dict[str, object] + :ivar data_factory_name: The data factory name which the integration + runtime belong to. + :vartype data_factory_name: str :ivar state: The state of integration runtime. Possible values include: 'Initial', 'Stopped', 'Started', 'Starting', 'Stopping', 'NeedRegistration', 'Online', 'Limited', 'Offline' @@ -35,12 +38,14 @@ class IntegrationRuntimeStatus(Model): """ _validation = { + 'data_factory_name': {'readonly': True}, 'state': {'readonly': True}, 'type': {'required': True}, } _attribute_map = { 'additional_properties': {'key': '', 'type': '{object}'}, + 'data_factory_name': {'key': 'dataFactoryName', 'type': 'str'}, 'state': {'key': 'state', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, } @@ -52,5 +57,6 @@ class IntegrationRuntimeStatus(Model): def __init__(self, additional_properties=None): super(IntegrationRuntimeStatus, self).__init__() self.additional_properties = additional_properties + self.data_factory_name = None self.state = None self.type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime.py new file mode 100644 index 000000000000..1a733032b07e --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class LinkedIntegrationRuntime(Model): + """The linked integration runtime information. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar name: The name of the linked integration runtime. + :vartype name: str + :ivar subscription_id: The subscription ID for which the linked + integration runtime belong to. + :vartype subscription_id: str + :ivar data_factory_name: The name of the data factory for which the linked + integration runtime belong to. + :vartype data_factory_name: str + :ivar data_factory_location: The location of the data factory for which + the linked integration runtime belong to. + :vartype data_factory_location: str + :ivar create_time: The creating time of the linked integration runtime. + :vartype create_time: datetime + """ + + _validation = { + 'name': {'readonly': True}, + 'subscription_id': {'readonly': True}, + 'data_factory_name': {'readonly': True}, + 'data_factory_location': {'readonly': True}, + 'create_time': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'subscription_id': {'key': 'subscriptionId', 'type': 'str'}, + 'data_factory_name': {'key': 'dataFactoryName', 'type': 'str'}, + 'data_factory_location': {'key': 'dataFactoryLocation', 'type': 'str'}, + 'create_time': {'key': 'createTime', 'type': 'iso-8601'}, + } + + def __init__(self): + super(LinkedIntegrationRuntime, self).__init__() + self.name = None + self.subscription_id = None + self.data_factory_name = None + self.data_factory_location = None + self.create_time = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key.py new file mode 100644 index 000000000000..6c2f9dd80428 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key.py @@ -0,0 +1,37 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .linked_integration_runtime_properties import LinkedIntegrationRuntimeProperties + + +class LinkedIntegrationRuntimeKey(LinkedIntegrationRuntimeProperties): + """The base definition of a secret type. + + :param authorization_type: Constant filled by server. + :type authorization_type: str + :param key: Type of the secret. + :type key: ~azure.mgmt.datafactory.models.SecureString + """ + + _validation = { + 'authorization_type': {'required': True}, + 'key': {'required': True}, + } + + _attribute_map = { + 'authorization_type': {'key': 'authorizationType', 'type': 'str'}, + 'key': {'key': 'key', 'type': 'SecureString'}, + } + + def __init__(self, key): + super(LinkedIntegrationRuntimeKey, self).__init__() + self.key = key + self.authorization_type = 'Key' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties.py new file mode 100644 index 000000000000..4e91a5e9f45a --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_properties.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class LinkedIntegrationRuntimeProperties(Model): + """The base definition of a secret type. + + You probably want to use the sub-classes and not this class directly. Known + sub-classes are: LinkedIntegrationRuntimeRbac, LinkedIntegrationRuntimeKey + + :param authorization_type: Constant filled by server. + :type authorization_type: str + """ + + _validation = { + 'authorization_type': {'required': True}, + } + + _attribute_map = { + 'authorization_type': {'key': 'authorizationType', 'type': 'str'}, + } + + _subtype_map = { + 'authorization_type': {'RBAC': 'LinkedIntegrationRuntimeRbac', 'Key': 'LinkedIntegrationRuntimeKey'} + } + + def __init__(self): + super(LinkedIntegrationRuntimeProperties, self).__init__() + self.authorization_type = None diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac.py new file mode 100644 index 000000000000..c38d91d94918 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .linked_integration_runtime_properties import LinkedIntegrationRuntimeProperties + + +class LinkedIntegrationRuntimeRbac(LinkedIntegrationRuntimeProperties): + """The base definition of a secret type. + + :param authorization_type: Constant filled by server. + :type authorization_type: str + :param resource_id: The resource ID of the integration runtime to be + shared. + :type resource_id: str + """ + + _validation = { + 'authorization_type': {'required': True}, + 'resource_id': {'required': True}, + } + + _attribute_map = { + 'authorization_type': {'key': 'authorizationType', 'type': 'str'}, + 'resource_id': {'key': 'resourceId', 'type': 'str'}, + } + + def __init__(self, resource_id): + super(LinkedIntegrationRuntimeRbac, self).__init__() + self.resource_id = resource_id + self.authorization_type = 'RBAC' 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 77b48788c31b..87254ade162e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py @@ -19,29 +19,29 @@ class LinkedService(Model): You probably want to use the sub-classes and not this class directly. Known sub-classes are: AzureDataLakeAnalyticsLinkedService, - HDInsightOnDemandLinkedService, 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, SapCloudForCustomerLinkedService, - SalesforceLinkedService, AzureDataLakeStoreLinkedService, - MongoDbLinkedService, CassandraLinkedService, WebLinkedService, - ODataLinkedService, HdfsLinkedService, OdbcLinkedService, - AzureMLLinkedService, TeradataLinkedService, Db2LinkedService, - SybaseLinkedService, PostgreSqlLinkedService, MySqlLinkedService, - AzureMySqlLinkedService, OracleLinkedService, FileServerLinkedService, - HDInsightLinkedService, DynamicsLinkedService, CosmosDbLinkedService, - AzureKeyVaultLinkedService, AzureBatchLinkedService, - AzureSqlDatabaseLinkedService, SqlServerLinkedService, - AzureSqlDWLinkedService, AzureStorageLinkedService + 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, + SapCloudForCustomerLinkedService, SalesforceLinkedService, + AzureDataLakeStoreLinkedService, MongoDbLinkedService, + CassandraLinkedService, WebLinkedService, ODataLinkedService, + HdfsLinkedService, OdbcLinkedService, AzureMLLinkedService, + TeradataLinkedService, Db2LinkedService, SybaseLinkedService, + PostgreSqlLinkedService, MySqlLinkedService, AzureMySqlLinkedService, + OracleLinkedService, FileServerLinkedService, HDInsightLinkedService, + DynamicsLinkedService, CosmosDbLinkedService, AzureKeyVaultLinkedService, + AzureBatchLinkedService, AzureSqlDatabaseLinkedService, + SqlServerLinkedService, AzureSqlDWLinkedService, AzureStorageLinkedService :param additional_properties: Unmatched properties from the message are deserialized this collection @@ -67,7 +67,7 @@ class LinkedService(Model): } _subtype_map = { - 'type': {'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', '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', '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': {'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'} } def __init__(self, additional_properties=None, connect_via=None, description=None): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_status.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_status.py index 237b85c32d18..0013f6a7dc54 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_status.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_status.py @@ -21,6 +21,9 @@ class ManagedIntegrationRuntimeStatus(IntegrationRuntimeStatus): :param additional_properties: Unmatched properties from the message are deserialized this collection :type additional_properties: dict[str, object] + :ivar data_factory_name: The data factory name which the integration + runtime belong to. + :vartype data_factory_name: str :ivar state: The state of integration runtime. Possible values include: 'Initial', 'Stopped', 'Started', 'Starting', 'Stopping', 'NeedRegistration', 'Online', 'Limited', 'Offline' @@ -44,6 +47,7 @@ class ManagedIntegrationRuntimeStatus(IntegrationRuntimeStatus): """ _validation = { + 'data_factory_name': {'readonly': True}, 'state': {'readonly': True}, 'type': {'required': True}, 'create_time': {'readonly': True}, @@ -54,6 +58,7 @@ class ManagedIntegrationRuntimeStatus(IntegrationRuntimeStatus): _attribute_map = { 'additional_properties': {'key': '', 'type': '{object}'}, + 'data_factory_name': {'key': 'dataFactoryName', 'type': 'str'}, 'state': {'key': 'state', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'create_time': {'key': 'typeProperties.createTime', 'type': 'iso-8601'}, 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 new file mode 100644 index 000000000000..802d99cd2fd9 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py @@ -0,0 +1,53 @@ +# 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 NetezzaLinkedService(LinkedService): + """Netezza 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 type: Constant filled by server. + :type type: str + :param connection_string: An ODBC connection string. + :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :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}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'connect_via': {'key': 'connectVia', 'type': 'IntegrationRuntimeReference'}, + 'description': {'key': 'description', 'type': 'str'}, + '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) + self.connection_string = connection_string + self.encrypted_credential = encrypted_credential + self.type = 'Netezza' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_source.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_source.py new file mode 100644 index 000000000000..cf251c7e1174 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_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 NetezzaSource(CopySource): + """A copy activity Netezza 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(NetezzaSource, self).__init__(additional_properties=additional_properties, source_retry_count=source_retry_count, source_retry_wait=source_retry_wait) + self.query = query + self.type = 'NetezzaSource' 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 new file mode 100644 index 000000000000..dbef5a780cb0 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset.py @@ -0,0 +1,43 @@ +# 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 NetezzaTableDataset(Dataset): + """Netezza 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 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): + super(NetezzaTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + self.type = 'NetezzaTable' 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 new file mode 100644 index 000000000000..0d11a8534e8d --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service.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 .linked_service import LinkedService + + +class SapEccLinkedService(LinkedService): + """Linked service for SAP ERP Central Component(SAP ECC). + + :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 type: Constant filled by server. + :type type: str + :param url: The URL of SAP ECC OData API. For example, + '[https://hostname:port/sap/opu/odata/sap/servicename/]'. Type: string (or + Expression with resultType string). + :type url: str + :param username: The username for Basic authentication. Type: string (or + Expression with resultType string). + :type username: str + :param password: The password for Basic authentication. + :type password: ~azure.mgmt.datafactory.models.SecretBase + :param encrypted_credential: The encrypted credential used for + authentication. Credentials are encrypted using the integration runtime + credential manager. Either encryptedCredential or username/password must + be provided. Type: string (or Expression with resultType string). + :type encrypted_credential: str + """ + + _validation = { + 'type': {'required': True}, + 'url': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'connect_via': {'key': 'connectVia', 'type': 'IntegrationRuntimeReference'}, + 'description': {'key': 'description', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'url': {'key': 'typeProperties.url', 'type': 'str'}, + 'username': {'key': 'typeProperties.username', 'type': 'str'}, + 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + '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) + self.url = url + self.username = username + self.password = password + self.encrypted_credential = encrypted_credential + self.type = 'SapEcc' 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 new file mode 100644 index 000000000000..6707cfb8c52f --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset.py @@ -0,0 +1,58 @@ +# 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 SapEccResourceDataset(Dataset): + """The path of the SAP ECC OData entity. + + :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 type: Constant filled by server. + :type type: str + :param path: The path of the SAP ECC OData entity. Type: string (or + Expression with resultType string). + :type path: str + """ + + _validation = { + 'linked_service_name': {'required': True}, + 'type': {'required': True}, + 'path': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'description': {'key': 'description', 'type': 'str'}, + 'structure': {'key': 'structure', 'type': 'object'}, + 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, + 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + '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) + self.path = path + self.type = 'SapEccResource' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_source.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_source.py new file mode 100644 index 000000000000..2baa90e9342d --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_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 SapEccSource(CopySource): + """A copy activity source for SAP ECC 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: SAP ECC OData query. For example, "$top=1". Type: string (or + Expression with resultType string). + :type query: str + """ + + _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': 'str'}, + } + + def __init__(self, additional_properties=None, source_retry_count=None, source_retry_wait=None, query=None): + super(SapEccSource, self).__init__(additional_properties=additional_properties, source_retry_count=source_retry_count, source_retry_wait=source_retry_wait) + self.query = query + self.type = 'SapEccSource' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime.py index ac1d0dc52598..1614e0aec96c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime.py @@ -22,12 +22,23 @@ class SelfHostedIntegrationRuntime(IntegrationRuntime): :type description: str :param type: Constant filled by server. :type type: str + :param linked_info: + :type linked_info: + ~azure.mgmt.datafactory.models.LinkedIntegrationRuntimeProperties """ _validation = { 'type': {'required': True}, } - def __init__(self, additional_properties=None, description=None): + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'description': {'key': 'description', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'linked_info': {'key': 'typeProperties.linkedInfo', 'type': 'LinkedIntegrationRuntimeProperties'}, + } + + def __init__(self, additional_properties=None, description=None, linked_info=None): super(SelfHostedIntegrationRuntime, self).__init__(additional_properties=additional_properties, description=description) + self.linked_info = linked_info self.type = 'SelfHosted' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status.py index 3e6ab83a4b40..6c283be0540a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status.py @@ -21,6 +21,9 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): :param additional_properties: Unmatched properties from the message are deserialized this collection :type additional_properties: dict[str, object] + :ivar data_factory_name: The data factory name which the integration + runtime belong to. + :vartype data_factory_name: str :ivar state: The state of integration runtime. Possible values include: 'Initial', 'Stopped', 'Started', 'Starting', 'Stopping', 'NeedRegistration', 'Online', 'Limited', 'Offline' @@ -64,9 +67,13 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): ~azure.mgmt.datafactory.models.IntegrationRuntimeAutoUpdate :ivar version_status: Status of the integration runtime version. :vartype version_status: str + :param links: The list of linked integration runtimes that are created to + share with this integration runtime. + :type links: list[~azure.mgmt.datafactory.models.LinkedIntegrationRuntime] """ _validation = { + 'data_factory_name': {'readonly': True}, 'state': {'readonly': True}, 'type': {'required': True}, 'create_time': {'readonly': True}, @@ -84,6 +91,7 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): _attribute_map = { 'additional_properties': {'key': '', 'type': '{object}'}, + 'data_factory_name': {'key': 'dataFactoryName', 'type': 'str'}, 'state': {'key': 'state', 'type': 'str'}, 'type': {'key': 'type', 'type': 'str'}, 'create_time': {'key': 'typeProperties.createTime', 'type': 'iso-8601'}, @@ -98,9 +106,10 @@ class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): 'service_urls': {'key': 'typeProperties.serviceUrls', 'type': '[str]'}, 'auto_update': {'key': 'typeProperties.autoUpdate', 'type': 'str'}, 'version_status': {'key': 'typeProperties.versionStatus', 'type': 'str'}, + 'links': {'key': 'typeProperties.links', 'type': '[LinkedIntegrationRuntime]'}, } - def __init__(self, additional_properties=None, nodes=None): + def __init__(self, additional_properties=None, nodes=None, links=None): super(SelfHostedIntegrationRuntimeStatus, self).__init__(additional_properties=additional_properties) self.create_time = None self.task_queue_id = None @@ -114,4 +123,5 @@ def __init__(self, additional_properties=None, nodes=None): self.service_urls = None self.auto_update = None self.version_status = None + self.links = links self.type = 'SelfHosted' 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 new file mode 100644 index 000000000000..58906ce907b3 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py @@ -0,0 +1,53 @@ +# 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 VerticaLinkedService(LinkedService): + """Vertica 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 type: Constant filled by server. + :type type: str + :param connection_string: An ODBC connection string. + :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :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}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'connect_via': {'key': 'connectVia', 'type': 'IntegrationRuntimeReference'}, + 'description': {'key': 'description', 'type': 'str'}, + '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) + self.connection_string = connection_string + self.encrypted_credential = encrypted_credential + self.type = 'Vertica' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_source.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_source.py new file mode 100644 index 000000000000..081b51fb0d99 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_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 VerticaSource(CopySource): + """A copy activity Vertica 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(VerticaSource, self).__init__(additional_properties=additional_properties, source_retry_count=source_retry_count, source_retry_wait=source_retry_wait) + self.query = query + self.type = 'VerticaSource' 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 new file mode 100644 index 000000000000..29648bf2e190 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset.py @@ -0,0 +1,43 @@ +# 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 VerticaTableDataset(Dataset): + """Vertica 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 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): + super(VerticaTableDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters) + self.type = 'VerticaTable' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_basic_authentication.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_basic_authentication.py index cb83a320e541..f32f30499a14 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_basic_authentication.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_basic_authentication.py @@ -26,7 +26,7 @@ class WebBasicAuthentication(WebLinkedServiceTypeProperties): Expression with resultType string). :type username: object :param password: The password for Basic authentication. - :type password: ~azure.mgmt.datafactory.models.SecureString + :type password: ~azure.mgmt.datafactory.models.SecretBase """ _validation = { @@ -40,7 +40,7 @@ class WebBasicAuthentication(WebLinkedServiceTypeProperties): 'url': {'key': 'url', 'type': 'object'}, 'authentication_type': {'key': 'authenticationType', 'type': 'str'}, 'username': {'key': 'username', 'type': 'object'}, - 'password': {'key': 'password', 'type': 'SecureString'}, + 'password': {'key': 'password', 'type': 'SecretBase'}, } def __init__(self, url, username, password): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_client_certificate_authentication.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_client_certificate_authentication.py index d470ebccb8ce..2f4103a772ca 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_client_certificate_authentication.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_client_certificate_authentication.py @@ -25,9 +25,9 @@ class WebClientCertificateAuthentication(WebLinkedServiceTypeProperties): :param authentication_type: Constant filled by server. :type authentication_type: str :param pfx: Base64-encoded contents of a PFX file. - :type pfx: ~azure.mgmt.datafactory.models.SecureString + :type pfx: ~azure.mgmt.datafactory.models.SecretBase :param password: Password for the PFX file. - :type password: ~azure.mgmt.datafactory.models.SecureString + :type password: ~azure.mgmt.datafactory.models.SecretBase """ _validation = { @@ -40,8 +40,8 @@ class WebClientCertificateAuthentication(WebLinkedServiceTypeProperties): _attribute_map = { 'url': {'key': 'url', 'type': 'object'}, 'authentication_type': {'key': 'authenticationType', 'type': 'str'}, - 'pfx': {'key': 'pfx', 'type': 'SecureString'}, - 'password': {'key': 'password', 'type': 'SecureString'}, + 'pfx': {'key': 'pfx', 'type': 'SecretBase'}, + 'password': {'key': 'password', 'type': 'SecretBase'}, } def __init__(self, url, pfx, password): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py index 85da2c00c1a6..a410d4adb270 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.4.0" +VERSION = "2017-09-01-preview" From 852353ff976941c111a0bd99c6e9bfb97bedcbe9 Mon Sep 17 00:00:00 2001 From: hvermis Date: Fri, 16 Feb 2018 10:36:09 -0800 Subject: [PATCH 2/4] Updating the version for ADF to 0.5.0 --- azure-mgmt-datafactory/azure/mgmt/datafactory/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py index a410d4adb270..266f5a486d79 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 = "2017-09-01-preview" +VERSION = "0.5.0" From a379382591be27751ac4d05a15988604d6fd48df Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Fri, 16 Feb 2018 12:45:03 -0800 Subject: [PATCH 3/4] ADF 0.5.0 ChangeLog --- azure-mgmt-datafactory/HISTORY.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/azure-mgmt-datafactory/HISTORY.rst b/azure-mgmt-datafactory/HISTORY.rst index edcb0ee1ad19..e0c4b1791360 100644 --- a/azure-mgmt-datafactory/HISTORY.rst +++ b/azure-mgmt-datafactory/HISTORY.rst @@ -3,6 +3,16 @@ Release History =============== +0.5.0 (2018-02-16) +++++++++++++++++++ + +- Enable AAD auth via service principal and management service identity for Azure SQL DB/DW linked service types +- Support integration runtime sharing across subscription and data factory +- Enable Azure Key Vault for all compute linked service +- Add SAP ECC Source +- GoogleBigQuery support clientId and clientSecret for UserAuthentication +- Add LinkedService, Dataset, CopySource for Vertica and Netezza + 0.4.0 (2018-02-02) ++++++++++++++++++ From fea435f3f08b969e017029b5989d2494509684fc Mon Sep 17 00:00:00 2001 From: Laurent Mazuel Date: Fri, 16 Feb 2018 13:01:20 -0800 Subject: [PATCH 4/4] Update ADF packaging --- azure-mgmt-datafactory/README.rst | 8 ++++---- azure-mgmt-datafactory/setup.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-mgmt-datafactory/README.rst b/azure-mgmt-datafactory/README.rst index edb25a35404b..1d331b91cec5 100644 --- a/azure-mgmt-datafactory/README.rst +++ b/azure-mgmt-datafactory/README.rst @@ -6,7 +6,7 @@ This is the Microsoft Azure Data Factory Management Client Library. Azure Resource Manager (ARM) is the next generation of management APIs that replace the old Azure Service Management (ASM). -This package has been tested with Python 2.7, 3.3, 3.4, 3.5 and 3.6. +This package has been tested with Python 2.7, 3.4, 3.5 and 3.6. For the older Azure Service Management (ASM) libraries, see `azure-servicemanagement-legacy `__ library. @@ -36,9 +36,9 @@ If you see azure==0.11.0 (or any version below 1.0), uninstall it first: Usage ===== -For code examples, see `Data Factory Management -`__ -on readthedocs.org. +For code examples, see `DataFactory Management +`__ +on docs.microsoft.com. Provide Feedback diff --git a/azure-mgmt-datafactory/setup.py b/azure-mgmt-datafactory/setup.py index f519afac1997..94a4f2de250d 100644 --- a/azure-mgmt-datafactory/setup.py +++ b/azure-mgmt-datafactory/setup.py @@ -77,8 +77,8 @@ zip_safe=False, packages=find_packages(exclude=["tests"]), install_requires=[ - 'msrestazure~=0.4.11', + 'msrestazure>=0.4.20,<2.0.0', 'azure-common~=1.1', ], cmdclass=cmdclass -) \ No newline at end of file +)