From f51e802980cb4631527ff621a08d6c6172a62148 Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Wed, 13 May 2020 16:38:01 +0800 Subject: [PATCH 1/3] {TestSDK} add delete local context file when test is finished --- src/azure-cli-testsdk/azure/cli/testsdk/base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/azure-cli-testsdk/azure/cli/testsdk/base.py b/src/azure-cli-testsdk/azure/cli/testsdk/base.py index 46505c22179..62685d62613 100644 --- a/src/azure-cli-testsdk/azure/cli/testsdk/base.py +++ b/src/azure-cli-testsdk/azure/cli/testsdk/base.py @@ -198,6 +198,7 @@ def setUp(self): def tearDown(self): super(LocalContextScenarioTest, self).tearDown() self.cmd('local-context off') + self.cmd('local-context delete --all --purge -y') os.chdir(self.original_working_dir) if os.path.exists(self.working_dir): import shutil From 32bb5a3d13d6bcb166f18f376c3ac4ae102af4df Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Wed, 13 May 2020 16:38:51 +0800 Subject: [PATCH 2/3] Revert "{TestSDK} add delete local context file when test is finished" This reverts commit f51e802980cb4631527ff621a08d6c6172a62148. --- src/azure-cli-testsdk/azure/cli/testsdk/base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/azure-cli-testsdk/azure/cli/testsdk/base.py b/src/azure-cli-testsdk/azure/cli/testsdk/base.py index 62685d62613..46505c22179 100644 --- a/src/azure-cli-testsdk/azure/cli/testsdk/base.py +++ b/src/azure-cli-testsdk/azure/cli/testsdk/base.py @@ -198,7 +198,6 @@ def setUp(self): def tearDown(self): super(LocalContextScenarioTest, self).tearDown() self.cmd('local-context off') - self.cmd('local-context delete --all --purge -y') os.chdir(self.original_working_dir) if os.path.exists(self.working_dir): import shutil From e11fd57a8aef722e9883a86670d693037f9b1878 Mon Sep 17 00:00:00 2001 From: Xiaojian Xu Date: Thu, 14 May 2020 13:43:00 +0800 Subject: [PATCH 3/3] {Core} Load vnet/subnet global definition for local context by default --- src/azure-cli-core/azure/cli/core/__init__.py | 5 ++++- src/azure-cli-core/azure/cli/core/commands/parameters.py | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py index 5e5f810cdae..c68e2e9faa3 100644 --- a/src/azure-cli-core/azure/cli/core/__init__.py +++ b/src/azure-cli-core/azure/cli/core/__init__.py @@ -351,7 +351,8 @@ def _get_extension_suppressions(mod_loaders): return self.command_table def load_arguments(self, command=None): - from azure.cli.core.commands.parameters import resource_group_name_type, get_location_type, deployment_name_type + from azure.cli.core.commands.parameters import ( + resource_group_name_type, get_location_type, deployment_name_type, vnet_name_type, subnet_name_type) from knack.arguments import ignore_type # omit specific command to load everything @@ -370,6 +371,8 @@ def load_arguments(self, command=None): with loader.argument_context('') as c: c.argument('resource_group_name', resource_group_name_type) c.argument('location', get_location_type(self.cli_ctx)) + c.argument('vnet_name', vnet_name_type) + c.argument('subnet', subnet_name_type) c.argument('deployment_name', deployment_name_type) c.argument('cmd', ignore_type) diff --git a/src/azure-cli-core/azure/cli/core/commands/parameters.py b/src/azure-cli-core/azure/cli/core/commands/parameters.py index 2a72d9dff0e..3dec0a22eb3 100644 --- a/src/azure-cli-core/azure/cli/core/commands/parameters.py +++ b/src/azure-cli-core/azure/cli/core/commands/parameters.py @@ -304,17 +304,10 @@ def get_location_type(cli_ctx): ) vnet_name_type = CLIArgumentType( - options_list='--vnet-name', - metavar='NAME', - help='The virtual network (VNet) name.', - completer=get_resource_name_completion_list('Microsoft.Network/virtualNetworks'), local_context_attribute=LocalContextAttribute(name='vnet_name', actions=[LocalContextAction.GET]) ) subnet_name_type = CLIArgumentType( - options_list='--subnet', - metavar='NAME', - help='The subnet name.', local_context_attribute=LocalContextAttribute(name='subnet_name', actions=[LocalContextAction.GET]))