Skip to content

[AutoPR datafactory/resource-manager] Change type name and add timeout property #6471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AutorestCI merged 1 commit into from
Jul 25, 2019
Merged

[AutoPR datafactory/resource-manager] Change type name and add timeout property #6471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@
from .parquet_source_py3 import ParquetSource
from .copy_source_py3 import CopySource
from .lookup_activity_py3 import LookupActivity
from .azure_data_explorer_command_py3 import AzureDataExplorerCommand
from .azure_data_explorer_command_activity_py3 import AzureDataExplorerCommandActivity
from .log_storage_settings_py3 import LogStorageSettings
from .delete_activity_py3 import DeleteActivity
from .sql_server_stored_procedure_activity_py3 import SqlServerStoredProcedureActivity
Expand Down Expand Up @@ -900,7 +900,7 @@
from .parquet_source import ParquetSource
from .copy_source import CopySource
from .lookup_activity import LookupActivity
from .azure_data_explorer_command import AzureDataExplorerCommand
from .azure_data_explorer_command_activity import AzureDataExplorerCommandActivity
from .log_storage_settings import LogStorageSettings
from .delete_activity import DeleteActivity
from .sql_server_stored_procedure_activity import SqlServerStoredProcedureActivity
Expand Down Expand Up @@ -1478,7 +1478,7 @@
'ParquetSource',
'CopySource',
'LookupActivity',
'AzureDataExplorerCommand',
'AzureDataExplorerCommandActivity',
'LogStorageSettings',
'DeleteActivity',
'SqlServerStoredProcedureActivity',
Expand Down
10 changes: 8 additions & 2 deletions ...ory/models/azure_data_explorer_command.py → ...s/azure_data_explorer_command_activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from .execution_activity import ExecutionActivity


class AzureDataExplorerCommand(ExecutionActivity):
class AzureDataExplorerCommandActivity(ExecutionActivity):
"""Azure Data Explorer command activity.

All required parameters must be populated in order to send to Azure.
Expand All @@ -39,6 +39,10 @@ class AzureDataExplorerCommand(ExecutionActivity):
Explorer command syntax. Type: string (or Expression with resultType
string).
:type command: object
:param command_timeout: Control command timeout. Type: string (or
Expression with resultType string), pattern:
((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))..)
:type command_timeout: object
"""

_validation = {
Expand All @@ -57,9 +61,11 @@ class AzureDataExplorerCommand(ExecutionActivity):
'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
'policy': {'key': 'policy', 'type': 'ActivityPolicy'},
'command': {'key': 'typeProperties.command', 'type': 'object'},
'command_timeout': {'key': 'typeProperties.commandTimeout', 'type': 'object'},
}

def __init__(self, **kwargs):
super(AzureDataExplorerCommand, self).__init__(**kwargs)
super(AzureDataExplorerCommandActivity, self).__init__(**kwargs)
self.command = kwargs.get('command', None)
self.command_timeout = kwargs.get('command_timeout', None)
self.type = 'AzureDataExplorerCommand'
12 changes: 9 additions & 3 deletions ...models/azure_data_explorer_command_py3.py → ...ure_data_explorer_command_activity_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from .execution_activity_py3 import ExecutionActivity


class AzureDataExplorerCommand(ExecutionActivity):
class AzureDataExplorerCommandActivity(ExecutionActivity):
"""Azure Data Explorer command activity.

All required parameters must be populated in order to send to Azure.
Expand All @@ -39,6 +39,10 @@ class AzureDataExplorerCommand(ExecutionActivity):
Explorer command syntax. Type: string (or Expression with resultType
string).
:type command: object
:param command_timeout: Control command timeout. Type: string (or
Expression with resultType string), pattern:
((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))..)
:type command_timeout: object
"""

_validation = {
Expand All @@ -57,9 +61,11 @@ class AzureDataExplorerCommand(ExecutionActivity):
'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
'policy': {'key': 'policy', 'type': 'ActivityPolicy'},
'command': {'key': 'typeProperties.command', 'type': 'object'},
'command_timeout': {'key': 'typeProperties.commandTimeout', 'type': 'object'},
}

def __init__(self, *, name: str, command, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, **kwargs) -> None:
super(AzureDataExplorerCommand, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs)
def __init__(self, *, name: str, command, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, command_timeout=None, **kwargs) -> None:
super(AzureDataExplorerCommandActivity, self).__init__(additional_properties=additional_properties, name=name, description=description, depends_on=depends_on, user_properties=user_properties, linked_service_name=linked_service_name, policy=policy, **kwargs)
self.command = command
self.command_timeout = command_timeout
self.type = 'AzureDataExplorerCommand'
4 changes: 2 additions & 2 deletions sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ExecutionActivity(Activity):
DatabricksSparkJarActivity, DatabricksNotebookActivity,
DataLakeAnalyticsUSQLActivity, AzureMLUpdateResourceActivity,
AzureMLBatchExecutionActivity, GetMetadataActivity, WebActivity,
LookupActivity, AzureDataExplorerCommand, DeleteActivity,
LookupActivity, AzureDataExplorerCommandActivity, DeleteActivity,
SqlServerStoredProcedureActivity, CustomActivity,
ExecuteSSISPackageActivity, HDInsightSparkActivity,
HDInsightStreamingActivity, HDInsightMapReduceActivity,
Expand Down Expand Up @@ -65,7 +65,7 @@ class ExecutionActivity(Activity):
}

_subtype_map = {
'type': {'AzureFunctionActivity': 'AzureFunctionActivity', 'DatabricksSparkPython': 'DatabricksSparkPythonActivity', 'DatabricksSparkJar': 'DatabricksSparkJarActivity', 'DatabricksNotebook': 'DatabricksNotebookActivity', 'DataLakeAnalyticsU-SQL': 'DataLakeAnalyticsUSQLActivity', 'AzureMLUpdateResource': 'AzureMLUpdateResourceActivity', 'AzureMLBatchExecution': 'AzureMLBatchExecutionActivity', 'GetMetadata': 'GetMetadataActivity', 'WebActivity': 'WebActivity', 'Lookup': 'LookupActivity', 'AzureDataExplorerCommand': 'AzureDataExplorerCommand', 'Delete': 'DeleteActivity', 'SqlServerStoredProcedure': 'SqlServerStoredProcedureActivity', 'Custom': 'CustomActivity', 'ExecuteSSISPackage': 'ExecuteSSISPackageActivity', 'HDInsightSpark': 'HDInsightSparkActivity', 'HDInsightStreaming': 'HDInsightStreamingActivity', 'HDInsightMapReduce': 'HDInsightMapReduceActivity', 'HDInsightPig': 'HDInsightPigActivity', 'HDInsightHive': 'HDInsightHiveActivity', 'Copy': 'CopyActivity'}
'type': {'AzureFunctionActivity': 'AzureFunctionActivity', 'DatabricksSparkPython': 'DatabricksSparkPythonActivity', 'DatabricksSparkJar': 'DatabricksSparkJarActivity', 'DatabricksNotebook': 'DatabricksNotebookActivity', 'DataLakeAnalyticsU-SQL': 'DataLakeAnalyticsUSQLActivity', 'AzureMLUpdateResource': 'AzureMLUpdateResourceActivity', 'AzureMLBatchExecution': 'AzureMLBatchExecutionActivity', 'GetMetadata': 'GetMetadataActivity', 'WebActivity': 'WebActivity', 'Lookup': 'LookupActivity', 'AzureDataExplorerCommand': 'AzureDataExplorerCommandActivity', 'Delete': 'DeleteActivity', 'SqlServerStoredProcedure': 'SqlServerStoredProcedureActivity', 'Custom': 'CustomActivity', 'ExecuteSSISPackage': 'ExecuteSSISPackageActivity', 'HDInsightSpark': 'HDInsightSparkActivity', 'HDInsightStreaming': 'HDInsightStreamingActivity', 'HDInsightMapReduce': 'HDInsightMapReduceActivity', 'HDInsightPig': 'HDInsightPigActivity', 'HDInsightHive': 'HDInsightHiveActivity', 'Copy': 'CopyActivity'}
}

def __init__(self, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions ...atafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class ExecutionActivity(Activity):
DatabricksSparkJarActivity, DatabricksNotebookActivity,
DataLakeAnalyticsUSQLActivity, AzureMLUpdateResourceActivity,
AzureMLBatchExecutionActivity, GetMetadataActivity, WebActivity,
LookupActivity, AzureDataExplorerCommand, DeleteActivity,
LookupActivity, AzureDataExplorerCommandActivity, DeleteActivity,
SqlServerStoredProcedureActivity, CustomActivity,
ExecuteSSISPackageActivity, HDInsightSparkActivity,
HDInsightStreamingActivity, HDInsightMapReduceActivity,
Expand Down Expand Up @@ -65,7 +65,7 @@ class ExecutionActivity(Activity):
}

_subtype_map = {
'type': {'AzureFunctionActivity': 'AzureFunctionActivity', 'DatabricksSparkPython': 'DatabricksSparkPythonActivity', 'DatabricksSparkJar': 'DatabricksSparkJarActivity', 'DatabricksNotebook': 'DatabricksNotebookActivity', 'DataLakeAnalyticsU-SQL': 'DataLakeAnalyticsUSQLActivity', 'AzureMLUpdateResource': 'AzureMLUpdateResourceActivity', 'AzureMLBatchExecution': 'AzureMLBatchExecutionActivity', 'GetMetadata': 'GetMetadataActivity', 'WebActivity': 'WebActivity', 'Lookup': 'LookupActivity', 'AzureDataExplorerCommand': 'AzureDataExplorerCommand', 'Delete': 'DeleteActivity', 'SqlServerStoredProcedure': 'SqlServerStoredProcedureActivity', 'Custom': 'CustomActivity', 'ExecuteSSISPackage': 'ExecuteSSISPackageActivity', 'HDInsightSpark': 'HDInsightSparkActivity', 'HDInsightStreaming': 'HDInsightStreamingActivity', 'HDInsightMapReduce': 'HDInsightMapReduceActivity', 'HDInsightPig': 'HDInsightPigActivity', 'HDInsightHive': 'HDInsightHiveActivity', 'Copy': 'CopyActivity'}
'type': {'AzureFunctionActivity': 'AzureFunctionActivity', 'DatabricksSparkPython': 'DatabricksSparkPythonActivity', 'DatabricksSparkJar': 'DatabricksSparkJarActivity', 'DatabricksNotebook': 'DatabricksNotebookActivity', 'DataLakeAnalyticsU-SQL': 'DataLakeAnalyticsUSQLActivity', 'AzureMLUpdateResource': 'AzureMLUpdateResourceActivity', 'AzureMLBatchExecution': 'AzureMLBatchExecutionActivity', 'GetMetadata': 'GetMetadataActivity', 'WebActivity': 'WebActivity', 'Lookup': 'LookupActivity', 'AzureDataExplorerCommand': 'AzureDataExplorerCommandActivity', 'Delete': 'DeleteActivity', 'SqlServerStoredProcedure': 'SqlServerStoredProcedureActivity', 'Custom': 'CustomActivity', 'ExecuteSSISPackage': 'ExecuteSSISPackageActivity', 'HDInsightSpark': 'HDInsightSparkActivity', 'HDInsightStreaming': 'HDInsightStreamingActivity', 'HDInsightMapReduce': 'HDInsightMapReduceActivity', 'HDInsightPig': 'HDInsightPigActivity', 'HDInsightHive': 'HDInsightHiveActivity', 'Copy': 'CopyActivity'}
}

def __init__(self, *, name: str, additional_properties=None, description: str=None, depends_on=None, user_properties=None, linked_service_name=None, policy=None, **kwargs) -> None:
Expand Down