diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py b/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py index afe9e2fe1914..dffa31034a14 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py +++ b/azure-mgmt-automation/azure/mgmt/automation/models/__init__.py @@ -129,7 +129,6 @@ from .source_control_sync_job_by_id import SourceControlSyncJobById from .dsc_node import DscNode from .dsc_node_configuration import DscNodeConfiguration -from .dsc_node_configuration_create_or_update_parameters_properties import DscNodeConfigurationCreateOrUpdateParametersProperties from .automation_account_paged import AutomationAccountPaged from .operation_paged import OperationPaged from .statistics_paged import StatisticsPaged @@ -304,7 +303,6 @@ 'SourceControlSyncJobById', 'DscNode', 'DscNodeConfiguration', - 'DscNodeConfigurationCreateOrUpdateParametersProperties', 'AutomationAccountPaged', 'OperationPaged', 'StatisticsPaged', diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/dsc_node_configuration_create_or_update_parameters.py b/azure-mgmt-automation/azure/mgmt/automation/models/dsc_node_configuration_create_or_update_parameters.py index 87665da540e5..99e5af654b6f 100644 --- a/azure-mgmt-automation/azure/mgmt/automation/models/dsc_node_configuration_create_or_update_parameters.py +++ b/azure-mgmt-automation/azure/mgmt/automation/models/dsc_node_configuration_create_or_update_parameters.py @@ -18,7 +18,7 @@ class DscNodeConfigurationCreateOrUpdateParameters(Model): :param source: Gets or sets the source. :type source: ~azure.mgmt.automation.models.ContentSource - :param name: Gets or sets the type of the parameter. + :param name: Name of the node configuration. :type name: str :param configuration: Gets or sets the configuration of the node. :type configuration: @@ -26,12 +26,27 @@ class DscNodeConfigurationCreateOrUpdateParameters(Model): :param new_node_configuration_build_version_required: If a new build version of NodeConfiguration is required. :type new_node_configuration_build_version_required: bool + :param source1: Gets or sets the source. + :type source1: ~azure.mgmt.automation.models.ContentSource + :param name1: Gets or sets the type of the parameter. + :type name1: str + :param configuration1: Gets or sets the configuration of the node. + :type configuration1: + ~azure.mgmt.automation.models.DscConfigurationAssociationProperty + :param increment_node_configuration_build: If a new build version of + NodeConfiguration is required. + :type increment_node_configuration_build: bool + :param tags: Gets or sets the tags attached to the resource. + :type tags: dict[str, str] """ _validation = { 'source': {'required': True}, 'name': {'required': True}, 'configuration': {'required': True}, + 'source1': {'required': True}, + 'name1': {'required': True}, + 'configuration1': {'required': True}, } _attribute_map = { @@ -39,11 +54,21 @@ class DscNodeConfigurationCreateOrUpdateParameters(Model): 'name': {'key': 'name', 'type': 'str'}, 'configuration': {'key': 'configuration', 'type': 'DscConfigurationAssociationProperty'}, 'new_node_configuration_build_version_required': {'key': 'newNodeConfigurationBuildVersionRequired', 'type': 'bool'}, + 'source1': {'key': 'properties.source', 'type': 'ContentSource'}, + 'name1': {'key': 'properties.name', 'type': 'str'}, + 'configuration1': {'key': 'properties.configuration', 'type': 'DscConfigurationAssociationProperty'}, + 'increment_node_configuration_build': {'key': 'properties.incrementNodeConfigurationBuild', 'type': 'bool'}, + 'tags': {'key': 'tags', 'type': '{str}'}, } - def __init__(self, source, name, configuration, new_node_configuration_build_version_required=None): + def __init__(self, source, name, configuration, source1, name1, configuration1, new_node_configuration_build_version_required=None, increment_node_configuration_build=None, tags=None): super(DscNodeConfigurationCreateOrUpdateParameters, self).__init__() self.source = source self.name = name self.configuration = configuration self.new_node_configuration_build_version_required = new_node_configuration_build_version_required + self.source1 = source1 + self.name1 = name1 + self.configuration1 = configuration1 + self.increment_node_configuration_build = increment_node_configuration_build + self.tags = tags diff --git a/azure-mgmt-automation/azure/mgmt/automation/models/dsc_node_configuration_create_or_update_parameters_properties.py b/azure-mgmt-automation/azure/mgmt/automation/models/dsc_node_configuration_create_or_update_parameters_properties.py deleted file mode 100644 index d1a7116d3cef..000000000000 --- a/azure-mgmt-automation/azure/mgmt/automation/models/dsc_node_configuration_create_or_update_parameters_properties.py +++ /dev/null @@ -1,49 +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 DscNodeConfigurationCreateOrUpdateParametersProperties(Model): - """The parameters supplied to the create or update node configuration - operation. - - :param source: Gets or sets the source. - :type source: ~azure.mgmt.automation.models.ContentSource - :param name: Gets or sets the type of the parameter. - :type name: str - :param configuration: Gets or sets the configuration of the node. - :type configuration: - ~azure.mgmt.automation.models.DscConfigurationAssociationProperty - :param increment_node_configuration_build: If a new build version of - NodeConfiguration is required. - :type increment_node_configuration_build: bool - """ - - _validation = { - 'source': {'required': True}, - 'name': {'required': True}, - 'configuration': {'required': True}, - } - - _attribute_map = { - 'source': {'key': 'source', 'type': 'ContentSource'}, - 'name': {'key': 'name', 'type': 'str'}, - 'configuration': {'key': 'configuration', 'type': 'DscConfigurationAssociationProperty'}, - 'increment_node_configuration_build': {'key': 'incrementNodeConfigurationBuild', 'type': 'bool'}, - } - - def __init__(self, source, name, configuration, increment_node_configuration_build=None): - super(DscNodeConfigurationCreateOrUpdateParametersProperties, self).__init__() - self.source = source - self.name = name - self.configuration = configuration - self.increment_node_configuration_build = increment_node_configuration_build 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 a43696b9a7ea..c4beae5b0047 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 @@ -186,7 +186,7 @@ def _create_or_update_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct body - body_content = self._serialize.body(parameters, 'DscNodeConfigurationCreateOrUpdateParametersProperties') + body_content = self._serialize.body(parameters, 'DscNodeConfigurationCreateOrUpdateParameters') # Construct and send request request = self._client.put(url, query_parameters) @@ -219,7 +219,7 @@ def create_or_update( :type node_configuration_name: str :param parameters: The create or update parameters for configuration. :type parameters: - ~azure.mgmt.automation.models.DscNodeConfigurationCreateOrUpdateParametersProperties + ~azure.mgmt.automation.models.DscNodeConfigurationCreateOrUpdateParameters :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response