[GCU] [MA] Adding support in existing tests - bgpl (sonic-net#15231)

Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>

Author: okaravasi

tests/generic_config_updater/test_bgpl.py

@@ -11,16 +11,16 @@
 from tests.common.gu_utils import create_checkpoint, delete_checkpoint, rollback_or_reload
 
 pytestmark = [
-    pytest.mark.topology('t0', 'm0', 'mx', "m1", "m2", "m3"),
+    pytest.mark.topology('t0', 'm0', 'mx', "m1", "m2", "m3", 't2'),
 ]
 
 logger = logging.getLogger(__name__)
 
 
-def get_bgp_monitor_runningconfig(duthost):
+def get_bgp_monitor_runningconfig(duthost, cli_namespace_prefix):
     """ Get bgp listener config
     """
-    cmds = "show runningconfiguration bgp"
+    cmds = "show runningconfiguration bgp {}".format(cli_namespace_prefix)
     output = duthost.shell(cmds)
     pytest_assert(not output['rc'], "'{}' failed with rc={}".format(cmds, output['rc']))
 
@@ -32,23 +32,25 @@ def get_bgp_monitor_runningconfig(duthost):
 
 
 @pytest.fixture(autouse=True)
-def setup_env(duthosts, rand_one_dut_hostname):
+def setup_env(duthosts, rand_one_dut_front_end_hostname, enum_rand_one_frontend_asic_index, cli_namespace_prefix):
     """
     Setup/teardown fixture for bgpmon config
     Args:
         duthosts: list of DUTs.
-        rand_selected_dut: The fixture returns a randomly selected DuT.
+        rand_selected_front_end_dut: The fixture returns a randomly selected DuT.
+        enum_rand_one_frontend_asic_index: random selected asic namespace.
+        cli_namespace_prefix: Formatted asic namespace for cli commands
     """
-    duthost = duthosts[rand_one_dut_hostname]
-    original_bgp_listener_config = get_bgp_monitor_runningconfig(duthost)
+    duthost = duthosts[rand_one_dut_front_end_hostname]
+    original_bgp_listener_config = get_bgp_monitor_runningconfig(duthost, cli_namespace_prefix)
     create_checkpoint(duthost)
 
     yield
 
     try:
         logger.info("Rolled back to original checkpoint")
         rollback_or_reload(duthost)
-        current_bgp_listener_config = get_bgp_monitor_runningconfig(duthost)
+        current_bgp_listener_config = get_bgp_monitor_runningconfig(duthost, cli_namespace_prefix)
         pytest_assert(
             set(original_bgp_listener_config) == set(current_bgp_listener_config),
             "bgp listener config are not suppose to change after test"
@@ -58,42 +60,43 @@ def setup_env(duthosts, rand_one_dut_hostname):
 
 
 @pytest.fixture(scope="module")
-def bgpmon_setup_info(rand_selected_dut):
+def bgpmon_setup_info(rand_selected_front_end_dut):
     """ Get initial setup info for BGPMONITOR
     """
-    peer_addr = generate_ip_through_default_route(rand_selected_dut)
+    peer_addr = generate_ip_through_default_route(rand_selected_front_end_dut)
     pytest_assert(peer_addr, "Failed to generate ip address for test")
     peer_addr = str(IPNetwork(peer_addr).ip)
 
-    mg_facts = rand_selected_dut.minigraph_facts(host=rand_selected_dut.hostname)['ansible_facts']
+    mg_facts = rand_selected_front_end_dut.minigraph_facts(host=rand_selected_front_end_dut.hostname)['ansible_facts']
     local_addr = mg_facts['minigraph_lo_interfaces'][0]['addr']
 
     return peer_addr, local_addr, str(mg_facts['minigraph_bgp_asn'])
 
 
-def bgpmon_cleanup_config(duthost):
+def bgpmon_cleanup_config(duthost, cli_namespace_prefix):
     """ Clean up BGPMONITOR config to make sure t0 is not broken by other tests
     """
-    cmds = 'sonic-db-cli CONFIG_DB keys "BGP_MONITORS|*" | xargs -r sonic-db-cli CONFIG_DB del'
+    cmds = 'sonic-db-cli {} CONFIG_DB keys "BGP_MONITORS|*" | xargs -r sonic-db-cli CONFIG_DB del'.format(
+        cli_namespace_prefix)
     output = duthost.shell(cmds)
     pytest_assert(not output['rc'], "bgpmon cleanup config failed")
 
 
-def check_bgpmon_with_addr(duthost, addr):
+def check_bgpmon_with_addr(duthost, addr, cli_namespace_prefix):
     """ Check BGP MONITOR config change is taken into effect
     """
-    cmds = "show ip bgp summary | grep -w {}".format(addr)
+    cmds = "show ip bgp summary {} | grep -w {}".format(cli_namespace_prefix, addr)
     output = duthost.shell(cmds)
     pytest_assert(not output['rc'], "BGPMonitor with addr {} is not being setup.".format(addr))
 
 
-def bgpmon_tc1_add_init(duthost, bgpmon_setup_info):
+def bgpmon_tc1_add_init(duthost, bgpmon_setup_info, cli_namespace_prefix, namespace=None):
     """ Test to add initial bgpmon config
 
     Make sure bgpmon is cleaned up for current topo.
     Then test to add initial setup for bgpmon.
     """
-    bgpmon_cleanup_config(duthost)
+    bgpmon_cleanup_config(duthost, cli_namespace_prefix)
 
     peer_addr, local_addr, bgp_asn = bgpmon_setup_info
     json_patch = [
@@ -114,7 +117,8 @@ def bgpmon_tc1_add_init(duthost, bgpmon_setup_info):
             }
         }
     ]
-    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch, is_asic_specific=True)
+    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch,
+                                                 is_asic_specific=True, asic_namespaces=[namespace])
 
     tmpfile = generate_tmpfile(duthost)
     logger.info("tmpfile {}".format(tmpfile))
@@ -123,12 +127,12 @@ def bgpmon_tc1_add_init(duthost, bgpmon_setup_info):
         output = apply_patch(duthost, json_data=json_patch, dest_file=tmpfile)
         expect_op_success(duthost, output)
 
-        check_bgpmon_with_addr(duthost, peer_addr)
+        check_bgpmon_with_addr(duthost, peer_addr, cli_namespace_prefix)
     finally:
         delete_tmpfile(duthost, tmpfile)
 
 
-def bgpmon_tc1_add_duplicate(duthost, bgpmon_setup_info):
+def bgpmon_tc1_add_duplicate(duthost, bgpmon_setup_info, cli_namespace_prefix, namespace=None):
     """ Test to add duplicate config to bgpmon
     """
     peer_addr, local_addr, bgp_asn = bgpmon_setup_info
@@ -148,7 +152,8 @@ def bgpmon_tc1_add_duplicate(duthost, bgpmon_setup_info):
             }
         }
     ]
-    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch, is_asic_specific=True)
+    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch,
+                                                 is_asic_specific=True, asic_namespaces=[namespace])
 
     tmpfile = generate_tmpfile(duthost)
     logger.info("tmpfile {}".format(tmpfile))
@@ -157,12 +162,12 @@ def bgpmon_tc1_add_duplicate(duthost, bgpmon_setup_info):
         output = apply_patch(duthost, json_data=json_patch, dest_file=tmpfile)
         expect_op_success(duthost, output)
 
-        check_bgpmon_with_addr(duthost, peer_addr)
+        check_bgpmon_with_addr(duthost, peer_addr, cli_namespace_prefix)
     finally:
         delete_tmpfile(duthost, tmpfile)
 
 
-def bgpmon_tc1_admin_change(duthost, bgpmon_setup_info):
+def bgpmon_tc1_admin_change(duthost, bgpmon_setup_info, cli_namespace_prefix, namespace=None):
     """ Test to admin down bgpmon config
     """
     peer_addr, _, _ = bgpmon_setup_info
@@ -173,7 +178,8 @@ def bgpmon_tc1_admin_change(duthost, bgpmon_setup_info):
             "value": "down"
         }
     ]
-    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch, is_asic_specific=True)
+    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch,
+                                                 is_asic_specific=True, asic_namespaces=[namespace])
 
     tmpfile = generate_tmpfile(duthost)
     logger.info("tmpfile {}".format(tmpfile))
@@ -182,15 +188,15 @@ def bgpmon_tc1_admin_change(duthost, bgpmon_setup_info):
         output = apply_patch(duthost, json_data=json_patch, dest_file=tmpfile)
         expect_op_success(duthost, output)
 
-        cmds = "show ip bgp summary | grep -w {}".format(peer_addr)
+        cmds = "show ip bgp summary {} | grep -w {}".format(cli_namespace_prefix, peer_addr)
         output = duthost.shell(cmds)
         pytest_assert(not output['rc'] and "Idle (Admin)" in output['stdout'],
                       "BGPMonitor with addr {} failed to admin down.".format(peer_addr))
     finally:
         delete_tmpfile(duthost, tmpfile)
 
 
-def bgpmon_tc1_ip_change(duthost, bgpmon_setup_info):
+def bgpmon_tc1_ip_change(duthost, bgpmon_setup_info, cli_namespace_prefix, namespace=None):
     """ Test to replace bgpmon ip address
     """
     peer_addr, local_addr, bgp_asn = bgpmon_setup_info
@@ -216,7 +222,8 @@ def bgpmon_tc1_ip_change(duthost, bgpmon_setup_info):
             }
         }
     ]
-    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch, is_asic_specific=True)
+    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch,
+                                                 is_asic_specific=True, asic_namespaces=[namespace])
 
     tmpfile = generate_tmpfile(duthost)
     logger.info("tmpfile {}".format(tmpfile))
@@ -225,12 +232,12 @@ def bgpmon_tc1_ip_change(duthost, bgpmon_setup_info):
         output = apply_patch(duthost, json_data=json_patch, dest_file=tmpfile)
         expect_op_success(duthost, output)
 
-        check_bgpmon_with_addr(duthost, peer_addr_replaced)
+        check_bgpmon_with_addr(duthost, peer_addr_replaced, cli_namespace_prefix)
     finally:
         delete_tmpfile(duthost, tmpfile)
 
 
-def bgpmon_tc1_remove(duthost):
+def bgpmon_tc1_remove(duthost, cli_namespace_prefix, namespace=None):
     """ Test to remove bgpmon config
     """
     json_patch = [
@@ -239,7 +246,8 @@ def bgpmon_tc1_remove(duthost):
             "path": "/BGP_MONITORS"
         }
     ]
-    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch, is_asic_specific=True)
+    json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch,
+                                                 is_asic_specific=True, asic_namespaces=[namespace])
 
     tmpfile = generate_tmpfile(duthost)
     logger.info("tmpfile {}".format(tmpfile))
@@ -248,18 +256,20 @@ def bgpmon_tc1_remove(duthost):
         output = apply_patch(duthost, json_data=json_patch, dest_file=tmpfile)
         expect_op_success(duthost, output)
 
-        output = duthost.shell("show ip bgp summary")
+        output = duthost.shell("show ip bgp summary {}".format(cli_namespace_prefix))
         pytest_assert(not output['rc'], "Failed to get info from BGP summary")
         pytest_assert("BGPMonitor" not in output['stdout'], "Failed to remove BGPMonitor")
     finally:
         delete_tmpfile(duthost, tmpfile)
 
 
-def test_bgpmon_tc1_add_and_remove(rand_selected_dut, bgpmon_setup_info):
+def test_bgpmon_tc1_add_and_remove(rand_selected_front_end_dut, bgpmon_setup_info,
+                                   enum_rand_one_frontend_asic_index, cli_namespace_prefix):
     """ Test to verify bgpmon config addition and deletion
     """
-    bgpmon_tc1_add_init(rand_selected_dut, bgpmon_setup_info)
-    bgpmon_tc1_add_duplicate(rand_selected_dut, bgpmon_setup_info)
-    bgpmon_tc1_admin_change(rand_selected_dut, bgpmon_setup_info)
-    bgpmon_tc1_ip_change(rand_selected_dut, bgpmon_setup_info)
-    bgpmon_tc1_remove(rand_selected_dut)
+    asic_namespace = rand_selected_front_end_dut.get_namespace_from_asic_id(enum_rand_one_frontend_asic_index)
+    bgpmon_tc1_add_init(rand_selected_front_end_dut, bgpmon_setup_info, cli_namespace_prefix, asic_namespace)
+    bgpmon_tc1_add_duplicate(rand_selected_front_end_dut, bgpmon_setup_info, cli_namespace_prefix, asic_namespace)
+    bgpmon_tc1_admin_change(rand_selected_front_end_dut, bgpmon_setup_info, cli_namespace_prefix, asic_namespace)
+    bgpmon_tc1_ip_change(rand_selected_front_end_dut, bgpmon_setup_info, cli_namespace_prefix, asic_namespace)
+    bgpmon_tc1_remove(rand_selected_front_end_dut, cli_namespace_prefix, asic_namespace)