diff --git a/azure-mgmt-automation/azure/mgmt/automation/automation_client.py b/azure-mgmt-automation/azure/mgmt/automation/automation_client.py index 97f4f99fb898..a1d511e7d071 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/automation_client.py +++ b/azure-mgmt-automation/azure/mgmt/automation/automation_client.py @@ -64,16 +64,26 @@ class AutomationClientConfiguration(AzureConfiguration): identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. :type subscription_id: str + :param resource_group_name: The resource group name. + :type resource_group_name: str + :param client_request_id: Identifies this specific client request. + :type client_request_id: str + :param automation_account_name: The name of the automation account. + :type automation_account_name: str :param str base_url: Service URL """ def __init__( - self, credentials, subscription_id, base_url=None): + self, credentials, subscription_id, resource_group_name, automation_account_name, client_request_id=None, base_url=None): if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") if subscription_id is None: raise ValueError("Parameter 'subscription_id' must not be None.") + if resource_group_name is None: + raise ValueError("Parameter 'resource_group_name' must not be None.") + if automation_account_name is None: + raise ValueError("Parameter 'automation_account_name' must not be None.") if not base_url: base_url = 'https://management.azure.com' @@ -84,6 +94,9 @@ def __init__( self.credentials = credentials self.subscription_id = subscription_id + self.resource_group_name = resource_group_name + self.client_request_id = client_request_id + self.automation_account_name = automation_account_name class AutomationClient(object): @@ -172,13 +185,19 @@ class AutomationClient(object): identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. :type subscription_id: str + :param resource_group_name: The resource group name. + :type resource_group_name: str + :param client_request_id: Identifies this specific client request. + :type client_request_id: str + :param automation_account_name: The name of the automation account. + :type automation_account_name: str :param str base_url: Service URL """ def __init__( - self, credentials, subscription_id, base_url=None): + self, credentials, subscription_id, resource_group_name, automation_account_name, client_request_id=None, base_url=None): - self.config = AutomationClientConfiguration(credentials, subscription_id, base_url) + self.config = AutomationClientConfiguration(credentials, subscription_id, resource_group_name, automation_account_name, client_request_id, base_url) self._client = ServiceClient(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py b/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py index 8f5d82cf0552..900012700278 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py +++ b/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py @@ -57,7 +57,6 @@ from .job_provisioning_state_property import JobProvisioningStateProperty from .dsc_compilation_job import DscCompilationJob from .dsc_configuration_create_or_update_parameters import DscConfigurationCreateOrUpdateParameters -from .dsc_configuration_update_parameters import DscConfigurationUpdateParameters from .dsc_meta_configuration import DscMetaConfiguration from .dsc_node_configuration_create_or_update_parameters import DscNodeConfigurationCreateOrUpdateParameters from .dsc_node_configuration_association_property import DscNodeConfigurationAssociationProperty @@ -224,7 +223,6 @@ 'JobProvisioningStateProperty', 'DscCompilationJob', 'DscConfigurationCreateOrUpdateParameters', - 'DscConfigurationUpdateParameters', 'DscMetaConfiguration', 'DscNodeConfigurationCreateOrUpdateParameters', 'DscNodeConfigurationAssociationProperty', diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/dsc_configuration_update_parameters.py b/azure-mgmt-automation/azure/mgmt/automation/models/dsc_configuration_update_parameters.py deleted file mode 100644 index f7f86dcd3b6c..000000000000 --- a/azure-mgmt-automation/azure/mgmt/automation/models/dsc_configuration_update_parameters.py +++ /dev/null @@ -1,57 +0,0 @@ -# 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 DscConfigurationUpdateParameters(Model): - """The parameters supplied to the create or update configuration operation. - - :param log_verbose: Gets or sets verbose log option. - :type log_verbose: bool - :param log_progress: Gets or sets progress log option. - :type log_progress: bool - :param source: Gets or sets the source. - :type source: ~azure.mgmt.automation.models.ContentSource - :param parameters: Gets or sets the configuration parameters. - :type parameters: dict[str, - ~azure.mgmt.automation.models.DscConfigurationParameter] - :param description: Gets or sets the description of the configuration. - :type description: str - :param name: Gets or sets name of the resource. - :type name: str - :param tags: Gets or sets the tags attached to the resource. - :type tags: dict[str, str] - """ - - _validation = { - 'source': {'required': True}, - } - - _attribute_map = { - 'log_verbose': {'key': 'properties.logVerbose', 'type': 'bool'}, - 'log_progress': {'key': 'properties.logProgress', 'type': 'bool'}, - 'source': {'key': 'properties.source', 'type': 'ContentSource'}, - 'parameters': {'key': 'properties.parameters', 'type': '{DscConfigurationParameter}'}, - 'description': {'key': 'properties.description', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': '{str}'}, - } - - def __init__(self, source, log_verbose=None, log_progress=None, parameters=None, description=None, name=None, tags=None): - super(DscConfigurationUpdateParameters, self).__init__() - self.log_verbose = log_verbose - self.log_progress = log_progress - self.source = source - self.parameters = parameters - self.description = description - self.name = name - self.tags = tags diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/activity_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/activity_operations.py index ad790c9a94ec..3e7d55743fd2 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/activity_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/activity_operations.py @@ -37,12 +37,10 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get( - self, resource_group_name, automation_account_name, module_name, activity_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, module_name, activity_name, custom_headers=None, raw=False, **operation_config): """Retrieve the activity in the module identified by module name and activity name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param module_name: The name of module. @@ -63,7 +61,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'moduleName': self._serialize.url("module_name", module_name, 'str'), 'activityName': self._serialize.url("activity_name", activity_name, 'str'), @@ -105,11 +103,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/activities/{activityName}'} def list_by_module( - self, resource_group_name, automation_account_name, module_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, module_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of activities in the module identified by module name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param module_name: The name of module. @@ -131,7 +127,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_module.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'moduleName': self._serialize.url("module_name", module_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/agent_registration_information_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/agent_registration_information_operations.py index 506f22ef57be..f70c99cbce37 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/agent_registration_information_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/agent_registration_information_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve the automation agent registration information. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -58,7 +56,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -98,11 +96,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/agentRegistrationInformation'} def regenerate_key( - self, resource_group_name, automation_account_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, parameters, custom_headers=None, raw=False, **operation_config): """Regenerate a primary or secondary agent registration key. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param parameters: The name of the agent registration key to be @@ -123,7 +119,7 @@ def regenerate_key( # Construct URL url = self.regenerate_key.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/certificate_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/certificate_operations.py index 5218c1413fbd..aa4e283d394a 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/certificate_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/certificate_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, certificate_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, certificate_name, custom_headers=None, raw=False, **operation_config): """Delete the certificate. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param certificate_name: The name of certificate. @@ -59,7 +57,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'certificateName': self._serialize.url("certificate_name", certificate_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -93,11 +91,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'} def get( - self, resource_group_name, automation_account_name, certificate_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, certificate_name, custom_headers=None, raw=False, **operation_config): """Retrieve the certificate identified by certificate name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param certificate_name: The name of certificate. @@ -116,7 +112,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'certificateName': self._serialize.url("certificate_name", certificate_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -157,11 +153,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'} def create_or_update( - self, resource_group_name, automation_account_name, certificate_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, certificate_name, parameters, custom_headers=None, raw=False, **operation_config): """Create a certificate. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param certificate_name: The parameters supplied to the create or @@ -185,7 +179,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'certificateName': self._serialize.url("certificate_name", certificate_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -232,11 +226,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'} def update( - self, resource_group_name, automation_account_name, certificate_name, name=None, description=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, certificate_name, name=None, description=None, custom_headers=None, raw=False, **operation_config): """Update a certificate. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param certificate_name: The parameters supplied to the update @@ -262,7 +254,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'certificateName': self._serialize.url("certificate_name", certificate_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -307,11 +299,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/certificates/{certificateName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of certificates. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -331,7 +321,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/connection_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/connection_operations.py index 6d8662a9c63d..c10b544a8ca0 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/connection_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/connection_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, connection_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, connection_name, custom_headers=None, raw=False, **operation_config): """Delete the connection. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param connection_name: The name of connection. @@ -60,7 +58,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'connectionName': self._serialize.url("connection_name", connection_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -101,11 +99,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'} def get( - self, resource_group_name, automation_account_name, connection_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, connection_name, custom_headers=None, raw=False, **operation_config): """Retrieve the connection identified by connection name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param connection_name: The name of connection. @@ -124,7 +120,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'connectionName': self._serialize.url("connection_name", connection_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -165,11 +161,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'} def create_or_update( - self, resource_group_name, automation_account_name, connection_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, connection_name, parameters, custom_headers=None, raw=False, **operation_config): """Create or update a connection. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param connection_name: The parameters supplied to the create or @@ -193,7 +187,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'connectionName': self._serialize.url("connection_name", connection_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -240,11 +234,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'} def update( - self, resource_group_name, automation_account_name, connection_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, connection_name, parameters, custom_headers=None, raw=False, **operation_config): """Update a connection. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param connection_name: The parameters supplied to the update a @@ -268,7 +260,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'connectionName': self._serialize.url("connection_name", connection_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -313,11 +305,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connections/{connectionName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of connections. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -337,7 +327,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/connection_type_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/connection_type_operations.py index e07f34c3bff9..06894f10ed2b 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/connection_type_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/connection_type_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, connection_type_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, connection_type_name, custom_headers=None, raw=False, **operation_config): """Delete the connectiontype. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param connection_type_name: The name of connectiontype. @@ -59,7 +57,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'connectionTypeName': self._serialize.url("connection_type_name", connection_type_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -93,11 +91,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes/{connectionTypeName}'} def get( - self, resource_group_name, automation_account_name, connection_type_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, connection_type_name, custom_headers=None, raw=False, **operation_config): """Retrieve the connectiontype identified by connectiontype name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param connection_type_name: The name of connectiontype. @@ -116,7 +112,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'connectionTypeName': self._serialize.url("connection_type_name", connection_type_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -157,11 +153,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes/{connectionTypeName}'} def create_or_update( - self, resource_group_name, automation_account_name, connection_type_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, connection_type_name, parameters, custom_headers=None, raw=False, **operation_config): """Create a connectiontype. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param connection_type_name: The parameters supplied to the create or @@ -185,7 +179,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'connectionTypeName': self._serialize.url("connection_type_name", connection_type_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -232,11 +226,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/connectionTypes/{connectionTypeName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of connectiontypes. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -256,7 +248,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/credential_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/credential_operations.py index ce5095d33b18..2f7192c9dcd3 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/credential_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/credential_operations.py @@ -38,11 +38,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, credential_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, credential_name, custom_headers=None, raw=False, **operation_config): """Delete the credential. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param credential_name: The name of credential. @@ -60,7 +58,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'credentialName': self._serialize.url("credential_name", credential_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -94,11 +92,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'} def get( - self, resource_group_name, automation_account_name, credential_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, credential_name, custom_headers=None, raw=False, **operation_config): """Retrieve the credential identified by credential name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param credential_name: The name of credential. @@ -117,7 +113,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'credentialName': self._serialize.url("credential_name", credential_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -158,11 +154,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'} def create_or_update( - self, resource_group_name, automation_account_name, credential_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, credential_name, parameters, custom_headers=None, raw=False, **operation_config): """Create a credential. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param credential_name: The parameters supplied to the create or @@ -186,7 +180,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'credentialName': self._serialize.url("credential_name", credential_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -233,11 +227,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'} def update( - self, resource_group_name, automation_account_name, credential_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, credential_name, parameters, custom_headers=None, raw=False, **operation_config): """Update a credential. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param credential_name: The parameters supplied to the Update @@ -261,7 +253,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'credentialName': self._serialize.url("credential_name", credential_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -306,11 +298,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/credentials/{credentialName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of credentials. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -329,7 +319,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_operations.py index 29fc5094188d..0c072f0dca64 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def create( - self, resource_group_name, automation_account_name, compilation_job_id, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, compilation_job_id, parameters, custom_headers=None, raw=False, **operation_config): """Creates the Dsc compilation job of the configuration. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param compilation_job_id: The the DSC configuration Id. @@ -64,7 +62,7 @@ def create( # Construct URL url = self.create.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'compilationJobId': self._serialize.url("compilation_job_id", compilation_job_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -109,11 +107,9 @@ def create( create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{compilationJobId}'} def get( - self, resource_group_name, automation_account_name, compilation_job_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, compilation_job_id, custom_headers=None, raw=False, **operation_config): """Retrieve the Dsc configuration compilation job identified by job id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param compilation_job_id: The Dsc configuration compilation job id. @@ -132,7 +128,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'compilationJobId': self._serialize.url("compilation_job_id", compilation_job_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -173,11 +169,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs/{compilationJobId}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve a list of dsc compilation jobs. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param filter: The filter to apply on the operation. @@ -199,7 +193,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -247,11 +241,9 @@ def internal_paging(next_link=None, raw=False): list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/compilationjobs'} def get_stream( - self, resource_group_name, automation_account_name, job_id, job_stream_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, job_id, job_stream_id, custom_headers=None, raw=False, **operation_config): """Retrieve the job stream identified by job stream id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param job_id: The job id. @@ -272,7 +264,7 @@ def get_stream( # Construct URL url = self.get_stream.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'jobId': self._serialize.url("job_id", job_id, 'str'), 'jobStreamId': self._serialize.url("job_stream_id", job_stream_id, 'str'), diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_stream_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_stream_operations.py index 74cd83ecf830..6c15fc10dbe4 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_stream_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_compilation_job_stream_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def list_by_job( - self, resource_group_name, automation_account_name, job_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, job_id, custom_headers=None, raw=False, **operation_config): """Retrieve all the job streams for the compilation Job. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param job_id: The job id. @@ -60,7 +58,7 @@ def list_by_job( # Construct URL url = self.list_by_job.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'jobId': self._serialize.url("job_id", job_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_configuration_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_configuration_operations.py index b7151dfc8f01..16c68f60b46e 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_configuration_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_configuration_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, configuration_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, configuration_name, custom_headers=None, raw=False, **operation_config): """Delete the dsc configuration identified by configuration name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param configuration_name: The configuration name. @@ -59,7 +57,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'configurationName': self._serialize.url("configuration_name", configuration_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -93,11 +91,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'} def get( - self, resource_group_name, automation_account_name, configuration_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, configuration_name, custom_headers=None, raw=False, **operation_config): """Retrieve the configuration identified by configuration name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param configuration_name: The configuration name. @@ -116,7 +112,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'configurationName': self._serialize.url("configuration_name", configuration_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -157,11 +153,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'} def create_or_update( - self, resource_group_name, automation_account_name, configuration_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, configuration_name, parameters, custom_headers=None, raw=False, **operation_config): """Create the configuration identified by configuration name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param configuration_name: The create or update parameters for @@ -184,7 +178,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'configurationName': self._serialize.url("configuration_name", configuration_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -230,85 +224,10 @@ def create_or_update( return deserialized create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'} - def update( - self, automation_account_name, configuration_name, parameters=None, custom_headers=None, raw=False, **operation_config): - """Create the configuration identified by configuration name. - - :param automation_account_name: The automation account name. - :type automation_account_name: str - :param configuration_name: The create or update parameters for - configuration. - :type configuration_name: str - :param parameters: The create or update parameters for configuration. - :type parameters: - ~azure.mgmt.automation.models.DscConfigurationUpdateParameters - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: DscConfiguration or ClientRawResponse if raw=true - :rtype: ~azure.mgmt.automation.models.DscConfiguration or - ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` - """ - # Construct URL - url = self.update.metadata['url'] - path_format_arguments = { - 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), - 'configurationName': self._serialize.url("configuration_name", configuration_name, 'str'), - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct body - if parameters is not None: - body_content = self._serialize.body(parameters, 'DscConfigurationUpdateParameters') - else: - body_content = None - - # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) - - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('DscConfiguration', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}'} - def get_content( - self, resource_group_name, automation_account_name, configuration_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, configuration_name, custom_headers=None, raw=False, **operation_config): """Retrieve the configuration script identified by configuration name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param configuration_name: The configuration name. @@ -326,7 +245,7 @@ def get_content( # Construct URL url = self.get_content.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'configurationName': self._serialize.url("configuration_name", configuration_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -367,11 +286,9 @@ def get_content( get_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/configurations/{configurationName}/content'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of configurations. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -391,7 +308,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_configuration_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_configuration_operations.py index c5ca602d46bf..c48fa9d692e8 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_configuration_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_configuration_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, node_configuration_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, node_configuration_name, custom_headers=None, raw=False, **operation_config): """Delete the Dsc node configurations by node configuration. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param node_configuration_name: The Dsc node configuration name. @@ -59,7 +57,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'nodeConfigurationName': self._serialize.url("node_configuration_name", node_configuration_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -93,11 +91,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations/{nodeConfigurationName}'} def get( - self, resource_group_name, automation_account_name, node_configuration_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, node_configuration_name, custom_headers=None, raw=False, **operation_config): """Retrieve the Dsc node configurations by node configuration. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param node_configuration_name: The Dsc node configuration name. @@ -116,7 +112,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'nodeConfigurationName': self._serialize.url("node_configuration_name", node_configuration_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -157,11 +153,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations/{nodeConfigurationName}'} def create_or_update( - self, resource_group_name, automation_account_name, node_configuration_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, node_configuration_name, parameters, custom_headers=None, raw=False, **operation_config): """Create the node configuration identified by node configuration name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param node_configuration_name: The create or update parameters for @@ -184,7 +178,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'nodeConfigurationName': self._serialize.url("node_configuration_name", node_configuration_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -229,11 +223,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodeConfigurations/{nodeConfigurationName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve a list of dsc node configurations. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param filter: The filter to apply on the operation. @@ -255,7 +247,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_operations.py index a314dd7a45f2..c12b1d3a0006 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/dsc_node_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, node_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, node_id, custom_headers=None, raw=False, **operation_config): """Delete the dsc node identified by node id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: Automation account name. :type automation_account_name: str :param node_id: The node id. @@ -60,7 +58,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'nodeId': self._serialize.url("node_id", node_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -101,11 +99,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}'} def get( - self, resource_group_name, automation_account_name, node_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, node_id, custom_headers=None, raw=False, **operation_config): """Retrieve the dsc node identified by node id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param node_id: The node id. @@ -124,7 +120,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'nodeId': self._serialize.url("node_id", node_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -165,11 +161,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}'} def update( - self, resource_group_name, automation_account_name, node_id, node_id1=None, node_configuration=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, node_id, node_id1=None, node_configuration=None, custom_headers=None, raw=False, **operation_config): """Update the dsc node. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param node_id: Parameters supplied to the update dsc node. @@ -195,7 +189,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'nodeId': self._serialize.url("node_id", node_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -240,11 +234,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve a list of dsc nodes. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param filter: The filter to apply on the operation. @@ -266,7 +258,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/fields_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/fields_operations.py index ac141473f1af..3d0245394b74 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/fields_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/fields_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def list_by_type( - self, resource_group_name, automation_account_name, module_name, type_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, module_name, type_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of fields of a given type identified by module name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param module_name: The name of module. @@ -65,7 +63,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_type.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'moduleName': self._serialize.url("module_name", module_name, 'str'), 'typeName': self._serialize.url("type_name", type_name, 'str'), diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/hybrid_runbook_worker_group_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/hybrid_runbook_worker_group_operations.py index f2cd4b4eb702..b07d8d770401 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/hybrid_runbook_worker_group_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/hybrid_runbook_worker_group_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, hybrid_runbook_worker_group_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, hybrid_runbook_worker_group_name, custom_headers=None, raw=False, **operation_config): """Delete a hybrid runbook worker group. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: Automation account name. :type automation_account_name: str :param hybrid_runbook_worker_group_name: The hybrid runbook worker @@ -60,7 +58,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'hybridRunbookWorkerGroupName': self._serialize.url("hybrid_runbook_worker_group_name", hybrid_runbook_worker_group_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -94,11 +92,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups/{hybridRunbookWorkerGroupName}'} def get( - self, resource_group_name, automation_account_name, hybrid_runbook_worker_group_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, hybrid_runbook_worker_group_name, custom_headers=None, raw=False, **operation_config): """Retrieve a hybrid runbook worker group. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param hybrid_runbook_worker_group_name: The hybrid runbook worker @@ -118,7 +114,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'hybridRunbookWorkerGroupName': self._serialize.url("hybrid_runbook_worker_group_name", hybrid_runbook_worker_group_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -159,11 +155,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups/{hybridRunbookWorkerGroupName}'} def update( - self, resource_group_name, automation_account_name, hybrid_runbook_worker_group_name, credential=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, hybrid_runbook_worker_group_name, credential=None, custom_headers=None, raw=False, **operation_config): """Update a hybrid runbook worker group. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param hybrid_runbook_worker_group_name: The hybrid runbook worker @@ -188,7 +182,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'hybridRunbookWorkerGroupName': self._serialize.url("hybrid_runbook_worker_group_name", hybrid_runbook_worker_group_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -233,11 +227,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/hybridRunbookWorkerGroups/{hybridRunbookWorkerGroupName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of hybrid runbook worker groups. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -257,7 +249,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/job_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/job_operations.py index 1b3669096fe0..55947bc866b6 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/job_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/job_operations.py @@ -38,17 +38,11 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get_output( - self, resource_group_name, automation_account_name, job_name, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, job_name, custom_headers=None, raw=False, **operation_config): """Retrieve the job output identified by job name. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param job_name: The name of the job to be created. :type job_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -62,8 +56,8 @@ def get_output( url = self.get_output.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'jobName': self._serialize.url("job_name", job_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -79,8 +73,8 @@ def get_output( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -106,17 +100,11 @@ def get_output( get_output.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/output'} def get_runbook_content( - self, resource_group_name, automation_account_name, job_name, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, job_name, custom_headers=None, raw=False, **operation_config): """Retrieve the runbook content of the job identified by job name. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param job_name: The job name. :type job_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -130,8 +118,8 @@ def get_runbook_content( url = self.get_runbook_content.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'jobName': self._serialize.url("job_name", job_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -147,8 +135,8 @@ def get_runbook_content( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -174,17 +162,11 @@ def get_runbook_content( get_runbook_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/runbookContent'} def suspend( - self, resource_group_name, automation_account_name, job_name, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, job_name, custom_headers=None, raw=False, **operation_config): """Suspend the job identified by job name. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param job_name: The job name. :type job_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -199,8 +181,8 @@ def suspend( url = self.suspend.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'jobName': self._serialize.url("job_name", job_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -216,8 +198,8 @@ def suspend( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -234,17 +216,11 @@ def suspend( suspend.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/suspend'} def stop( - self, resource_group_name, automation_account_name, job_name, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, job_name, custom_headers=None, raw=False, **operation_config): """Stop the job identified by jobName. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param job_name: The job name. :type job_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -258,8 +234,8 @@ def stop( # Construct URL url = self.stop.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'jobName': self._serialize.url("job_name", job_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -276,8 +252,8 @@ def stop( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -294,17 +270,11 @@ def stop( stop.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/stop'} def get( - self, resource_group_name, automation_account_name, job_name, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, job_name, custom_headers=None, raw=False, **operation_config): """Retrieve the job identified by job name. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param job_name: The job name. :type job_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -320,8 +290,8 @@ def get( url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'jobName': self._serialize.url("job_name", job_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -337,8 +307,8 @@ def get( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -362,20 +332,14 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}'} def create( - self, resource_group_name, automation_account_name, job_name, parameters, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, job_name, parameters, custom_headers=None, raw=False, **operation_config): """Create a job of the runbook. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param job_name: The job name. :type job_name: str :param parameters: The parameters supplied to the create job operation. :type parameters: ~azure.mgmt.automation.models.JobCreateParameters - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -391,8 +355,8 @@ def create( url = self.create.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'jobName': self._serialize.url("job_name", job_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -408,8 +372,8 @@ def create( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -437,17 +401,11 @@ def create( create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, filter=None, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve a list of jobs. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param filter: The filter to apply on the operation. :type filter: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -465,8 +423,8 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -488,8 +446,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -515,17 +473,11 @@ def internal_paging(next_link=None, raw=False): list_by_automation_account.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs'} def resume( - self, resource_group_name, automation_account_name, job_name, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, job_name, custom_headers=None, raw=False, **operation_config): """Resume the job identified by jobName. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param job_name: The job name. :type job_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -539,8 +491,8 @@ def resume( # Construct URL url = self.resume.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'jobName': self._serialize.url("job_name", job_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -557,8 +509,8 @@ def resume( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/job_schedule_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/job_schedule_operations.py index 7ac26ae08922..5a5ea3075277 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/job_schedule_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/job_schedule_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, job_schedule_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, job_schedule_id, custom_headers=None, raw=False, **operation_config): """Delete the job schedule identified by job schedule name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param job_schedule_id: The job schedule name. @@ -59,7 +57,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'jobScheduleId': self._serialize.url("job_schedule_id", job_schedule_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -93,11 +91,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules/{jobScheduleId}'} def get( - self, resource_group_name, automation_account_name, job_schedule_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, job_schedule_id, custom_headers=None, raw=False, **operation_config): """Retrieve the job schedule identified by job schedule name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param job_schedule_id: The job schedule name. @@ -116,7 +112,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'jobScheduleId': self._serialize.url("job_schedule_id", job_schedule_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -157,11 +153,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules/{jobScheduleId}'} def create( - self, resource_group_name, automation_account_name, job_schedule_id, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, job_schedule_id, parameters, custom_headers=None, raw=False, **operation_config): """Create a job schedule. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param job_schedule_id: The job schedule name. @@ -184,7 +178,7 @@ def create( # Construct URL url = self.create.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'jobScheduleId': self._serialize.url("job_schedule_id", job_schedule_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -229,11 +223,9 @@ def create( create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobSchedules/{jobScheduleId}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of job schedules. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -253,7 +245,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/job_stream_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/job_stream_operations.py index 0e2ed8264510..66664c8175f9 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/job_stream_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/job_stream_operations.py @@ -37,19 +37,13 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get( - self, resource_group_name, automation_account_name, job_name, job_stream_id, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, job_name, job_stream_id, custom_headers=None, raw=False, **operation_config): """Retrieve the job stream identified by job stream id. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param job_name: The job name. :type job_name: str :param job_stream_id: The job stream id. :type job_stream_id: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -65,8 +59,8 @@ def get( url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'jobName': self._serialize.url("job_name", job_name, 'str'), 'jobStreamId': self._serialize.url("job_stream_id", job_stream_id, 'str') } @@ -83,8 +77,8 @@ def get( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -108,19 +102,13 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/jobs/{jobName}/streams/{jobStreamId}'} def list_by_job( - self, resource_group_name, automation_account_name, job_name, filter=None, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, job_name, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve a list of jobs streams identified by job name. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param job_name: The job name. :type job_name: str :param filter: The filter to apply on the operation. :type filter: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -138,8 +126,8 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_job.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'jobName': self._serialize.url("job_name", job_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -162,8 +150,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/linked_workspace_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/linked_workspace_operations.py index 996aa2541f14..2c233ec6c506 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/linked_workspace_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/linked_workspace_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve the linked workspace for the account id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -58,7 +56,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/module_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/module_operations.py index ea998d2f420a..b6f9eb93acf6 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/module_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/module_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def delete( - self, resource_group_name, automation_account_name, module_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, module_name, custom_headers=None, raw=False, **operation_config): """Delete the module by name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param module_name: The module name. @@ -59,7 +57,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'moduleName': self._serialize.url("module_name", module_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -93,11 +91,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'} def get( - self, resource_group_name, automation_account_name, module_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, module_name, custom_headers=None, raw=False, **operation_config): """Retrieve the module identified by module name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param module_name: The module name. @@ -116,7 +112,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'moduleName': self._serialize.url("module_name", module_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -157,11 +153,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'} def create_or_update( - self, resource_group_name, automation_account_name, module_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, module_name, parameters, custom_headers=None, raw=False, **operation_config): """Create or Update the module identified by module name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param module_name: The name of module. @@ -183,7 +177,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'moduleName': self._serialize.url("module_name", module_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -230,11 +224,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'} def update( - self, resource_group_name, automation_account_name, module_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, module_name, parameters, custom_headers=None, raw=False, **operation_config): """Update the module identified by module name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param module_name: The name of module. @@ -255,7 +247,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'moduleName': self._serialize.url("module_name", module_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -300,11 +292,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of modules. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -324,7 +314,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/node_reports_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/node_reports_operations.py index d539077e663e..e347ea723baa 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/node_reports_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/node_reports_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def list_by_node( - self, resource_group_name, automation_account_name, node_id, filter=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, node_id, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve the Dsc node report list by node id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param node_id: The parameters supplied to the list operation. @@ -65,7 +63,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_node.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'nodeId': self._serialize.url("node_id", node_id, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -114,11 +112,9 @@ def internal_paging(next_link=None, raw=False): list_by_node.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}/reports'} def get( - self, resource_group_name, automation_account_name, node_id, report_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, node_id, report_id, custom_headers=None, raw=False, **operation_config): """Retrieve the Dsc node report data by node id and report id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param node_id: The Dsc node id. @@ -139,7 +135,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'nodeId': self._serialize.url("node_id", node_id, 'str'), 'reportId': self._serialize.url("report_id", report_id, 'str'), @@ -181,11 +177,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/nodes/{nodeId}/reports/{reportId}'} def get_content( - self, resource_group_name, automation_account_name, node_id, report_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, node_id, report_id, custom_headers=None, raw=False, **operation_config): """Retrieve the Dsc node reports by node id and report id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param node_id: The Dsc node id. @@ -205,7 +199,7 @@ def get_content( # Construct URL url = self.get_content.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'nodeId': self._serialize.url("node_id", node_id, 'str'), 'reportId': self._serialize.url("report_id", report_id, 'str'), diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/object_data_types_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/object_data_types_operations.py index a7300bdfa0c6..984982241cf0 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/object_data_types_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/object_data_types_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def list_fields_by_module_and_type( - self, resource_group_name, automation_account_name, module_name, type_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, module_name, type_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of fields of a given type identified by module name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param module_name: The name of module. @@ -65,7 +63,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_fields_by_module_and_type.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'moduleName': self._serialize.url("module_name", module_name, 'str'), 'typeName': self._serialize.url("type_name", type_name, 'str'), @@ -113,12 +111,10 @@ def internal_paging(next_link=None, raw=False): list_fields_by_module_and_type.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/modules/{moduleName}/objectDataTypes/{typeName}/fields'} def list_fields_by_type( - self, resource_group_name, automation_account_name, type_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, type_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of fields of a given type across all accessible modules. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param type_name: The name of type. @@ -140,7 +136,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_fields_by_type.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'typeName': self._serialize.url("type_name", type_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_draft_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_draft_operations.py index 53fbc8232120..9afe236c401b 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_draft_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_draft_operations.py @@ -40,11 +40,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get_content( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Retrieve the content of runbook draft identified by runbook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -62,7 +60,7 @@ def get_content( url = self.get_content.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -105,12 +103,12 @@ def get_content( def _replace_content_initial( - self, resource_group_name, automation_account_name, runbook_name, runbook_content, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, runbook_content, custom_headers=None, raw=False, **operation_config): # Construct URL url = self.replace_content.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -150,11 +148,9 @@ def _replace_content_initial( return client_raw_response def replace_content( - self, resource_group_name, automation_account_name, runbook_name, runbook_content, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, runbook_content, custom_headers=None, raw=False, **operation_config): """Replaces the runbook draft content. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -172,7 +168,6 @@ def replace_content( :class:`ErrorResponseException` """ raw_result = self._replace_content_initial( - resource_group_name=resource_group_name, automation_account_name=automation_account_name, runbook_name=runbook_name, runbook_content=runbook_content, @@ -218,11 +213,9 @@ def get_long_running_output(response): replace_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/content'} def get( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Retrieve the runbook draft identified by runbook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -242,7 +235,7 @@ def get( url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -283,12 +276,12 @@ def get( def _publish_initial( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): # Construct URL url = self.publish.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -324,11 +317,9 @@ def _publish_initial( return client_raw_response def publish( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Publish runbook draft. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The parameters supplied to the publish runbook @@ -345,7 +336,6 @@ def publish( :class:`ErrorResponseException` """ raw_result = self._publish_initial( - resource_group_name=resource_group_name, automation_account_name=automation_account_name, runbook_name=runbook_name, custom_headers=custom_headers, @@ -390,12 +380,10 @@ def get_long_running_output(response): publish.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/publish'} def undo_edit( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Undo draft edit to last known published state identified by runbook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -415,7 +403,7 @@ def undo_edit( url = self.undo_edit.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_operations.py index c51a3a4a8512..f30157e3fd5c 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/runbook_operations.py @@ -38,11 +38,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get_content( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Retrieve the content of runbook identified by runbook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -60,7 +58,7 @@ def get_content( url = self.get_content.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -102,11 +100,9 @@ def get_content( get_content.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/content'} def get( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Retrieve the runbook identified by runbook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -126,7 +122,7 @@ def get( url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -166,11 +162,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'} def create_or_update( - self, resource_group_name, automation_account_name, runbook_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, parameters, custom_headers=None, raw=False, **operation_config): """Create the runbook identified by runbook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -195,7 +189,7 @@ def create_or_update( url = self.create_or_update.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -241,11 +235,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'} def update( - self, resource_group_name, automation_account_name, runbook_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, parameters, custom_headers=None, raw=False, **operation_config): """Update the runbook identified by runbook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -268,7 +260,7 @@ def update( url = self.update.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -312,11 +304,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'} def delete( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Delete the runbook by name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -335,7 +325,7 @@ def delete( url = self.delete.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -368,11 +358,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of runbooks. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -393,7 +381,7 @@ def internal_paging(next_link=None, raw=False): url = self.list_by_automation_account.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str') } url = self._client.format_url(url, **path_format_arguments) diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/schedule_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/schedule_operations.py index 733fd2ae2250..d409cb133591 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/schedule_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/schedule_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def create_or_update( - self, resource_group_name, automation_account_name, schedule_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, schedule_name, parameters, custom_headers=None, raw=False, **operation_config): """Create a schedule. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param schedule_name: The schedule name. @@ -64,7 +62,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'scheduleName': self._serialize.url("schedule_name", schedule_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -109,11 +107,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'} def update( - self, resource_group_name, automation_account_name, schedule_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, schedule_name, parameters, custom_headers=None, raw=False, **operation_config): """Update the schedule identified by schedule name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param schedule_name: The schedule name. @@ -136,7 +132,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'scheduleName': self._serialize.url("schedule_name", schedule_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -181,11 +177,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'} def get( - self, resource_group_name, automation_account_name, schedule_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, schedule_name, custom_headers=None, raw=False, **operation_config): """Retrieve the schedule identified by schedule name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param schedule_name: The schedule name. @@ -204,7 +198,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'scheduleName': self._serialize.url("schedule_name", schedule_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -245,11 +239,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'} def delete( - self, resource_group_name, automation_account_name, schedule_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, schedule_name, custom_headers=None, raw=False, **operation_config): """Delete the schedule identified by schedule name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param schedule_name: The schedule name. @@ -267,7 +259,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'scheduleName': self._serialize.url("schedule_name", schedule_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -301,11 +293,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/schedules/{scheduleName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of schedules. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -325,7 +315,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_machine_runs_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_machine_runs_operations.py index 62070dbe2945..87daaf2e5ad3 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_machine_runs_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_machine_runs_operations.py @@ -38,18 +38,12 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get_by_id( - self, resource_group_name, automation_account_name, software_update_configuration_machine_run_id, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, software_update_configuration_machine_run_id, custom_headers=None, raw=False, **operation_config): """Get a single software update configuration machine run by Id. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param software_update_configuration_machine_run_id: The Id of the software update configuration machine run. :type software_update_configuration_machine_run_id: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -66,8 +60,8 @@ def get_by_id( url = self.get_by_id.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'softwareUpdateConfigurationMachineRunId': self._serialize.url("software_update_configuration_machine_run_id", software_update_configuration_machine_run_id, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -83,8 +77,8 @@ def get_by_id( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -110,15 +104,9 @@ def get_by_id( get_by_id.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationMachineRuns/{softwareUpdateConfigurationMachineRunId}'} def list( - self, resource_group_name, automation_account_name, client_request_id=None, filter=None, skip=None, top=None, custom_headers=None, raw=False, **operation_config): + self, filter=None, skip=None, top=None, custom_headers=None, raw=False, **operation_config): """Return list of software update configuration machine runs. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param filter: The filter to apply on the operation. You can use the following filters: 'properties/osType', 'properties/status', 'properties/startTime', and @@ -145,8 +133,8 @@ def list( url = self.list.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str') + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -167,8 +155,8 @@ def list( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_runs_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_runs_operations.py index a98995f92db1..21618c706b7e 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_runs_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configuration_runs_operations.py @@ -38,18 +38,12 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get_by_id( - self, resource_group_name, automation_account_name, software_update_configuration_run_id, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, software_update_configuration_run_id, custom_headers=None, raw=False, **operation_config): """Get a single software update configuration Run by Id. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param software_update_configuration_run_id: The Id of the software update configuration run. :type software_update_configuration_run_id: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -65,8 +59,8 @@ def get_by_id( url = self.get_by_id.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'softwareUpdateConfigurationRunId': self._serialize.url("software_update_configuration_run_id", software_update_configuration_run_id, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -82,8 +76,8 @@ def get_by_id( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -109,15 +103,9 @@ def get_by_id( get_by_id.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurationRuns/{softwareUpdateConfigurationRunId}'} def list( - self, resource_group_name, automation_account_name, client_request_id=None, filter=None, skip=None, top=None, custom_headers=None, raw=False, **operation_config): + self, filter=None, skip=None, top=None, custom_headers=None, raw=False, **operation_config): """Return list of software update configuration runs. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param filter: The filter to apply on the operation. You can use the following filters: 'properties/osType', 'properties/status', 'properties/startTime', and @@ -144,8 +132,8 @@ def list( url = self.list.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str') + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -166,8 +154,8 @@ def list( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configurations_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configurations_operations.py index 288f0a78aaa1..44246bc2b86a 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configurations_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/software_update_configurations_operations.py @@ -38,22 +38,16 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def create( - self, resource_group_name, automation_account_name, software_update_configuration_name, parameters, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, software_update_configuration_name, parameters, custom_headers=None, raw=False, **operation_config): """Create a new software update configuration with the name given in the URI. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param software_update_configuration_name: The name of the software update configuration to be created. :type software_update_configuration_name: str :param parameters: Request body. :type parameters: ~azure.mgmt.automation.models.SoftwareUpdateConfiguration - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -68,8 +62,8 @@ def create( url = self.create.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'softwareUpdateConfigurationName': self._serialize.url("software_update_configuration_name", software_update_configuration_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -85,8 +79,8 @@ def create( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -118,18 +112,12 @@ def create( create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations/{softwareUpdateConfigurationName}'} def get_by_name( - self, resource_group_name, automation_account_name, software_update_configuration_name, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, software_update_configuration_name, custom_headers=None, raw=False, **operation_config): """Get a single software update configuration by name. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param software_update_configuration_name: The name of the software update configuration to be created. :type software_update_configuration_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -144,8 +132,8 @@ def get_by_name( url = self.get_by_name.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'softwareUpdateConfigurationName': self._serialize.url("software_update_configuration_name", software_update_configuration_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -161,8 +149,8 @@ def get_by_name( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -188,18 +176,12 @@ def get_by_name( get_by_name.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations/{softwareUpdateConfigurationName}'} def delete( - self, resource_group_name, automation_account_name, software_update_configuration_name, client_request_id=None, custom_headers=None, raw=False, **operation_config): + self, software_update_configuration_name, custom_headers=None, raw=False, **operation_config): """delete a specific software update configuration. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str :param software_update_configuration_name: The name of the software update configuration to be created. :type software_update_configuration_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -213,8 +195,8 @@ def delete( url = self.delete.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str'), 'softwareUpdateConfigurationName': self._serialize.url("software_update_configuration_name", software_update_configuration_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -230,8 +212,8 @@ def delete( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') @@ -250,15 +232,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/softwareUpdateConfigurations/{softwareUpdateConfigurationName}'} def list( - self, resource_group_name, automation_account_name, client_request_id=None, filter=None, custom_headers=None, raw=False, **operation_config): + self, filter=None, custom_headers=None, raw=False, **operation_config): """Get all software update configurations for the account. - :param resource_group_name: The resource group name. - :type resource_group_name: str - :param automation_account_name: The name of the automation account. - :type automation_account_name: str - :param client_request_id: Identifies this specific client request. - :type client_request_id: str :param filter: The filter to apply on the operation. :type filter: str :param dict custom_headers: headers that will be added to the request @@ -277,8 +253,8 @@ def list( url = self.list.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), - 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str') + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'automationAccountName': self._serialize.url("self.config.automation_account_name", self.config.automation_account_name, 'str') } url = self._client.format_url(url, **path_format_arguments) @@ -295,8 +271,8 @@ def list( header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: header_parameters.update(custom_headers) - if client_request_id is not None: - header_parameters['clientRequestId'] = self._serialize.header("client_request_id", client_request_id, 'str') + if self.config.client_request_id is not None: + header_parameters['clientRequestId'] = self._serialize.header("self.config.client_request_id", self.config.client_request_id, 'str') if self.config.accept_language is not None: header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_operations.py index b1658310296b..613bf904925b 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def create_or_update( - self, resource_group_name, automation_account_name, source_control_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, source_control_name, parameters, custom_headers=None, raw=False, **operation_config): """Create a source control. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param source_control_name: The source control name. @@ -64,7 +62,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'sourceControlName': self._serialize.url("source_control_name", source_control_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -111,11 +109,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'} def update( - self, resource_group_name, automation_account_name, source_control_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, source_control_name, parameters, custom_headers=None, raw=False, **operation_config): """Update a source control. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param source_control_name: The source control name. @@ -138,7 +134,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'sourceControlName': self._serialize.url("source_control_name", source_control_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -183,11 +179,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'} def delete( - self, resource_group_name, automation_account_name, source_control_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, source_control_name, custom_headers=None, raw=False, **operation_config): """Delete the source control. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param source_control_name: The name of source control. @@ -205,7 +199,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'sourceControlName': self._serialize.url("source_control_name", source_control_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -239,11 +233,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'} def get( - self, resource_group_name, automation_account_name, source_control_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, source_control_name, custom_headers=None, raw=False, **operation_config): """Retrieve the source control identified by source control name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param source_control_name: The name of source control. @@ -262,7 +254,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'sourceControlName': self._serialize.url("source_control_name", source_control_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -303,11 +295,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve a list of source controls. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param filter: The filter to apply on the operation. @@ -329,7 +319,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_sync_job_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_sync_job_operations.py index af4d83a6ee59..db6a40acfdd8 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_sync_job_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/source_control_sync_job_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def create( - self, resource_group_name, automation_account_name, source_control_name, source_control_sync_job_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, source_control_name, source_control_sync_job_id, custom_headers=None, raw=False, **operation_config): """Creates the sync job for a source control. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param source_control_name: The source control name. @@ -62,7 +60,7 @@ def create( # Construct URL url = self.create.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'sourceControlName': self._serialize.url("source_control_name", source_control_name, 'str'), 'sourceControlSyncJobId': self._serialize.url("source_control_sync_job_id", source_control_sync_job_id, 'str'), @@ -104,11 +102,9 @@ def create( create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}/sourceControlSyncJobs/{sourceControlSyncJobId}'} def get( - self, resource_group_name, automation_account_name, source_control_name, source_control_sync_job_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, source_control_name, source_control_sync_job_id, custom_headers=None, raw=False, **operation_config): """Retrieve the source control sync job identified by job id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param source_control_name: The source control name. @@ -129,7 +125,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'sourceControlName': self._serialize.url("source_control_name", source_control_name, 'str'), 'sourceControlSyncJobId': self._serialize.url("source_control_sync_job_id", source_control_sync_job_id, 'str'), @@ -171,11 +167,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/sourceControls/{sourceControlName}/sourceControlSyncJobs/{sourceControlSyncJobId}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, source_control_name, filter=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, source_control_name, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve a list of source control sync jobs. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param source_control_name: The source control name. @@ -199,7 +193,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'sourceControlName': self._serialize.url("source_control_name", source_control_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_operations.py index 4149094d8901..cabb25789a0b 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def create( - self, resource_group_name, automation_account_name, runbook_name, parameters=None, run_on=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, parameters=None, run_on=None, custom_headers=None, raw=False, **operation_config): """Create a test job of the runbook. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The parameters supplied to the create test job @@ -69,7 +67,7 @@ def create( url = self.create.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -113,11 +111,9 @@ def create( create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob'} def get( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Retrieve the test job for the specified runbook. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -137,7 +133,7 @@ def get( url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -177,11 +173,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob'} def resume( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Resume the test job. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -200,7 +194,7 @@ def resume( url = self.resume.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -233,11 +227,9 @@ def resume( resume.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/resume'} def stop( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Stop the test job. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -256,7 +248,7 @@ def stop( url = self.stop.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } @@ -289,11 +281,9 @@ def stop( stop.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/stop'} def suspend( - self, resource_group_name, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, custom_headers=None, raw=False, **operation_config): """Suspend the test job. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -312,7 +302,7 @@ def suspend( url = self.suspend.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_streams_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_streams_operations.py index 2fb882caf13a..665dccebcfe0 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_streams_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/test_job_streams_operations.py @@ -37,12 +37,10 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def get( - self, resource_group_name, automation_account_name, runbook_name, job_stream_id, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, job_stream_id, custom_headers=None, raw=False, **operation_config): """Retrieve a test job stream of the test job identified by runbook name and stream id. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -64,7 +62,7 @@ def get( url = self.get.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str'), 'jobStreamId': self._serialize.url("job_stream_id", job_stream_id, 'str') @@ -105,11 +103,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/runbooks/{runbookName}/draft/testJob/streams/{jobStreamId}'} def list_by_test_job( - self, resource_group_name, automation_account_name, runbook_name, filter=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, runbook_name, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve a list of test job streams identified by runbook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param runbook_name: The runbook name. @@ -134,7 +130,7 @@ def internal_paging(next_link=None, raw=False): url = self.list_by_test_job.metadata['url'] path_format_arguments = { 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'runbookName': self._serialize.url("runbook_name", runbook_name, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/variable_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/variable_operations.py index bdbe8818449f..5eb4e317d9c8 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/variable_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/variable_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def create_or_update( - self, resource_group_name, automation_account_name, variable_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, variable_name, parameters, custom_headers=None, raw=False, **operation_config): """Create a variable. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param variable_name: The variable name. @@ -64,7 +62,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'variableName': self._serialize.url("variable_name", variable_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -111,11 +109,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'} def update( - self, resource_group_name, automation_account_name, variable_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, variable_name, parameters, custom_headers=None, raw=False, **operation_config): """Update a variable. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param variable_name: The variable name. @@ -138,7 +134,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'variableName': self._serialize.url("variable_name", variable_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -183,11 +179,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'} def delete( - self, resource_group_name, automation_account_name, variable_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, variable_name, custom_headers=None, raw=False, **operation_config): """Delete the variable. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param variable_name: The name of variable. @@ -205,7 +199,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'variableName': self._serialize.url("variable_name", variable_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -239,11 +233,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'} def get( - self, resource_group_name, automation_account_name, variable_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, variable_name, custom_headers=None, raw=False, **operation_config): """Retrieve the variable identified by variable name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param variable_name: The name of variable. @@ -262,7 +254,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'variableName': self._serialize.url("variable_name", variable_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -303,11 +295,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/variables/{variableName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Retrieve a list of variables. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -327,7 +317,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } diff --git a/azure-mgmt-automation/azure/mgmt/automation/operations/webhook_operations.py b/azure-mgmt-automation/azure/mgmt/automation/operations/webhook_operations.py index c6e662af2f7b..93e8a4241093 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/operations/webhook_operations.py +++ b/azure-mgmt-automation/azure/mgmt/automation/operations/webhook_operations.py @@ -37,11 +37,9 @@ def __init__(self, client, config, serializer, deserializer): self.config = config def generate_uri( - self, resource_group_name, automation_account_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, custom_headers=None, raw=False, **operation_config): """Generates a Uri for use in creating a webhook. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param dict custom_headers: headers that will be added to the request @@ -57,7 +55,7 @@ def generate_uri( # Construct URL url = self.generate_uri.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') } @@ -97,11 +95,9 @@ def generate_uri( generate_uri.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/generateUri'} def delete( - self, resource_group_name, automation_account_name, webhook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, webhook_name, custom_headers=None, raw=False, **operation_config): """Delete the webhook by name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param webhook_name: The webhook name. @@ -119,7 +115,7 @@ def delete( # Construct URL url = self.delete.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'webhookName': self._serialize.url("webhook_name", webhook_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -153,11 +149,9 @@ def delete( delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'} def get( - self, resource_group_name, automation_account_name, webhook_name, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, webhook_name, custom_headers=None, raw=False, **operation_config): """Retrieve the webhook identified by webhook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param webhook_name: The webhook name. @@ -176,7 +170,7 @@ def get( # Construct URL url = self.get.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'webhookName': self._serialize.url("webhook_name", webhook_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -217,11 +211,9 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'} def create_or_update( - self, resource_group_name, automation_account_name, webhook_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, webhook_name, parameters, custom_headers=None, raw=False, **operation_config): """Create the webhook identified by webhook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param webhook_name: The webhook name. @@ -243,7 +235,7 @@ def create_or_update( # Construct URL url = self.create_or_update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'webhookName': self._serialize.url("webhook_name", webhook_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -290,11 +282,9 @@ def create_or_update( create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'} def update( - self, resource_group_name, automation_account_name, webhook_name, parameters, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, webhook_name, parameters, custom_headers=None, raw=False, **operation_config): """Update the webhook identified by webhook name. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param webhook_name: The webhook name. @@ -316,7 +306,7 @@ def update( # Construct URL url = self.update.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'webhookName': self._serialize.url("webhook_name", webhook_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') @@ -361,11 +351,9 @@ def update( update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Automation/automationAccounts/{automationAccountName}/webhooks/{webhookName}'} def list_by_automation_account( - self, resource_group_name, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): + self, automation_account_name, filter=None, custom_headers=None, raw=False, **operation_config): """Retrieve a list of webhooks. - :param resource_group_name: The resource group name. - :type resource_group_name: str :param automation_account_name: The automation account name. :type automation_account_name: str :param filter: The filter to apply on the operation. @@ -387,7 +375,7 @@ def internal_paging(next_link=None, raw=False): # Construct URL url = self.list_by_automation_account.metadata['url'] path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', pattern=r'^[-\w\._]+$'), + 'resourceGroupName': self._serialize.url("self.config.resource_group_name", self.config.resource_group_name, 'str', pattern=r'^[-\w\._]+$'), 'automationAccountName': self._serialize.url("automation_account_name", automation_account_name, 'str'), 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') }