From c9aafca972a02e10fc9dc0bd8a21a3c4b2c319e6 Mon Sep 17 00:00:00 2001 From: Yucai Gu Date: Thu, 4 Aug 2022 22:05:22 -0700 Subject: [PATCH] Added cisco config platform commands Signed-off-by: Yucai Gu --- config/main.py | 10 +++------- tests/config_test.py | 8 +++++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/config/main.py b/config/main.py index 46e8e8f311..b8744212be 100644 --- a/config/main.py +++ b/config/main.py @@ -1184,9 +1184,9 @@ def config(ctx): print("Caught an exception: " + str(e)) raise click.Abort() - #if asic_type == 'cisco-8000': - # from sonic_platform.cli.cisco import cisco - # platform.add_command(cisco) + if asic_type == 'cisco-8000': + from sonic_platform.cli.cisco import cisco + platform.add_command(cisco) # Load database config files load_db_config() @@ -5866,10 +5866,6 @@ def size(db, size): def platform(): """Platform-related configuration tasks""" -if asic_type == 'cisco-8000': - from sonic_platform.cli.cisco import cisco - platform.add_command(cisco) - # 'firmware' subgroup ("config platform firmware ...") @platform.group(cls=clicommon.AbbreviationGroup) def firmware(): diff --git a/tests/config_test.py b/tests/config_test.py index 8043139724..5cee25db3f 100644 --- a/tests/config_test.py +++ b/tests/config_test.py @@ -1591,17 +1591,19 @@ class TestConfigPlatorm(object): def setup_class(cls): os.environ['UTILITIES_UNIT_TESTING'] = "1" print("SETUP") + import config.main + importlib.reload(config.main) - def test_config_platform_cisco(self, get_cmd_module, setup_single_cisco_asic): - import config.main - importlib.reload(config.main) + def test_config_platform(self, get_cmd_module, setup_single_cisco_asic): + expected_output = "cisco" runner = CliRunner() result = runner.invoke(config.config.commands["platform"], ['--help']) print(result.exit_code) print(result.output) traceback.print_tb(result.exc_info[2]) + self.assertTrue(expected_output in result.output) @classmethod def teardown_class(cls):