[show] Show running config when bgp is down (sonic-net#3313)

What I did
Modify show run all to display rest config when bgp is down

How I did it
Add param in bgp_util's run_bgp_show_command to not exit when bgp down

How to verify it
unit test

show/main.py

@@ -1438,11 +1438,11 @@ def all(verbose):
  for ns in ns_list:
  ns_config = get_config_json_by_namespace(ns)
  if bgp_util.is_bgp_feature_state_enabled(ns):
- ns_config['bgpraw'] = bgp_util.run_bgp_show_command(bgpraw_cmd, ns)
+ ns_config['bgpraw'] = bgp_util.run_bgp_show_command(bgpraw_cmd, ns, exit_on_fail=False)
  output[ns] = ns_config
  click.echo(json.dumps(output, indent=4))
  else:
- host_config['bgpraw'] = bgp_util.run_bgp_show_command(bgpraw_cmd)
+ host_config['bgpraw'] = bgp_util.run_bgp_show_command(bgpraw_cmd, exit_on_fail=False)
  click.echo(json.dumps(output['localhost'], indent=4))
 
 

tests/conftest.py

@@ -317,7 +317,7 @@ def mock_run_bgp_command_for_static(vtysh_cmd, bgp_namespace="", vtysh_shell_cmd
  else:
  return ""
 
- def mock_run_bgp_command(vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.RVTYSH_COMMAND):
+ def mock_run_bgp_command(vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.RVTYSH_COMMAND, exit_on_fail=True):
  if m_asic_json_file.startswith('bgp_v4_network') or \
  m_asic_json_file.startswith('bgp_v6_network'):
  return mock_show_bgp_network_multi_asic(m_asic_json_file)
@@ -335,7 +335,8 @@ def mock_run_bgp_command(vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.RVT
  else:
  return ""
 
- def mock_run_show_sum_bgp_command(vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.VTYSH_COMMAND):
+ def mock_run_show_sum_bgp_command(
+ vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.VTYSH_COMMAND, exit_on_fail=True):
  if vtysh_cmd == "show ip bgp summary json":
  m_asic_json_file = 'no_bgp_neigh.json'
  else:
@@ -350,7 +351,8 @@ def mock_run_show_sum_bgp_command(vtysh_cmd, bgp_namespace, vtysh_shell_cmd=cons
  else:
  return ""
 
- def mock_run_show_summ_bgp_command_no_ext_neigh_on_all_asic(vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.VTYSH_COMMAND):
+ def mock_run_show_summ_bgp_command_no_ext_neigh_on_all_asic(
+ vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.VTYSH_COMMAND, exit_on_fail=True):
  if vtysh_cmd == "show ip bgp summary json":
  m_asic_json_file = 'no_ext_bgp_neigh.json'
  else:
@@ -365,7 +367,8 @@ def mock_run_show_summ_bgp_command_no_ext_neigh_on_all_asic(vtysh_cmd, bgp_names
  else:
  return ""
 
- def mock_run_show_summ_bgp_command_no_ext_neigh_on_asic1(vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.VTYSH_COMMAND):
+ def mock_run_show_summ_bgp_command_no_ext_neigh_on_asic1(
+ vtysh_cmd, bgp_namespace, vtysh_shell_cmd=constants.VTYSH_COMMAND, exit_on_fail=True):
  if vtysh_cmd == "show ip bgp summary json":
  if bgp_namespace == "asic1":
  m_asic_json_file = 'no_ext_bgp_neigh.json'

utilities_common/bgp_util.py

@@ -197,7 +197,8 @@ def get_neighbor_dict_from_table(db, table_name):
  return neighbor_dict
 
 
-def run_bgp_command(vtysh_cmd, bgp_namespace=multi_asic.DEFAULT_NAMESPACE, vtysh_shell_cmd=constants.VTYSH_COMMAND):
+def run_bgp_command(vtysh_cmd, bgp_namespace=multi_asic.DEFAULT_NAMESPACE,
+ vtysh_shell_cmd=constants.VTYSH_COMMAND, exit_on_fail=True):
  bgp_instance_id = []
  output = None
  if bgp_namespace is not multi_asic.DEFAULT_NAMESPACE:
@@ -208,16 +209,16 @@ def run_bgp_command(vtysh_cmd, bgp_namespace=multi_asic.DEFAULT_NAMESPACE, vtysh
  output, ret = clicommon.run_command(cmd, return_cmd=True)
  if ret != 0:
  click.echo(output.rstrip('\n'))
- sys.exit(ret)
+ output = "" if not exit_on_fail else sys.exit(ret)
  except Exception:
  ctx = click.get_current_context()
- ctx.fail("Unable to get summary from bgp {}".format(bgp_instance_id))
+ ctx.fail("Unable to get summary from bgp {}".format(bgp_instance_id)) if exit_on_fail else None
 
  return output
 
 
-def run_bgp_show_command(vtysh_cmd, bgp_namespace=multi_asic.DEFAULT_NAMESPACE):
- output = run_bgp_command(vtysh_cmd, bgp_namespace, constants.RVTYSH_COMMAND)
+def run_bgp_show_command(vtysh_cmd, bgp_namespace=multi_asic.DEFAULT_NAMESPACE, exit_on_fail=True):
+ output = run_bgp_command(vtysh_cmd, bgp_namespace, constants.RVTYSH_COMMAND, exit_on_fail)
  # handle the the alias mode in the following code
  if output is not None:
  if clicommon.get_interface_naming_mode() == "alias" and re.search("show ip|ipv6 route", vtysh_cmd):