Adding new Tests for Chassis/Multi-ASIC GCU

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

@@ -2466,6 +2466,12 @@ generic_config_updater:
     conditions:
       - "('t2' == topo_type) and (release in ['201811', '201911', '202012', '202205', '202211', '202305', '202311'])"
 
+generic_config_updater/add_cluster/test_add_cluster.py:
+  skip:
+    reason: This test case either cannot pass or should be skipped on virtual chassis
+    conditions:
+      - asic_type in ['vs']
+
 generic_config_updater/test_bgp_prefix.py::test_bgp_prefix_tc1_suite:
   skip:
     reason: "Cisco 8122 backend compute ai platform is not supported. Skip on VS platform due to low success rate."

tests/common/plugins/conditional_mark/tests_mark_conditions_vs_t2.yaml

@@ -255,6 +255,11 @@ everflow/test_everflow_testbed.py:
     - asic_type in ['vs'] and 't2' in topo_name
     - https://github.com/sonic-net/sonic-mgmt/issues/20257
     reason: This test case takes too much time on virtual chassis
+generic_config_updater/add_cluster/test_add_cluster.py:
+  skip:
+    conditions:
+    - asic_type in ['vs'] and 't2' in topo_name
+    reason: This test case either cannot pass or should be skipped on virtual chassis
 generic_config_updater/test_bgp_prefix.py:
   skip:
     conditions:

tests/common/snappi_tests/common_helpers.py

@@ -25,10 +25,10 @@
 from ipaddress import IPv6Network, IPv6Address
 import ipaddress
 from random import getrandbits
+from tests.common.helpers.assertions import pytest_assert
 from tests.common.portstat_utilities import parse_portstat
 from collections import defaultdict
 from tests.conftest import parse_override
-from tests.common.helpers.assertions import pytest_assert
 from tests.common.utilities import wait_until
 
 logger = logging.getLogger(__name__)
@@ -1322,12 +1322,13 @@ def start_pfcwd_fwd(duthost, asic_value=None):
                       format(asic_value))
 
 
-def clear_counters(duthost, port):
+def clear_counters(duthost, port=None, namespace=None):
     """
     Clear PFC, Queuecounters, Drop and generic counters from SONiC CLI.
     Args:
         duthost (Ansible host instance): Device under test
         port (str): port name
+        namespace (str): namespace name in case of multi asic duthost
     Returns:
         None
     """
@@ -1343,8 +1344,15 @@ def clear_counters(duthost, port):
     duthost.command("sonic-clear queue watermark all \n")
 
     if (duthost.is_multi_asic):
-        asic = duthost.get_port_asic_instance(port).get_asic_namespace()
-        duthost.command("sudo ip netns exec {} sonic-clear dropcounters \n".format(asic))
+        pytest_assert(
+            port or namespace,
+            'Cannot clear counters in case of multi asic, either port or namespace needs to be provided.'
+            )
+        if not namespace:
+            namespace = duthost.get_port_asic_instance(port).get_asic_namespace()
+        duthost.command("sudo ip netns exec {} sonic-clear dropcounters \n".format(namespace))
+    else:
+        duthost.command("sonic-clear dropcounters \n")
 
 
 def get_interface_stats(duthost, port):

tests/generic_config_updater/add_cluster/acl/acl_rule_src_dst_port.json

@@ -0,0 +1,44 @@
+{
+    "acl": {
+        "acl-sets": {
+            "acl-set": {
+                "L3_TRANSPORT_TEST": {
+                    "acl-entries": {
+                        "acl-entry": {
+                            "100": {
+                                "actions": {
+                                    "config": {
+                                        "forwarding-action": "ACCEPT"
+                                    }
+                                },
+                                "config": {
+                                    "sequence-id": 100
+                                },
+                                "transport": {
+                                    "config": {
+                                        "source-port": "5000"
+                                    }
+                                }
+                            },
+                            "200": {
+                                "actions": {
+                                    "config": {
+                                        "forwarding-action": "DROP"
+                                    }
+                                },
+                                "config": {
+                                    "sequence-id": 200
+                                },
+                                "transport": {
+                                    "config": {
+                                        "destination-port": "8080"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

tests/generic_config_updater/add_cluster/conftest.py

@@ -0,0 +1,74 @@
+import logging
+import pytest
+from tests.common.gu_utils import create_checkpoint, delete_checkpoint, rollback_or_reload
+from tests.common.gu_utils import restore_backup_test_config, save_backup_test_config
+
+logger = logging.getLogger(__name__)
+
+
+# -----------------------------
+# Fixtures that return random values for selected asic namespace, neighbors and cfg data for these selections
+# -----------------------------
+
+@pytest.fixture(scope="module")
+def enum_rand_one_asic_namespace(enum_rand_one_frontend_asic_index):
+    return None if enum_rand_one_frontend_asic_index is None else 'asic{}'.format(enum_rand_one_frontend_asic_index)
+
+
+@pytest.fixture(scope="module")
+def config_facts(duthosts, enum_downstream_dut_hostname, enum_rand_one_asic_namespace):
+    duthost = duthosts[enum_downstream_dut_hostname]
+    return duthost.config_facts(
+        host=duthost.hostname, source="running", namespace=enum_rand_one_asic_namespace
+        )['ansible_facts']
+
+
+@pytest.fixture(scope="module")
+def config_facts_localhost(duthosts, enum_downstream_dut_hostname):
+    duthost = duthosts[enum_downstream_dut_hostname]
+    return duthost.config_facts(host=duthost.hostname, source="running", namespace=None)['ansible_facts']
+
+
+@pytest.fixture(scope="module")
+def mg_facts(duthosts, enum_downstream_dut_hostname, enum_rand_one_asic_namespace, tbinfo):
+    duthost = duthosts[enum_downstream_dut_hostname]
+    return duthost.get_extended_minigraph_facts(tbinfo, namespace=enum_rand_one_asic_namespace)
+
+
+@pytest.fixture(scope="module")
+def rand_bgp_neigh_ip_name(config_facts):
+    '''Returns a random bgp neighbor ip, name from the namespace'''
+    bgp_neighbors = config_facts["BGP_NEIGHBOR"]
+    random_bgp_neigh_ip = list(bgp_neighbors.keys())[0]
+    random_bgp_neigh_name = config_facts['BGP_NEIGHBOR'][random_bgp_neigh_ip]['name']
+    logger.info("rand_bgp_neigh_ip_name : {}, {} "
+                .format(random_bgp_neigh_ip, random_bgp_neigh_name))
+    return random_bgp_neigh_ip, random_bgp_neigh_name
+
+
+# -----------------------------
+# Setup Fixtures
+# -----------------------------
+
+@pytest.fixture(scope="module", autouse=True)
+def setup_env(duthosts, rand_one_dut_front_end_hostname):
+    """
+    Setup/teardown fixture for add cluster test cases.
+    Args:
+        duthosts: list of DUTs.
+        rand_one_dut_front_end_hostname: A random linecard.
+    """
+
+    duthost = duthosts[rand_one_dut_front_end_hostname]
+    create_checkpoint(duthost)
+    save_backup_test_config(duthost, file_postfix="{}_before_add_cluster_test".format(duthost.hostname))
+
+    yield
+
+    restore_backup_test_config(duthost, file_postfix="{}_before_add_cluster_test".format(duthost.hostname),
+                               config_reload=False)
+    try:
+        logger.info("{}:Rolling back to original checkpoint".format(duthost.hostname))
+        rollback_or_reload(duthost)
+    finally:
+        delete_checkpoint(duthost)