[masic support] 'show run bgp' support for multi-asic

show/main.py

@@ -1385,10 +1385,37 @@ def ports(portname, verbose):
 # 'bgp' subcommand ("show runningconfiguration bgp")
 @runningconfiguration.command()
 @click.option('--verbose', is_flag=True, help="Enable verbose output")
-def bgp(verbose):
+@click.option('--namespace', '-n', 'namespace', required=False, default=None, type=str, show_default=False, 
+              help='Option needed for multi-asic only - provide namespace name or all')
+def bgp(namespace, verbose):
     """Show BGP running configuration"""
-    cmd = 'sudo {} -c "show running-config"'.format(constants.RVTYSH_COMMAND)
-    run_command(cmd, display_cmd=verbose)
+    if multi_asic.is_multi_asic() and (namespace not in multi_asic.get_namespace_list() or namespace != 'all'):
+        ctx = click.get_current_context()
+        ctx.fail("-n/--namespace option required. provide namespace from list {}, or give '-n all'".format(multi_asic.get_namespace_list()))
+    if not multi_asic.is_multi_asic() and namespace:
+        ctx = click.get_current_context()                
+        ctx.fail("-n/--namespace is not available for single asic")
+
+    output = ""
+    #sigle-asic duts will not enter this condition, they cannot take '-n' option
+    if namespace:
+        if namespace == 'all':
+            ns_list = multi_asic.get_namespace_list()
+            for ns in ns_list:
+                output += "\n------------Showing running config bgp on {}------------\n".format(ns)
+                ns_id = " -n {} ".format(multi_asic.get_asic_id_from_name(ns))
+                cmd = 'sudo {} {} -c "show run bgp"'.format(constants.RVTYSH_COMMAND, ns_id)
+                output += run_command(cmd, display_cmd = False, return_cmd=True)
+        else:
+            output += "\n------------Showing running config bgp on {}------------\n".format(namespace)
+            ns_id = " -n {} ".format(multi_asic.get_asic_id_from_name(namespace))
+            cmd = 'sudo {} {} -c "show run bgp"'.format(constants.RVTYSH_COMMAND, ns_id)
+            output += run_command(cmd, display_cmd = False, return_cmd=True)
+    # multi-asic duts will not enter this condition, they have to be given '-n' option
+    else:
+        cmd = 'sudo {} -c "show run bgp"'.format(constants.RVTYSH_COMMAND)
+        output += run_command(cmd, display_cmd = False, return_cmd=True)
+    print(output)
 
 
 # 'interfaces' subcommand ("show runningconfiguration interfaces")

tests/show_run_bgp_test.py

@@ -0,0 +1,36 @@
+
+import os
+
+import pytest
+
+from click.testing import CliRunner
+
+from utilities_common import multi_asic
+from utilities_common import constants
+
+from unittest.mock import patch
+
+from sonic_py_common import device_info
+from .show_run_commands_input.show_run_bgp_test_vector import *
+
+class TestShowRunCommands(object):
+    @classmethod
+    def setup_class(cls):
+        print("SETUP")
+        from .mock_tables import dbconnector
+
+    @pytest.mark.parametrize('setup_single_bgp_instance', 'test_vector', 
+                             [' '], indirect=['setup_single_bgp_instance'])
+    def test_show_run_bgp_single(
+            self,
+            setup_bgp_commands,
+            setup_single_bgp_instance):
+        show = setup_bgp_commands
+        runner = CliRunner()
+        exec_cmd = show.cli.commands["runningconfiguration"].commands["bgp"]
+        input = testData['test_vector']
+        result = runner.invoke(exec_cmd, input['args'])
+        print("{}".format(result.output))
+        import pdb; pdb.set_trace()
+        assert result.exit_code == 0
+        assert result.output == show_run_bgp_sasic