diff --git a/src/dnc/HISTORY.rst b/src/dnc/HISTORY.rst index 0942adbdddd..42daa77c75b 100644 --- a/src/dnc/HISTORY.rst +++ b/src/dnc/HISTORY.rst @@ -2,6 +2,9 @@ Release History =============== +0.1.1 +++++++ +* Remove list commands 0.1.1 ++++++ diff --git a/src/dnc/azext_dnc/generated/_client_factory.py b/src/dnc/azext_dnc/generated/_client_factory.py index c98e77db8cf..f68e285dece 100644 --- a/src/dnc/azext_dnc/generated/_client_factory.py +++ b/src/dnc/azext_dnc/generated/_client_factory.py @@ -20,10 +20,6 @@ def cf_controller(cli_ctx, *_): return cf_dnc_cl(cli_ctx).controller -def cf_delegated_network(cli_ctx, *_): - return cf_dnc_cl(cli_ctx).delegated_network - - def cf_orchestrator_instance_service(cli_ctx, *_): return cf_dnc_cl(cli_ctx).orchestrator_instance_service diff --git a/src/dnc/azext_dnc/generated/_help.py b/src/dnc/azext_dnc/generated/_help.py index 17e76151876..317f5312ea9 100644 --- a/src/dnc/azext_dnc/generated/_help.py +++ b/src/dnc/azext_dnc/generated/_help.py @@ -57,42 +57,11 @@ az dnc controller wait --resource-group "TestRG" --resource-name "testcontroller" --deleted """ -helps['dnc delegated-network'] = """ - type: group - short-summary: Manage delegated network with dnc -""" - -helps['dnc delegated-network list'] = """ - type: command - short-summary: "Get all the delegatedController resources in a resource group. And Get all the delegatedController \ -resources in a subscription." - examples: - - name: Get DelegatedNetwork resources by resource group - text: |- - az dnc delegated-network list --resource-group "testRG" - - name: Get DelegatedController resources by subscription - text: |- - az dnc delegated-network list -""" - helps['dnc orchestrator-instance-service'] = """ type: group short-summary: Manage orchestrator instance service with dnc """ -helps['dnc orchestrator-instance-service list'] = """ - type: command - short-summary: "Get all the OrchestratorInstances resources in a resource group. And Get all the \ -orchestratorInstance resources in a subscription." - examples: - - name: Get OrchestratorInstance resources by resource group - text: |- - az dnc orchestrator-instance-service list --resource-group "testRG" - - name: Get orchestratorInstance resources by subscription - text: |- - az dnc orchestrator-instance-service list -""" - helps['dnc orchestrator-instance-service show'] = """ type: command short-summary: "Gets details about the orchestrator instance." @@ -147,19 +116,6 @@ short-summary: Manage delegated subnet service with dnc """ -helps['dnc delegated-subnet-service list'] = """ - type: command - short-summary: "Get all the DelegatedSubnets resources in a resource group. And Get all the DelegatedSubnets \ -resources in a subscription." - examples: - - name: Get DelegatedSubnets resources by resource group - text: |- - az dnc delegated-subnet-service list --resource-group "testRG" - - name: Get DelegatedSubnets resources by subscription - text: |- - az dnc delegated-subnet-service list -""" - helps['dnc delegated-subnet-service show'] = """ type: command short-summary: "Gets details about the specified dnc DelegatedSubnet Link." diff --git a/src/dnc/azext_dnc/generated/_params.py b/src/dnc/azext_dnc/generated/_params.py index 2175ea831a5..ae7cd3a82dc 100644 --- a/src/dnc/azext_dnc/generated/_params.py +++ b/src/dnc/azext_dnc/generated/_params.py @@ -45,12 +45,6 @@ def load_arguments(self, _): c.argument('resource_name', type=str, help='The name of the resource. It must be a minimum of 3 characters, ' 'and a maximum of 63.', id_part='name') - with self.argument_context('dnc delegated-network list') as c: - c.argument('resource_group_name', resource_group_name_type) - - with self.argument_context('dnc orchestrator-instance-service list') as c: - c.argument('resource_group_name', resource_group_name_type) - with self.argument_context('dnc orchestrator-instance-service show') as c: c.argument('resource_group_name', resource_group_name_type) c.argument('resource_name', type=str, help='The name of the resource. It must be a minimum of 3 characters, ' @@ -87,9 +81,6 @@ def load_arguments(self, _): c.argument('resource_name', type=str, help='The name of the resource. It must be a minimum of 3 characters, ' 'and a maximum of 63.', id_part='name') - with self.argument_context('dnc delegated-subnet-service list') as c: - c.argument('resource_group_name', resource_group_name_type) - with self.argument_context('dnc delegated-subnet-service show') as c: c.argument('resource_group_name', resource_group_name_type) c.argument('resource_name', type=str, help='The name of the resource. It must be a minimum of 3 characters, ' diff --git a/src/dnc/azext_dnc/generated/commands.py b/src/dnc/azext_dnc/generated/commands.py index 61ad2fba0ad..36fd497fab0 100644 --- a/src/dnc/azext_dnc/generated/commands.py +++ b/src/dnc/azext_dnc/generated/commands.py @@ -25,14 +25,6 @@ def load_command_table(self, _): g.custom_command('delete', 'dnc_controller_delete', supports_no_wait=True, confirmation=True) g.custom_wait_command('wait', 'dnc_controller_show') - from azext_dnc.generated._client_factory import cf_delegated_network - dnc_delegated_network = CliCommandType( - operations_tmpl='azext_dnc.vendored_sdks.dnc.operations._delegated_network_operations#DelegatedNetworkOperation' - 's.{}', - client_factory=cf_delegated_network) - with self.command_group('dnc delegated-network', dnc_delegated_network, client_factory=cf_delegated_network) as g: - g.custom_command('list', 'dnc_delegated_network_list') - from azext_dnc.generated._client_factory import cf_orchestrator_instance_service dnc_orchestrator_instance_service = CliCommandType( operations_tmpl='azext_dnc.vendored_sdks.dnc.operations._orchestrator_instance_service_operations#OrchestratorI' @@ -40,7 +32,6 @@ def load_command_table(self, _): client_factory=cf_orchestrator_instance_service) with self.command_group('dnc orchestrator-instance-service', dnc_orchestrator_instance_service, client_factory=cf_orchestrator_instance_service) as g: - g.custom_command('list', 'dnc_orchestrator_instance_service_list') g.custom_show_command('show', 'dnc_orchestrator_instance_service_show') g.custom_command('create', 'dnc_orchestrator_instance_service_create', supports_no_wait=True) g.custom_command('delete', 'dnc_orchestrator_instance_service_delete', supports_no_wait=True, @@ -54,7 +45,6 @@ def load_command_table(self, _): client_factory=cf_delegated_subnet_service) with self.command_group('dnc delegated-subnet-service', dnc_delegated_subnet_service, client_factory=cf_delegated_subnet_service) as g: - g.custom_command('list', 'dnc_delegated_subnet_service_list') g.custom_show_command('show', 'dnc_delegated_subnet_service_show') g.custom_command('create', 'dnc_delegated_subnet_service_create', supports_no_wait=True) g.custom_command('delete', 'dnc_delegated_subnet_service_delete', supports_no_wait=True, confirmation=True) diff --git a/src/dnc/azext_dnc/generated/custom.py b/src/dnc/azext_dnc/generated/custom.py index 22adca920f2..fdb1bc6a46d 100644 --- a/src/dnc/azext_dnc/generated/custom.py +++ b/src/dnc/azext_dnc/generated/custom.py @@ -45,20 +45,6 @@ def dnc_controller_delete(client, resource_name=resource_name) -def dnc_delegated_network_list(client, - resource_group_name=None): - if resource_group_name: - return client.list_by_resource_group(resource_group_name=resource_group_name) - return client.list_by_subscription() - - -def dnc_orchestrator_instance_service_list(client, - resource_group_name=None): - if resource_group_name: - return client.list_by_resource_group(resource_group_name=resource_group_name) - return client.list_by_subscription() - - def dnc_orchestrator_instance_service_show(client, resource_group_name, resource_name): @@ -112,13 +98,6 @@ def dnc_orchestrator_instance_service_delete(client, force_delete=force_delete) -def dnc_delegated_subnet_service_list(client, - resource_group_name=None): - if resource_group_name: - return client.list_by_resource_group(resource_group_name=resource_group_name) - return client.list_by_subscription() - - def dnc_delegated_subnet_service_show(client, resource_group_name, resource_name): diff --git a/src/dnc/azext_dnc/tests/latest/example_steps.py b/src/dnc/azext_dnc/tests/latest/example_steps.py index d1324fdf012..743f31f9e90 100644 --- a/src/dnc/azext_dnc/tests/latest/example_steps.py +++ b/src/dnc/azext_dnc/tests/latest/example_steps.py @@ -14,7 +14,7 @@ # EXAMPLE: /Controller/put/Create controller @try_manual -def step_controller_create(test, rg, rg_2, checks=None): +def step_controller_create(test, rg, checks=None): if checks is None: checks = [] test.cmd('az dnc controller create ' @@ -26,7 +26,7 @@ def step_controller_create(test, rg, rg_2, checks=None): # EXAMPLE: /Controller/get/Get details of a controller @try_manual -def step_controller_show(test, rg, rg_2, checks=None): +def step_controller_show(test, rg, checks=None): if checks is None: checks = [] test.cmd('az dnc controller show ' @@ -37,7 +37,7 @@ def step_controller_show(test, rg, rg_2, checks=None): # EXAMPLE: /DelegatedSubnetService/put/put delegated subnet @try_manual -def step_delegated_subnet_service_create(test, rg, rg_2, checks=None): +def step_delegated_subnet_service_create(test, rg, checks=None): if checks is None: checks = [] test.cmd('az dnc delegated-subnet-service create ' @@ -51,22 +51,23 @@ def step_delegated_subnet_service_create(test, rg, rg_2, checks=None): checks=checks) -# EXAMPLE: /DelegatedSubnetService/get/Get DelegatedSubnets resources by subscription +# EXAMPLE: /DelegatedSubnetService/get/Get details of a delegated subnet @try_manual -def step_delegated_subnet_service_list(test, rg, rg_2, checks=None): +def step_delegated_subnet_service_show(test, rg, checks=None): if checks is None: checks = [] - test.cmd('az dnc delegated-subnet-service list ' - '-g ""', + test.cmd('az dnc delegated-subnet-service show ' + '--resource-group "{rg}" ' + '--resource-name "delegated1"', checks=checks) -# EXAMPLE: /DelegatedSubnetService/get/Get details of a delegated subnet +# EXAMPLE: /DelegatedSubnetService/delete/delete delegated subnet @try_manual -def step_delegated_subnet_service_show(test, rg, rg_2, checks=None): +def step_delegated_subnet_service_delete(test, rg, checks=None): if checks is None: checks = [] - test.cmd('az dnc delegated-subnet-service show ' + test.cmd('az dnc delegated-subnet-service delete -y ' '--resource-group "{rg}" ' '--resource-name "delegated1"', checks=checks) @@ -74,7 +75,7 @@ def step_delegated_subnet_service_show(test, rg, rg_2, checks=None): # EXAMPLE: /OrchestratorInstanceService/put/Create orchestrator instance @try_manual -def step_orchestrator_instance_service_create(test, rg, rg_2, checks=None): +def step_orchestrator_instance_service_create(test, rg, checks=None): if checks is None: checks = [] test.cmd('az dnc orchestrator-instance-service create ' @@ -95,7 +96,7 @@ def step_orchestrator_instance_service_create(test, rg, rg_2, checks=None): # EXAMPLE: /OrchestratorInstanceService/get/Get details of a orchestratorInstance @try_manual -def step_orchestrator_instance_service_show(test, rg, rg_2, checks=None): +def step_orchestrator_instance_service_show(test, rg, checks=None): if checks is None: checks = [] test.cmd('az dnc orchestrator-instance-service show ' @@ -104,29 +105,9 @@ def step_orchestrator_instance_service_show(test, rg, rg_2, checks=None): checks=checks) -# EXAMPLE: /OrchestratorInstanceService/get/Get OrchestratorInstance resources by resource group -@try_manual -def step_orchestrator_instance_service_list(test, rg, rg_2, checks=None): - if checks is None: - checks = [] - test.cmd('az dnc orchestrator-instance-service list ' - '--resource-group "{rg_2}"', - checks=checks) - - -# EXAMPLE: /OrchestratorInstanceService/get/Get orchestratorInstance resources by subscription -@try_manual -def step_orchestrator_instance_service_list2(test, rg, rg_2, checks=None): - if checks is None: - checks = [] - test.cmd('az dnc orchestrator-instance-service list ' - '-g ""', - checks=checks) - - # EXAMPLE: /OrchestratorInstanceService/delete/Delete Orchestrator Instance @try_manual -def step_orchestrator_instance_service_delete(test, rg, rg_2, checks=None): +def step_orchestrator_instance_service_delete(test, rg, checks=None): if checks is None: checks = [] test.cmd('az dnc orchestrator-instance-service delete -y ' @@ -137,7 +118,7 @@ def step_orchestrator_instance_service_delete(test, rg, rg_2, checks=None): # EXAMPLE: /Controller/delete/Delete controller @try_manual -def step_controller_delete(test, rg, rg_2, checks=None): +def step_controller_delete(test, rg, checks=None): if checks is None: checks = [] test.cmd('az dnc controller delete -y ' @@ -145,44 +126,3 @@ def step_controller_delete(test, rg, rg_2, checks=None): '--resource-name "{myController}"', checks=checks) - -# EXAMPLE: /DelegatedNetwork/get/Get DelegatedController resources by subscription -@try_manual -def step_delegated_network_list(test, rg, rg_2, checks=None): - if checks is None: - checks = [] - test.cmd('az dnc delegated-network list ' - '-g ""', - checks=checks) - - -# EXAMPLE: /DelegatedNetwork/get/Get DelegatedNetwork resources by resource group -@try_manual -def step_delegated_network_list2(test, rg, rg_2, checks=None): - if checks is None: - checks = [] - test.cmd('az dnc delegated-network list ' - '--resource-group "{rg_2}"', - checks=checks) - - -# EXAMPLE: /DelegatedSubnetService/get/Get DelegatedSubnets resources by resource group -@try_manual -def step_delegated_subnet_service_list2(test, rg, rg_2, checks=None): - if checks is None: - checks = [] - test.cmd('az dnc delegated-subnet-service list ' - '--resource-group "{rg_2}"', - checks=checks) - - -# EXAMPLE: /DelegatedSubnetService/delete/delete delegated subnet -@try_manual -def step_delegated_subnet_service_delete(test, rg, rg_2, checks=None): - if checks is None: - checks = [] - test.cmd('az dnc delegated-subnet-service delete -y ' - '--resource-group "{rg}" ' - '--resource-name "delegated1"', - checks=checks) - diff --git a/src/dnc/azext_dnc/tests/latest/test_dnc_scenario.py b/src/dnc/azext_dnc/tests/latest/test_dnc_scenario.py index 511626fb006..d15bca44d1d 100644 --- a/src/dnc/azext_dnc/tests/latest/test_dnc_scenario.py +++ b/src/dnc/azext_dnc/tests/latest/test_dnc_scenario.py @@ -15,18 +15,12 @@ from .example_steps import step_controller_create from .example_steps import step_controller_show from .example_steps import step_delegated_subnet_service_create -from .example_steps import step_delegated_subnet_service_list from .example_steps import step_delegated_subnet_service_show +from .example_steps import step_delegated_subnet_service_delete from .example_steps import step_orchestrator_instance_service_create from .example_steps import step_orchestrator_instance_service_show -from .example_steps import step_orchestrator_instance_service_list -from .example_steps import step_orchestrator_instance_service_list2 from .example_steps import step_orchestrator_instance_service_delete from .example_steps import step_controller_delete -from .example_steps import step_delegated_network_list -from .example_steps import step_delegated_network_list2 -from .example_steps import step_delegated_subnet_service_list2 -from .example_steps import step_delegated_subnet_service_delete from .. import ( try_manual, raise_if, @@ -39,36 +33,30 @@ # Env setup_scenario @try_manual -def setup_scenario(test, rg, rg_2): +def setup_scenario(test, rg): pass # Env cleanup_scenario @try_manual -def cleanup_scenario(test, rg, rg_2): +def cleanup_scenario(test, rg): pass # Testcase: Scenario @try_manual -def call_scenario(test, rg, rg_2): - setup_scenario(test, rg, rg_2) - step_controller_create(test, rg, rg_2, checks=[]) - step_controller_show(test, rg, rg_2, checks=[]) - step_delegated_subnet_service_create(test, rg, rg_2, checks=[]) - step_delegated_subnet_service_list(test, rg, rg_2, checks=[]) - step_delegated_subnet_service_show(test, rg, rg_2, checks=[]) - step_orchestrator_instance_service_create(test, rg, rg_2, checks=[]) - step_orchestrator_instance_service_show(test, rg, rg_2, checks=[]) - step_orchestrator_instance_service_list(test, rg, rg_2, checks=[]) - step_orchestrator_instance_service_list2(test, rg, rg_2, checks=[]) - step_orchestrator_instance_service_delete(test, rg, rg_2, checks=[]) - step_controller_delete(test, rg, rg_2, checks=[]) - step_delegated_network_list(test, rg, rg_2, checks=[]) - step_delegated_network_list2(test, rg, rg_2, checks=[]) - step_delegated_subnet_service_list2(test, rg, rg_2, checks=[]) - step_delegated_subnet_service_delete(test, rg, rg_2, checks=[]) - cleanup_scenario(test, rg, rg_2) +def call_scenario(test, rg): + setup_scenario(test, rg) + step_controller_create(test, rg, checks=[]) + step_controller_show(test, rg, checks=[]) + step_delegated_subnet_service_create(test, rg, checks=[]) + step_delegated_subnet_service_show(test, rg, checks=[]) + step_delegated_subnet_service_delete(test, rg, checks=[]) + step_orchestrator_instance_service_create(test, rg, checks=[]) + step_orchestrator_instance_service_show(test, rg, checks=[]) + step_orchestrator_instance_service_delete(test, rg, checks=[]) + step_controller_delete(test, rg, checks=[]) + cleanup_scenario(test, rg) # Test class for Scenario @@ -88,10 +76,9 @@ def __init__(self, *args, **kwargs): @ResourceGroupPreparer(name_prefix='clitestdnc_TestRG'[:7], key='rg', parameter_name='rg') - @ResourceGroupPreparer(name_prefix='clitestdnc_testRG'[:7], key='rg_2', parameter_name='rg_2') @VirtualNetworkPreparer(name_prefix='clitestdnc_testvnet'[:7], key='vn', resource_group_key='rg') - def test_dnc_Scenario(self, rg, rg_2): - call_scenario(self, rg, rg_2) + def test_dnc_Scenario(self, rg): + call_scenario(self, rg) calc_coverage(__file__) raise_if() diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_controller_operations.py b/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_controller_operations.py index 632890191ef..467aed74b2b 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_controller_operations.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_controller_operations.py @@ -71,7 +71,7 @@ async def get_details( # Construct URL url = self.get_details.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -121,7 +121,7 @@ async def _create_initial( # Construct URL url = self._create_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -213,7 +213,7 @@ def get_long_running_output(pipeline_response): return deserialized path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -249,7 +249,7 @@ async def _delete_initial( # Construct URL url = self._delete_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -323,7 +323,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -375,7 +375,7 @@ async def patch( # Construct URL url = self.patch.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_delegated_network_operations.py b/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_delegated_network_operations.py index ae0c989eda8..a3871fbcd24 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_delegated_network_operations.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_delegated_network_operations.py @@ -139,7 +139,7 @@ def prepare_request(next_link=None): # Construct URL url = self.list_by_resource_group.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } url = self._client.format_url(url, **path_format_arguments) diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_delegated_subnet_service_operations.py b/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_delegated_subnet_service_operations.py index 336c2f36569..e5a3803ff5b 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_delegated_subnet_service_operations.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_delegated_subnet_service_operations.py @@ -72,7 +72,7 @@ async def get_details( # Construct URL url = self.get_details.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -122,7 +122,7 @@ async def _put_details_initial( # Construct URL url = self._put_details_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -214,7 +214,7 @@ def get_long_running_output(pipeline_response): return deserialized path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -252,7 +252,7 @@ async def _patch_details_initial( # Construct URL url = self._patch_details_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -340,7 +340,7 @@ def get_long_running_output(pipeline_response): return deserialized path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -377,7 +377,7 @@ async def _delete_details_initial( # Construct URL url = self._delete_details_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -457,7 +457,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -574,7 +574,7 @@ def prepare_request(next_link=None): # Construct URL url = self.list_by_resource_group.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } url = self._client.format_url(url, **path_format_arguments) diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_orchestrator_instance_service_operations.py b/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_orchestrator_instance_service_operations.py index 1ddf6db32df..46e26af63e0 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_orchestrator_instance_service_operations.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/aio/operations/_orchestrator_instance_service_operations.py @@ -72,7 +72,7 @@ async def get_details( # Construct URL url = self.get_details.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -122,7 +122,7 @@ async def _create_initial( # Construct URL url = self._create_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -214,7 +214,7 @@ def get_long_running_output(pipeline_response): return deserialized path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -251,7 +251,7 @@ async def _delete_initial( # Construct URL url = self._delete_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -331,7 +331,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -383,7 +383,7 @@ async def patch( # Construct URL url = self.patch.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -516,7 +516,7 @@ def prepare_request(next_link=None): # Construct URL url = self.list_by_resource_group.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } url = self._client.format_url(url, **path_format_arguments) diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/models/__init__.py b/src/dnc/azext_dnc/vendored_sdks/dnc/models/__init__.py index 6dcdd368f6b..8ae71baf993 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/models/__init__.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/models/__init__.py @@ -14,6 +14,7 @@ from ._models_py3 import DelegatedControllerProperties from ._models_py3 import DelegatedControllers from ._models_py3 import DelegatedSubnet + from ._models_py3 import DelegatedSubnetProperties from ._models_py3 import DelegatedSubnetResource from ._models_py3 import DelegatedSubnets from ._models_py3 import ErrorAdditionalInfo @@ -38,6 +39,7 @@ from ._models import DelegatedControllerProperties # type: ignore from ._models import DelegatedControllers # type: ignore from ._models import DelegatedSubnet # type: ignore + from ._models import DelegatedSubnetProperties # type: ignore from ._models import DelegatedSubnetResource # type: ignore from ._models import DelegatedSubnets # type: ignore from ._models import ErrorAdditionalInfo # type: ignore @@ -73,6 +75,7 @@ 'DelegatedControllerProperties', 'DelegatedControllers', 'DelegatedSubnet', + 'DelegatedSubnetProperties', 'DelegatedSubnetResource', 'DelegatedSubnets', 'ErrorAdditionalInfo', diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/models/_models.py b/src/dnc/azext_dnc/vendored_sdks/dnc/models/_models.py index 1c2d5252031..9de0401b928 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/models/_models.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/models/_models.py @@ -271,6 +271,38 @@ class DelegatedSubnet(DelegatedSubnetResource): :type location: str :param tags: A set of tags. The resource tags. :type tags: dict[str, str] + :param properties: Properties of the provision operation request. + :type properties: ~dnc.models.DelegatedSubnetProperties + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'properties': {'key': 'properties', 'type': 'DelegatedSubnetProperties'}, + } + + def __init__( + self, + **kwargs + ): + super(DelegatedSubnet, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) + + +class DelegatedSubnetProperties(msrest.serialization.Model): + """Properties of delegated subnet. + + Variables are only populated by the server, and will be ignored when sending a request. + :ivar resource_guid: Resource guid. :vartype resource_guid: str :ivar provisioning_state: The current state of dnc delegated subnet resource. Possible values @@ -283,30 +315,22 @@ class DelegatedSubnet(DelegatedSubnetResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, 'resource_guid': {'readonly': True}, 'provisioning_state': {'readonly': True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': '{str}'}, - 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, - 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'subnet_details': {'key': 'properties.subnetDetails', 'type': 'SubnetDetails'}, - 'controller_details': {'key': 'properties.controllerDetails', 'type': 'ControllerDetails'}, + 'resource_guid': {'key': 'resourceGuid', 'type': 'str'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, + 'subnet_details': {'key': 'subnetDetails', 'type': 'SubnetDetails'}, + 'controller_details': {'key': 'controllerDetails', 'type': 'ControllerDetails'}, } def __init__( self, **kwargs ): - super(DelegatedSubnet, self).__init__(**kwargs) + super(DelegatedSubnetProperties, self).__init__(**kwargs) self.resource_guid = None self.provisioning_state = None self.subnet_details = kwargs.get('subnet_details', None) diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/models/_models_py3.py b/src/dnc/azext_dnc/vendored_sdks/dnc/models/_models_py3.py index 740650a1fae..645febf1abb 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/models/_models_py3.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/models/_models_py3.py @@ -290,6 +290,42 @@ class DelegatedSubnet(DelegatedSubnetResource): :type location: str :param tags: A set of tags. The resource tags. :type tags: dict[str, str] + :param properties: Properties of the provision operation request. + :type properties: ~dnc.models.DelegatedSubnetProperties + """ + + _validation = { + 'id': {'readonly': True}, + 'name': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'properties': {'key': 'properties', 'type': 'DelegatedSubnetProperties'}, + } + + def __init__( + self, + *, + location: Optional[str] = None, + tags: Optional[Dict[str, str]] = None, + properties: Optional["DelegatedSubnetProperties"] = None, + **kwargs + ): + super(DelegatedSubnet, self).__init__(location=location, tags=tags, **kwargs) + self.properties = properties + + +class DelegatedSubnetProperties(msrest.serialization.Model): + """Properties of delegated subnet. + + Variables are only populated by the server, and will be ignored when sending a request. + :ivar resource_guid: Resource guid. :vartype resource_guid: str :ivar provisioning_state: The current state of dnc delegated subnet resource. Possible values @@ -302,35 +338,25 @@ class DelegatedSubnet(DelegatedSubnetResource): """ _validation = { - 'id': {'readonly': True}, - 'name': {'readonly': True}, - 'type': {'readonly': True}, 'resource_guid': {'readonly': True}, 'provisioning_state': {'readonly': True}, } _attribute_map = { - 'id': {'key': 'id', 'type': 'str'}, - 'name': {'key': 'name', 'type': 'str'}, - 'type': {'key': 'type', 'type': 'str'}, - 'location': {'key': 'location', 'type': 'str'}, - 'tags': {'key': 'tags', 'type': '{str}'}, - 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, - 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'subnet_details': {'key': 'properties.subnetDetails', 'type': 'SubnetDetails'}, - 'controller_details': {'key': 'properties.controllerDetails', 'type': 'ControllerDetails'}, + 'resource_guid': {'key': 'resourceGuid', 'type': 'str'}, + 'provisioning_state': {'key': 'provisioningState', 'type': 'str'}, + 'subnet_details': {'key': 'subnetDetails', 'type': 'SubnetDetails'}, + 'controller_details': {'key': 'controllerDetails', 'type': 'ControllerDetails'}, } def __init__( self, *, - location: Optional[str] = None, - tags: Optional[Dict[str, str]] = None, subnet_details: Optional["SubnetDetails"] = None, controller_details: Optional["ControllerDetails"] = None, **kwargs ): - super(DelegatedSubnet, self).__init__(location=location, tags=tags, **kwargs) + super(DelegatedSubnetProperties, self).__init__(**kwargs) self.resource_guid = None self.provisioning_state = None self.subnet_details = subnet_details diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_controller_operations.py b/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_controller_operations.py index 405b1866ae9..86a49c80540 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_controller_operations.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_controller_operations.py @@ -76,7 +76,7 @@ def get_details( # Construct URL url = self.get_details.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -127,7 +127,7 @@ def _create_initial( # Construct URL url = self._create_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -220,7 +220,7 @@ def get_long_running_output(pipeline_response): return deserialized path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -257,7 +257,7 @@ def _delete_initial( # Construct URL url = self._delete_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -332,7 +332,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -385,7 +385,7 @@ def patch( # Construct URL url = self.patch.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_delegated_network_operations.py b/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_delegated_network_operations.py index 17ab9cce444..c28211421af 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_delegated_network_operations.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_delegated_network_operations.py @@ -145,7 +145,7 @@ def prepare_request(next_link=None): # Construct URL url = self.list_by_resource_group.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } url = self._client.format_url(url, **path_format_arguments) diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_delegated_subnet_service_operations.py b/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_delegated_subnet_service_operations.py index 853c8466489..b40173b5946 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_delegated_subnet_service_operations.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_delegated_subnet_service_operations.py @@ -77,7 +77,7 @@ def get_details( # Construct URL url = self.get_details.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -128,7 +128,7 @@ def _put_details_initial( # Construct URL url = self._put_details_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -221,7 +221,7 @@ def get_long_running_output(pipeline_response): return deserialized path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -260,7 +260,7 @@ def _patch_details_initial( # Construct URL url = self._patch_details_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -349,7 +349,7 @@ def get_long_running_output(pipeline_response): return deserialized path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -387,7 +387,7 @@ def _delete_details_initial( # Construct URL url = self._delete_details_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -468,7 +468,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -587,7 +587,7 @@ def prepare_request(next_link=None): # Construct URL url = self.list_by_resource_group.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } url = self._client.format_url(url, **path_format_arguments) diff --git a/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_orchestrator_instance_service_operations.py b/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_orchestrator_instance_service_operations.py index 51b945c7fbe..7f1135684ba 100644 --- a/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_orchestrator_instance_service_operations.py +++ b/src/dnc/azext_dnc/vendored_sdks/dnc/operations/_orchestrator_instance_service_operations.py @@ -77,7 +77,7 @@ def get_details( # Construct URL url = self.get_details.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -128,7 +128,7 @@ def _create_initial( # Construct URL url = self._create_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -221,7 +221,7 @@ def get_long_running_output(pipeline_response): return deserialized path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -259,7 +259,7 @@ def _delete_initial( # Construct URL url = self._delete_initial.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -340,7 +340,7 @@ def get_long_running_output(pipeline_response): return cls(pipeline_response, None, {}) path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -393,7 +393,7 @@ def patch( # Construct URL url = self.patch.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'resourceName': self._serialize.url("resource_name", resource_name, 'str', max_length=63, min_length=3, pattern=r'^[a-z][a-z0-9]*$'), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } @@ -528,7 +528,7 @@ def prepare_request(next_link=None): # Construct URL url = self.list_by_resource_group.metadata['url'] # type: ignore path_format_arguments = { - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1), 'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1), } url = self._client.format_url(url, **path_format_arguments) diff --git a/src/dnc/report.md b/src/dnc/report.md index 8a7dad07768..8013ff996e7 100644 --- a/src/dnc/report.md +++ b/src/dnc/report.md @@ -10,7 +10,6 @@ |CLI Command Group|Group Swagger name|Commands| |---------|------------|--------| |az dnc controller|Controller|[commands](#CommandsInController)| -|az dnc delegated-network|DelegatedNetwork|[commands](#CommandsInDelegatedNetwork)| |az dnc orchestrator-instance-service|OrchestratorInstanceService|[commands](#CommandsInOrchestratorInstanceService)| |az dnc delegated-subnet-service|DelegatedSubnetService|[commands](#CommandsInDelegatedSubnetService)| @@ -22,17 +21,9 @@ |[az dnc controller create](#ControllerCreate)|Create|[Parameters](#ParametersControllerCreate)|[Example](#ExamplesControllerCreate)| |[az dnc controller delete](#ControllerDelete)|Delete|[Parameters](#ParametersControllerDelete)|[Example](#ExamplesControllerDelete)| -### Commands in `az dnc delegated-network` group -|CLI Command|Operation Swagger name|Parameters|Examples| -|---------|------------|--------|-----------| -|[az dnc delegated-network list](#DelegatedNetworkListByResourceGroup)|ListByResourceGroup|[Parameters](#ParametersDelegatedNetworkListByResourceGroup)|[Example](#ExamplesDelegatedNetworkListByResourceGroup)| -|[az dnc delegated-network list](#DelegatedNetworkListBySubscription)|ListBySubscription|[Parameters](#ParametersDelegatedNetworkListBySubscription)|[Example](#ExamplesDelegatedNetworkListBySubscription)| - ### Commands in `az dnc delegated-subnet-service` group |CLI Command|Operation Swagger name|Parameters|Examples| |---------|------------|--------|-----------| -|[az dnc delegated-subnet-service list](#DelegatedSubnetServiceListByResourceGroup)|ListByResourceGroup|[Parameters](#ParametersDelegatedSubnetServiceListByResourceGroup)|[Example](#ExamplesDelegatedSubnetServiceListByResourceGroup)| -|[az dnc delegated-subnet-service list](#DelegatedSubnetServiceListBySubscription)|ListBySubscription|[Parameters](#ParametersDelegatedSubnetServiceListBySubscription)|[Example](#ExamplesDelegatedSubnetServiceListBySubscription)| |[az dnc delegated-subnet-service show](#DelegatedSubnetServiceGetDetails)|GetDetails|[Parameters](#ParametersDelegatedSubnetServiceGetDetails)|[Example](#ExamplesDelegatedSubnetServiceGetDetails)| |[az dnc delegated-subnet-service create](#DelegatedSubnetServicePutDetails)|PutDetails|[Parameters](#ParametersDelegatedSubnetServicePutDetails)|[Example](#ExamplesDelegatedSubnetServicePutDetails)| |[az dnc delegated-subnet-service delete](#DelegatedSubnetServiceDeleteDetails)|DeleteDetails|[Parameters](#ParametersDelegatedSubnetServiceDeleteDetails)|[Example](#ExamplesDelegatedSubnetServiceDeleteDetails)| @@ -40,8 +31,6 @@ ### Commands in `az dnc orchestrator-instance-service` group |CLI Command|Operation Swagger name|Parameters|Examples| |---------|------------|--------|-----------| -|[az dnc orchestrator-instance-service list](#OrchestratorInstanceServiceListByResourceGroup)|ListByResourceGroup|[Parameters](#ParametersOrchestratorInstanceServiceListByResourceGroup)|[Example](#ExamplesOrchestratorInstanceServiceListByResourceGroup)| -|[az dnc orchestrator-instance-service list](#OrchestratorInstanceServiceListBySubscription)|ListBySubscription|[Parameters](#ParametersOrchestratorInstanceServiceListBySubscription)|[Example](#ExamplesOrchestratorInstanceServiceListBySubscription)| |[az dnc orchestrator-instance-service show](#OrchestratorInstanceServiceGetDetails)|GetDetails|[Parameters](#ParametersOrchestratorInstanceServiceGetDetails)|[Example](#ExamplesOrchestratorInstanceServiceGetDetails)| |[az dnc orchestrator-instance-service create](#OrchestratorInstanceServiceCreate)|Create|[Parameters](#ParametersOrchestratorInstanceServiceCreate)|[Example](#ExamplesOrchestratorInstanceServiceCreate)| |[az dnc orchestrator-instance-service delete](#OrchestratorInstanceServiceDelete)|Delete|[Parameters](#ParametersOrchestratorInstanceServiceDelete)|[Example](#ExamplesOrchestratorInstanceServiceDelete)| @@ -88,48 +77,7 @@ az dnc controller delete --resource-group "TestRG" --resource-name "testcontroll |**--resource-group-name**|string|The name of the resource group. The name is case insensitive.|resource_group_name|resourceGroupName| |**--resource-name**|string|The name of the resource. It must be a minimum of 3 characters, and a maximum of 63.|resource_name|resourceName| -### group `az dnc delegated-network` -#### Command `az dnc delegated-network list` - -##### Example -``` -az dnc delegated-network list --resource-group "testRG" -``` -##### Parameters -|Option|Type|Description|Path (SDK)|Swagger name| -|------|----|-----------|----------|------------| -|**--resource-group-name**|string|The name of the resource group. The name is case insensitive.|resource_group_name|resourceGroupName| - -#### Command `az dnc delegated-network list` - -##### Example -``` -az dnc delegated-network list -``` -##### Parameters -|Option|Type|Description|Path (SDK)|Swagger name| -|------|----|-----------|----------|------------| ### group `az dnc delegated-subnet-service` -#### Command `az dnc delegated-subnet-service list` - -##### Example -``` -az dnc delegated-subnet-service list --resource-group "testRG" -``` -##### Parameters -|Option|Type|Description|Path (SDK)|Swagger name| -|------|----|-----------|----------|------------| -|**--resource-group-name**|string|The name of the resource group. The name is case insensitive.|resource_group_name|resourceGroupName| - -#### Command `az dnc delegated-subnet-service list` - -##### Example -``` -az dnc delegated-subnet-service list -``` -##### Parameters -|Option|Type|Description|Path (SDK)|Swagger name| -|------|----|-----------|----------|------------| #### Command `az dnc delegated-subnet-service show` ##### Example @@ -175,26 +123,6 @@ az dnc delegated-subnet-service delete --resource-group "TestRG" --resource-name |**--force-delete**|boolean|Force delete resource|force_delete|forceDelete| ### group `az dnc orchestrator-instance-service` -#### Command `az dnc orchestrator-instance-service list` - -##### Example -``` -az dnc orchestrator-instance-service list --resource-group "testRG" -``` -##### Parameters -|Option|Type|Description|Path (SDK)|Swagger name| -|------|----|-----------|----------|------------| -|**--resource-group-name**|string|The name of the resource group. The name is case insensitive.|resource_group_name|resourceGroupName| - -#### Command `az dnc orchestrator-instance-service list` - -##### Example -``` -az dnc orchestrator-instance-service list -``` -##### Parameters -|Option|Type|Description|Path (SDK)|Swagger name| -|------|----|-----------|----------|------------| #### Command `az dnc orchestrator-instance-service show` ##### Example diff --git a/src/dnc/setup.py b/src/dnc/setup.py index ec960229622..da705583c97 100644 --- a/src/dnc/setup.py +++ b/src/dnc/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages # HISTORY.rst entry. -VERSION = '0.1.1' +VERSION = '0.1.2' try: from azext_dnc.manual.version import VERSION except ImportError: