[Datafactory] Adding additionProperties to allow serializing/deserializing new properties as JSON extension data

azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity.py

@@ -18,6 +18,9 @@ class Activity(Model):
     You probably want to use the sub-classes and not this class directly. Known
     sub-classes are: ExecutionActivity, ControlActivity
 
+    :param additional_properties: Unmatched properties from the message are
+     deserialized this collection
+    :type additional_properties: dict[str, object]
     :param name: Activity name.
     :type name: str
     :param description: Activity description.
@@ -34,6 +37,7 @@ class Activity(Model):
     }
 
     _attribute_map = {
+        'additional_properties': {'key': '', 'type': '{object}'},
         'name': {'key': 'name', 'type': 'str'},
         'description': {'key': 'description', 'type': 'str'},
         'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'},
@@ -44,7 +48,8 @@ class Activity(Model):
         'type': {'Execution': 'ExecutionActivity', 'Container': 'ControlActivity'}
     }
 
-    def __init__(self, name, description=None, depends_on=None):
+    def __init__(self, name, additional_properties=None, description=None, depends_on=None):
+        self.additional_properties = additional_properties
         self.name = name
         self.description = description
         self.depends_on = depends_on

azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_dependency.py

@@ -15,6 +15,9 @@
 class ActivityDependency(Model):
     """Activity dependency information.
 
+    :param additional_properties: Unmatched properties from the message are
+     deserialized this collection
+    :type additional_properties: dict[str, object]
     :param activity: Activity name.
     :type activity: str
     :param dependency_conditions: Match-Condition for the dependency.
@@ -28,10 +31,12 @@ class ActivityDependency(Model):
     }
 
     _attribute_map = {
+        'additional_properties': {'key': '', 'type': '{object}'},
         'activity': {'key': 'activity', 'type': 'str'},
         'dependency_conditions': {'key': 'dependencyConditions', 'type': '[str]'},
     }
 
-    def __init__(self, activity, dependency_conditions):
+    def __init__(self, activity, dependency_conditions, additional_properties=None):
+        self.additional_properties = additional_properties
         self.activity = activity
         self.dependency_conditions = dependency_conditions

azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy.py

@@ -15,6 +15,9 @@
 class ActivityPolicy(Model):
     """Execution policy for an activity.
 
+    :param additional_properties: Unmatched properties from the message are
+     deserialized this collection
+    :type additional_properties: dict[str, object]
     :param timeout: Specifies the timeout for the activity to run. The default
      timeout is 7 days. Type: string (or Expression with resultType string),
      pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
@@ -32,12 +35,14 @@ class ActivityPolicy(Model):
     }
 
     _attribute_map = {
+        'additional_properties': {'key': '', 'type': '{object}'},
         'timeout': {'key': 'timeout', 'type': 'object'},
         'retry': {'key': 'retry', 'type': 'object'},
         'retry_interval_in_seconds': {'key': 'retryIntervalInSeconds', 'type': 'int'},
     }
 
-    def __init__(self, timeout=None, retry=None, retry_interval_in_seconds=None):
+    def __init__(self, additional_properties=None, timeout=None, retry=None, retry_interval_in_seconds=None):
+        self.additional_properties = additional_properties
         self.timeout = timeout
         self.retry = retry
         self.retry_interval_in_seconds = retry_interval_in_seconds

azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_run.py

@@ -18,6 +18,9 @@ class ActivityRun(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
+    :param additional_properties: Unmatched properties from the message are
+     deserialized this collection
+    :type additional_properties: dict[str, object]
     :ivar pipeline_name: The name of the pipeline.
     :vartype pipeline_name: str
     :ivar pipeline_run_id: The id of the pipeline run.
@@ -65,6 +68,7 @@ class ActivityRun(Model):
     }
 
     _attribute_map = {
+        'additional_properties': {'key': '', 'type': '{object}'},
         'pipeline_name': {'key': 'pipelineName', 'type': 'str'},
         'pipeline_run_id': {'key': 'pipelineRunId', 'type': 'str'},
         'activity_name': {'key': 'activityName', 'type': 'str'},
@@ -80,7 +84,8 @@ class ActivityRun(Model):
         'error': {'key': 'error', 'type': 'object'},
     }
 
-    def __init__(self):
+    def __init__(self, additional_properties=None):
+        self.additional_properties = additional_properties
         self.pipeline_name = None
         self.pipeline_run_id = None
         self.activity_name = None

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_linked_service.py

@@ -0,0 +1,96 @@
+# 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 AmazonMWSLinkedService(LinkedService):
+    """Amazon Marketplace Web Service 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 endpoint: The endpoint of the Amazon MWS server, (i.e.
+     mws.amazonservices.com)
+    :type endpoint: object
+    :param marketplace_id: The Amazon Marketplace ID you want to retrieve data
+     from. To retrive data from multiple Marketplace IDs, seperate them with a
+     comma (,). (i.e. A2EUQ1WTGCTBG2)
+    :type marketplace_id: object
+    :param seller_id: The Amazon seller ID.
+    :type seller_id: object
+    :param mws_auth_token: The Amazon MWS authentication token.
+    :type mws_auth_token: ~azure.mgmt.datafactory.models.SecretBase
+    :param access_key_id: The access key id used to access data.
+    :type access_key_id: object
+    :param secret_key: The secret key used to access data.
+    :type secret_key: ~azure.mgmt.datafactory.models.SecretBase
+    :param use_encrypted_endpoints: Specifies whether the data source
+     endpoints are encrypted using HTTPS. The default value is true.
+    :type use_encrypted_endpoints: object
+    :param use_host_verification: Specifies whether to require the host name
+     in the server's certificate to match the host name of the server when
+     connecting over SSL. The default value is true.
+    :type use_host_verification: object
+    :param use_peer_verification: Specifies whether to verify the identity of
+     the server when connecting over SSL. The default value is true.
+    :type use_peer_verification: object
+    :param encrypted_credential: The encrypted credential used for
+     authentication. Credentials are encrypted using the integration runtime
+     credential manager. Type: string (or Expression with resultType string).
+    :type encrypted_credential: object
+    """
+
+    _validation = {
+        'type': {'required': True},
+        'endpoint': {'required': True},
+        'marketplace_id': {'required': True},
+        'seller_id': {'required': True},
+        'access_key_id': {'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'},
+        'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'},
+        'marketplace_id': {'key': 'typeProperties.marketplaceID', 'type': 'object'},
+        'seller_id': {'key': 'typeProperties.sellerID', 'type': 'object'},
+        'mws_auth_token': {'key': 'typeProperties.mwsAuthToken', 'type': 'SecretBase'},
+        'access_key_id': {'key': 'typeProperties.accessKeyId', 'type': 'object'},
+        'secret_key': {'key': 'typeProperties.secretKey', 'type': 'SecretBase'},
+        'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'},
+        'use_host_verification': {'key': 'typeProperties.useHostVerification', 'type': 'object'},
+        'use_peer_verification': {'key': 'typeProperties.usePeerVerification', 'type': 'object'},
+        'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
+    }
+
+    def __init__(self, endpoint, marketplace_id, seller_id, access_key_id, additional_properties=None, connect_via=None, description=None, mws_auth_token=None, secret_key=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None):
+        super(AmazonMWSLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description)
+        self.endpoint = endpoint
+        self.marketplace_id = marketplace_id
+        self.seller_id = seller_id
+        self.mws_auth_token = mws_auth_token
+        self.access_key_id = access_key_id
+        self.secret_key = secret_key
+        self.use_encrypted_endpoints = use_encrypted_endpoints
+        self.use_host_verification = use_host_verification
+        self.use_peer_verification = use_peer_verification
+        self.encrypted_credential = encrypted_credential
+        self.type = 'AmazonMWS'

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_object_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 AmazonMWSObjectDataset(Dataset):
+    """Amazon Marketplace Web Service 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(AmazonMWSObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters)
+        self.type = 'AmazonMWSObject'

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_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 AmazonMWSSource(CopySource):
+    """A copy activity Amazon Marketplace Web Service 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(AmazonMWSSource, self).__init__(additional_properties=additional_properties, source_retry_count=source_retry_count, source_retry_wait=source_retry_wait)
+        self.query = query
+        self.type = 'AmazonMWSSource'

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service.py

@@ -15,6 +15,9 @@
 class AmazonRedshiftLinkedService(LinkedService):
     """Linked service for Amazon Redshift.
 
+    :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
@@ -50,6 +53,7 @@ class AmazonRedshiftLinkedService(LinkedService):
     }
 
     _attribute_map = {
+        'additional_properties': {'key': '', 'type': '{object}'},
         'connect_via': {'key': 'connectVia', 'type': 'IntegrationRuntimeReference'},
         'description': {'key': 'description', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
@@ -61,8 +65,8 @@ class AmazonRedshiftLinkedService(LinkedService):
         'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
     }
 
-    def __init__(self, server, database, connect_via=None, description=None, username=None, password=None, port=None, encrypted_credential=None):
-        super(AmazonRedshiftLinkedService, self).__init__(connect_via=connect_via, description=description)
+    def __init__(self, server, database, additional_properties=None, connect_via=None, description=None, username=None, password=None, port=None, encrypted_credential=None):
+        super(AmazonRedshiftLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description)
         self.server = server
         self.username = username
         self.password = password

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_source.py

@@ -15,6 +15,9 @@
 class AmazonRedshiftSource(CopySource):
     """A copy activity source for Amazon Redshift 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
@@ -40,15 +43,16 @@ class AmazonRedshiftSource(CopySource):
     }
 
     _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'},
         'redshift_unload_settings': {'key': 'redshiftUnloadSettings', 'type': 'RedshiftUnloadSettings'},
     }
 
-    def __init__(self, source_retry_count=None, source_retry_wait=None, query=None, redshift_unload_settings=None):
-        super(AmazonRedshiftSource, self).__init__(source_retry_count=source_retry_count, source_retry_wait=source_retry_wait)
+    def __init__(self, additional_properties=None, source_retry_count=None, source_retry_wait=None, query=None, redshift_unload_settings=None):
+        super(AmazonRedshiftSource, self).__init__(additional_properties=additional_properties, source_retry_count=source_retry_count, source_retry_wait=source_retry_wait)
         self.query = query
         self.redshift_unload_settings = redshift_unload_settings
         self.type = 'AmazonRedshiftSource'

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset.py

@@ -15,6 +15,9 @@
 class AmazonS3Dataset(Dataset):
     """A single Amazon Simple Storage Service (S3) object or a set of S3 objects.
 
+    :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:
@@ -54,6 +57,7 @@ class AmazonS3Dataset(Dataset):
     }
 
     _attribute_map = {
+        'additional_properties': {'key': '', 'type': '{object}'},
         'description': {'key': 'description', 'type': 'str'},
         'structure': {'key': 'structure', 'type': 'object'},
         'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
@@ -67,8 +71,8 @@ class AmazonS3Dataset(Dataset):
         'compression': {'key': 'typeProperties.compression', 'type': 'DatasetCompression'},
     }
 
-    def __init__(self, linked_service_name, bucket_name, description=None, structure=None, parameters=None, key=None, prefix=None, version=None, format=None, compression=None):
-        super(AmazonS3Dataset, self).__init__(description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters)
+    def __init__(self, linked_service_name, bucket_name, additional_properties=None, description=None, structure=None, parameters=None, key=None, prefix=None, version=None, format=None, compression=None):
+        super(AmazonS3Dataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters)
         self.bucket_name = bucket_name
         self.key = key
         self.prefix = prefix