Snappi changes work

.azure-pipelines/baseline_test/baseline.test.template.yml

@@ -8,79 +8,77 @@ jobs:
     steps:
       - template: ../impacted_area_testing/get-impacted-area.yml
 
-  - job: run_impacted_area_test
+  - job: impacted_area_kvmtest
+    displayName: " "
     cancelTimeoutInMinutes: 10
     dependsOn: get_impacted_area
     strategy:
       matrix:
-        t0:
+        impacted-area-kvmtest-t0:
           TESTBED_PREP_TOPOLOGY: t0
           CHECKER: t0_checker
           TOPOLOGY: t0
           PREPARE_TIME: 30
-          NUM_ASIC: 1
-          DEPLOY_MG_EXTRA_PARAMS: ""
-          COMMON_EXTRA_PARAMS: ""
-        t0_2vlans:
+        impacted-area-kvmtest-t0-2vlans:
           TESTBED_PREP_TOPOLOGY: t0-2vlans
           CHECKER: t0-2vlans_checker
           DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a "
           TOPOLOGY: t0
           PREPARE_TIME: 30
-          NUM_ASIC: 1
-          COMMON_EXTRA_PARAMS: ""
-        t1_lag:
+        impacted-area-kvmtest-t1-lag:
           TESTBED_PREP_TOPOLOGY: t1
           CHECKER: t1_checker
           TOPOLOGY: t1-lag
           # 50 mins for preparing testbed, 30 mins for pre-test and post-test
           PREPARE_TIME: 80
-          NUM_ASIC: 1
-          COMMON_EXTRA_PARAMS: ""
-          DEPLOY_MG_EXTRA_PARAMS: ""
-        dualtor:
+        impacted-area-kvmtest-dualtor:
           TESTBED_PREP_TOPOLOGY: dualtor
           CHECKER: dualtor_checker
           COMMON_EXTRA_PARAMS: "--disable_loganalyzer "
           TOPOLOGY: dualtor
           # 30 mins for preparing testbed, 30 mins for pre-test and 20 mins for post-test
           PREPARE_TIME: 80
-          NUM_ASIC: 1
-          DEPLOY_MG_EXTRA_PARAMS: ""
-        t1_multi_asic:
+        impacted-area-kvmtest-multi-asic-t1:
           TESTBED_PREP_TOPOLOGY: t1-multi-asic
           CHECKER: t1-multi-asic_checker
           TOPOLOGY: t1-8-lag
           NUM_ASIC: 4
           PREPARE_TIME: 30
-        sonic_t0:
+        impacted-area-kvmtest-t0-sonic:
           TESTBED_PREP_TOPOLOGY: t0-sonic
           CHECKER: t0-sonic_checker
           COMMON_EXTRA_PARAMS: "--neighbor_type=sonic "
           TOPOLOGY: t0-64-32
           PREPARE_TIME: 40
           VM_TYPE: vsonic
-          NUM_ASIC: 1
-          DEPLOY_MG_EXTRA_PARAMS: ""
-        dpu:
+          SPECIFIC_PARAM: '[
+            {"name": "bgp/test_bgp_fact.py", "param": "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"},
+            {"name": "macsec", "param": "--neighbor_type=sonic --enable_macsec --macsec_profile=128_SCI,256_XPN_SCI"}
+            ]'
+        impacted-area-kvmtest-dpu:
           TESTBED_PREP_TOPOLOGY: dpu
           CHECKER: dpu_checker
           TOPOLOGY: dpu
           PREPARE_TIME: 30
-          NUM_ASIC: 1
-          COMMON_EXTRA_PARAMS: ""
-          DEPLOY_MG_EXTRA_PARAMS: ""
+          SPECIFIC_PARAM: '[
+            {"name": "dash/test_dash_vnet.py", "param": "--skip_dataplane_checking"}
+            ]'
     condition: contains(dependencies.get_impacted_area.outputs['SetVariableTask.PR_CHECKERS'], variables['CHECKER'])
     variables:
       TEST_SCRIPTS: $[ dependencies.get_impacted_area.outputs['SetVariableTask.TEST_SCRIPTS'] ]
+      NUM_ASIC: 1
+      VM_TYPE: ceos
+      COMMON_EXTRA_PARAMS: ""
+      DEPLOY_MG_EXTRA_PARAMS: ""
+      SPECIFIC_PARAM: "[]"
     timeoutInMinutes: 240
     continueOnError: false
     pool: sonic-ubuntu-1c
     steps:
       - template: ../impacted_area_testing/calculate-instance-numbers.yml
         parameters:
           TOPOLOGY: $(TESTBED_PREP_TOPOLOGY)
-          BUILD_BRANCH: "master"
+          BUILD_BRANCH: $(Build.SourceBranchName)
           PREPARE_TIME: $(PREPARE_TIME)
 
       - template: ../run-test-elastictest-template.yml
@@ -91,10 +89,12 @@ jobs:
           MAX_WORKER: $(INSTANCE_NUMBER)
           DEPLOY_MG_EXTRA_PARAMS: $(DEPLOY_MG_EXTRA_PARAMS)
           COMMON_EXTRA_PARAMS: $(COMMON_EXTRA_PARAMS)
-          KVM_IMAGE_BRANCH: "master"
-          MGMT_BRANCH: "master"
+          KVM_IMAGE_BRANCH: $(Build.SourceBranchName)
+          MGMT_BRANCH: $(Build.SourceBranchName)
           BUILD_REASON: "BaselineTest"
           RETRY_TIMES: "0"
           STOP_ON_FAILURE: "False"
           TEST_PLAN_NUM: $(BASELINE_MGMT_PUBLIC_MASTER_TEST_NUM)
           NUM_ASIC: $(NUM_ASIC)
+          VM_TYPE: $(VM_TYPE)
+          SPECIFIC_PARAM: $(SPECIFIC_PARAM)

.azure-pipelines/pr_test_scripts.yaml

@@ -492,6 +492,7 @@ multi-asic-t1-lag:
   - http/test_http_copy.py
   - telemetry/test_telemetry_cert_rotation.py
   - telemetry/test_telemetry.py
+  - generic_config_updater/test_multiasic_addcluster.py
   - generic_config_updater/test_multiasic_idf.py
   - generic_config_updater/test_multiasic_linkcrc.py
 

.azure-pipelines/test_plan.py

@@ -179,6 +179,23 @@ def run_cmd(cmd):
     return stdout, stderr, return_code
 
 
+def get_trigger_type(tp_type: str, build_reason: str):
+    # 1. NIGHTLY type(only nightly test from pipeline)
+    if tp_type.upper() == "NIGHTLY":
+        return "NightlyTest"
+
+    # 2. PR type(pr test or baseline test)
+    # check build reason
+    if build_reason.upper() == "BASELINETEST":
+        return "BaselineTest"
+
+    if build_reason.upper() == "PULLREQUEST":
+        return "PRTest"
+
+    # Else, return None, no impact
+    return None
+
+
 class TestPlanManager(object):
 
     def __init__(self, scheduler_url, frontend_url, client_id, managed_identity_id):
@@ -251,6 +268,7 @@ def create(self, topology, test_plan_name="my_test_plan", deploy_mg_extra_params
         retry_cases_include = parse_list_from_str(kwargs.get("retry_cases_include", None))
         retry_cases_exclude = parse_list_from_str(kwargs.get("retry_cases_exclude", None))
         ptf_image_tag = kwargs.get("ptf_image_tag", None)
+        build_reason = kwargs.get("build_reason", "PullRequest")
 
         print(
             f"Creating test plan, topology: {topology}, name: {test_plan_name}, "
@@ -347,7 +365,8 @@ def create(self, topology, test_plan_name="my_test_plan", deploy_mg_extra_params
                 "requester": kwargs.get("requester", "Pull Request"),
                 "source_repo": kwargs.get("source_repo"),
                 "pull_request_id": pr_id,
-                "build_id": build_id
+                "build_id": build_id,
+                "type": get_trigger_type(test_plan_type, build_reason)
             },
             "extra_params": {},
             "priority": 10
@@ -994,13 +1013,22 @@ def poll(self, test_plan_id, interval=60, timeout=-1, expected_state="", expecte
         if args.action == "create":
             pr_id = os.environ.get("SYSTEM_PULLREQUEST_PULLREQUESTNUMBER") or os.environ.get(
                 "SYSTEM_PULLREQUEST_PULLREQUESTID")
-            repo = os.environ.get("BUILD_REPOSITORY_PROVIDER")
-            reason = args.build_reason if args.build_reason else os.environ.get("BUILD_REASON")
+            build_repo_provider = os.environ.get("BUILD_REPOSITORY_PROVIDER")
+            build_reason = args.build_reason if args.build_reason else os.environ.get("BUILD_REASON")
             build_id = os.environ.get("BUILD_BUILDID")
             job_name = os.environ.get("SYSTEM_JOBDISPLAYNAME")
             repo_name = args.repo_name if args.repo_name else os.environ.get("BUILD_REPOSITORY_NAME")
+            branch_name = os.environ.get("SYSTEM_PULLREQUEST_TARGETBRANCH") if build_reason.upper() == "PULLREQUEST" \
+                else os.environ.get("BUILD_SOURCEBRANCHNAME")
+
+            # Only pr test show pr id
+            pr_info = f"PR_{pr_id}_" if build_reason.upper() == "PULLREQUEST" else ""
+
+            # Only pr test and baseline test show repo and branch
+            source_repo_info = f"{repo_name}_{branch_name}_" if args.test_plan_type == "PR" else ""
 
-            test_plan_prefix = f"{repo}_{reason}_PR_{pr_id}_BUILD_{build_id}_JOB_{job_name}".replace(' ', '_')
+            test_plan_prefix = (f"{build_repo_provider}_{build_reason}_{source_repo_info}{pr_info}"
+                                f"BUILD_{build_id}_JOB_{job_name}").replace(' ', '_')
 
             scripts = args.scripts
             specific_param = json.loads(args.specific_param)
@@ -1058,6 +1086,7 @@ def poll(self, test_plan_id, interval=60, timeout=-1, expected_state="", expecte
                     requester=args.requester,
                     max_execute_seconds=args.max_execute_seconds,
                     lock_wait_timeout_seconds=args.lock_wait_timeout_seconds,
+                    build_reason=build_reason
                 )
         elif args.action == "poll":
             tp.poll(args.test_plan_id, args.interval, args.timeout, args.expected_state, args.expected_result)

ansible/config_sonic_basedon_testbed.yml

@@ -742,6 +742,25 @@
             service: name=chrony state=restarted enabled=true
         when: chrony_service.status.LoadState != "not-found"
 
+      - name: Check if "config bmp" is supported
+        shell: "config -h | grep 'BMP-related configuration'"
+        register: bmp_support_check
+        ignore_errors: true
+        changed_when: false
+        failed_when: false
+
+      - name: Enable bmp relevant config dump
+        block:
+          - name: execute cli "config bmp enable bgp-neighbor-table" to enable bgp-neighbor-table
+            command: sudo config bmp enable bgp-neighbor-table
+
+          - name: execute cli "config bmp enable bgp-rib-in-table" to enable bgp-rib-in-table
+            command: sudo config bmp enable bgp-rib-in-table
+
+          - name: execute cli "config bmp enable bgp-rib-out-table" to enable bgp-rib-out-table
+            command: sudo config bmp enable bgp-rib-out-table
+        when: bmp_support_check.rc == 0
+
       - name: config static route for trex traffic passthrough
         become: true
         command: "{{ item }}"

ansible/devutil/conn_graph_helper.py

@@ -1,11 +1,32 @@
 import os
 import inspect
 import sys
-import imp
+try:
+    import importlib.util
+    import importlib.machinery
+    use_importlib = True
+except ImportError:
+    import imp
+    use_importlib = False
 
 CONN_GRAPH_LOG = "/tmp/conn_graph_debug.txt"
 
 
+def load_source(modname, filename):
+    if use_importlib:
+        loader = importlib.machinery.SourceFileLoader(modname, filename)
+        spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
+        module = importlib.util.module_from_spec(spec)
+        # The module is always executed and not cached in sys.modules.
+        # Uncomment the following line to cache the module.
+        # sys.modules[module.__name__] = module
+        loader.exec_module(module)
+    else:
+        # For Python 2.x compatibility
+        module = imp.load_source(modname, filename)
+    return module
+
+
 def get_conn_graph_facts(hostnames):
     """
     @summary: Load conn_graph_facts from conn_graph_facts.xml
@@ -18,7 +39,7 @@ def get_conn_graph_facts(hostnames):
     if ansible_path not in sys.path:
         sys.path.append(ansible_path)
 
-    utils = imp.load_source('conn_graph_utils', os.path.join(
+    utils = load_source('conn_graph_utils', os.path.join(
         ansible_path, 'library/conn_graph_facts.py'))
     utils.LAB_GRAPHFILE_PATH = os.path.join(
         ansible_path, utils.LAB_GRAPHFILE_PATH)

ansible/group_vars/all/creds.yml

@@ -1,9 +1,9 @@
 eos_default_login: "admin"
 eos_default_password: ""
 eos_login: admin
-eos_password: 123456
+eos_password: "123456"
 eos_root_user: root
-eos_root_password: 123456
+eos_root_password: "123456"
 
 junos_default_login: "root"
 junos_default_password:  ""

ansible/group_vars/sonic/sku-sensors-data.yml

@@ -2549,8 +2549,6 @@ sensors_checks:
       - mp2855-i2c-39-69/PMIC-14 COMEX VDDCR_CPU PHASE TEMP/temp1_crit_alarm
       - mp2855-i2c-39-69/PMIC-14 COMEX VDDCR_SOC PHASE TEMP/temp2_crit_alarm
 
-      - 00000800400-mdio-8/temp1/temp1_max_alarm
-
       - jc42-i2c-43-1e/SODIMM3 Temp/temp1_max_alarm
       - jc42-i2c-43-1e/SODIMM3 Temp/temp1_min_alarm
       - jc42-i2c-43-1e/SODIMM3 Temp/temp1_crit_alarm
@@ -2614,9 +2612,6 @@ sensors_checks:
       - - mp2855-i2c-39-69/PMIC-14 COMEX VDDCR_SOC PHASE TEMP/temp2_input
         - mp2855-i2c-39-69/PMIC-14 COMEX VDDCR_SOC PHASE TEMP/temp2_crit
 
-      - - 00000800400-mdio-8/temp1/temp1_input
-        - 00000800400-mdio-8/temp1/temp1_crit
-
       - - jc42-i2c-43-1e/SODIMM3 Temp/temp1_input
         - jc42-i2c-43-1e/SODIMM3 Temp/temp1_crit
 

ansible/group_vars/sonic/variables

@@ -15,8 +15,8 @@ broadcom_th_hwskus: ['Force10-S6100', 'Arista-7060CX-32S-C32', 'Arista-7060CX-32
 broadcom_th2_hwskus: ['Arista-7260CX3-D108C8', 'Arista-7260CX3-D108C10', 'Arista-7260CX3-C64', 'Arista-7260CX3-Q64']
 broadcom_th3_hwskus: ['DellEMC-Z9332f-M-O16C64',  'DellEMC-Z9332f-O32']
 broadcom_th4_hwskus: ['Arista-7060DX5-32', 'Arista-7060DX5-64S']
-broadcom_th5_hwskus: ['Arista-7060X6-64DE', 'Arista-7060X6-64DE-64x400G', 'Arista-7060X6-64DE-O128S2', 'Arista-7060X6-64DE-256x200G', 'Arista-7060X6-64PE', 'Arista-7060X6-64PE-64x400G', 'Arista-7060X6-64PE-O128S2', 'Arista-7060X6-64PE-256x200G', 'Arista-7060X6-64PE-C256S2', 'Arista-7060X6-64PE-C224O8', 'Arista-7060X6-64PE-B-C512S2', 'Arista-7060X6-64PE-B-C448O16']
-broadcom_j2c+_hwskus: ['Nokia-IXR7250E-36x100G', 'Nokia-IXR7250E-36x400G', 'Arista-7800R3A-36DM2-C36', 'Arista-7800R3A-36DM2-D36', 'Arista-7800R3AK-36DM2-C36', 'Arista-7800R3AK-36DM2-D36']
+broadcom_th5_hwskus: ['Arista-7060X6-64DE', 'Arista-7060X6-64DE-64x400G', 'Arista-7060X6-64DE-O128S2', 'Arista-7060X6-64DE-256x200G', 'Arista-7060X6-64PE', 'Arista-7060X6-64PE-64x400G', 'Arista-7060X6-64PE-O128S2', 'Arista-7060X6-64PE-256x200G', 'Arista-7060X6-64PE-C256S2', 'Arista-7060X6-64PE-C224O8', 'Arista-7060X6-64PE-B-C512S2', 'Arista-7060X6-64PE-B-C448O16', 'Arista-7060X6-16PE-384C-O128S2']
+broadcom_j2c+_hwskus: ['Nokia-IXR7250E-36x100G', 'Nokia-IXR7250E-36x400G', 'Arista-7800R3A-36DM2-C36', 'Arista-7800R3A-36DM2-D36', 'Arista-7800R3AK-36DM2-C36', 'Arista-7800R3AK-36DM2-D36', 'Nokia-IXR7250-X3B']
 broadcom_jr2_hwskus: ['Arista-7800R3-48CQ2-C48', 'Arista-7800R3-48CQM2-C48']
 
 mellanox_spc1_hwskus: [ 'ACS-MSN2700', 'ACS-MSN2740', 'ACS-MSN2100', 'ACS-MSN2410', 'ACS-MSN2010', 'Mellanox-SN2700', 'Mellanox-SN2700-A1', 'Mellanox-SN2700-D48C8','Mellanox-SN2700-D40C8S8', 'Mellanox-SN2700-A1-D48C8']
@@ -35,7 +35,7 @@ marvell_hwskus: [ "et6448m", "Nokia-7215" ]
 innovium_tl7_hwskus: ["Wistron_sw_to3200k_32x100" , "Wistron_sw_to3200k"]
 
 cisco_hwskus: ["Cisco-8102-C64", "Cisco-8101-T32", "Cisco-8111-O32", "Cisco-8101-C64", "Cisco-8101-C48T8", "Cisco-8101-O8V48", "Cisco-8101-O8C48","Cisco-8111-C32", "Cisco-8111-O32", "Cisco-8111-O64", "Cisco-8122-O64", "Cisco-8122-O64S2", "Cisco-8122-O128", "Cisco-8800-LC-48H-C48", "Cisco-88-LC0-36FH-M-O36", "Cisco-88-LC0-36FH-O36", "cisco-8101-p4-32x100-vs", "Cisco-8102-28FH-DPU-O-T1"]
-cisco-8000_gb_hwskus: ["Cisco-8102-C64", "Cisco-8101-T32", "Cisco-8101-O32", "Cisco-8101-C64", "Cisco-8101-C48T8", "Cisco-8101-O8V48", "Cisco-8101-O8C48","Cisco-8111-C32", "Cisco-88-LC0-36FH-M-O36", "Cisco-88-LC0-36FH-O36", "Cisco-8102-28FH-DPU-O-T1"]
+cisco-8000_gb_hwskus: ["Cisco-8102-C64", "Cisco-8101-T32", "Cisco-8101-O32", "Cisco-8101-C64", "Cisco-8101-V64", "Cisco-8101-C48T8", "Cisco-8101-O8V48", "Cisco-8101-O8C48", "Cisco-8111-C32", "Cisco-88-LC0-36FH-M-O36", "Cisco-88-LC0-36FH-O36", "Cisco-8102-28FH-DPU-O-T1"]
 cisco-8000_gr_hwskus: ["Cisco-8111-O32", "Cisco-8111-O64"]
 cisco-8000_gr2_hwskus: ["Cisco-8122-O64", "Cisco-8122-O64S2", "Cisco-8122-O128"]
 cisco-8000_pac_hwskus: ["Cisco-8800-LC-48H-C48"]

ansible/health_checker.py

@@ -1,6 +1,4 @@
 #!/usr/bin/env python3
-
-import imp
 import os
 import logging
 import sys
@@ -13,6 +11,7 @@
 except ImportError:
     # ToDo: Support running without Ansible
     has_ansible = False
+from devutil.conn_graph_helper import load_source
 
 ANSIBLE_DIR = os.path.abspath(os.path.dirname(__file__))
 SONIC_MGMT_DIR = os.path.dirname(ANSIBLE_DIR)
@@ -35,7 +34,7 @@
 
 def get_testbeds_dict():
     """Return a dictionary containing mapping from dut hostname to testbed name."""
-    testbed = imp.load_source('testbed', os.path.join(
+    testbed = load_source('testbed', os.path.join(
         SONIC_MGMT_DIR, 'tests/common/testbed.py'))
     testbeds_dict = testbed.TestbedInfo(TESTBED_FILE).testbed_topo
     return testbeds_dict

ansible/library/announce_routes.py

@@ -1107,10 +1107,12 @@ def fib_t2_lag(topo, ptf_ip, action="announce"):
     t1_vms = {}
     # T3 VMs per linecard(asic) - key is the dut index, and value is a list of T3 VMs
     t3_vms = {}
-
     for key, value in vms.items():
-        m = re.match(r"(\d+)\.(\d+)@(\d+)", value['vlans'][0])
-        dut_index = int(m.group(1))
+        if type(value['vlans'][0]) == int:
+            dut_index = 0
+        else:
+            m = re.match(r"(\d+)\.(\d+)@(\d+)", value['vlans'][0])
+            dut_index = int(m.group(1))
         if 'T1' in key:
             if dut_index not in t1_vms:
                 t1_vms[dut_index] = list()
@@ -1120,6 +1122,7 @@ def fib_t2_lag(topo, ptf_ip, action="announce"):
             if dut_index not in t3_vms:
                 t3_vms[dut_index] = list()
             t3_vms[dut_index].append(key)
+
     route_set += generate_t2_routes(t1_vms, topo, ptf_ip, action)
     route_set += generate_t2_routes(t3_vms, topo, ptf_ip, action)
     send_routes_in_parallel(route_set)

ansible/library/generate_golden_config_db.py

@@ -362,8 +362,9 @@ def generate(self):
         # update dns config
         config = self.update_dns_config(config)
 
-        # To enable bmp feature
-        if self.check_version_for_bmp() is True:
+        # To enable bmp feature when the image version is >= 202411 and the device is not supervisor
+        # Note: the Chassis supervisor is not holding any BGP sessions so the BMP feature is not needed
+        if self.check_version_for_bmp() is True and device_info.is_supervisor() is False:
             if multi_asic.is_multi_asic():
                 config = self.overwrite_feature_golden_config_db_multiasic(config, "bmp")
             else: