Normalize vpp topo name (#21510)

What is the motivation for this PR?
vpp testbed has topo name with vpp suffix for the reason that in azure pipeline, it can use a different profile with different resources. However, from sonic-mgmt test perspective, t1-lag-vpp is exactly the same as t1-lag with the same topology. In sonic-mgmt tests, there are places check topo name. We don't want to add special logic for vpp topos. So we want to normalize the special topo name.

How did you do it?
In TestbedInfo, remove -vpp suffix when the testbed is loaded.

How did you verify/test it?
Run vpp sonic-mgmt test.

Any platform specific information?
Specific to vpp platform

Signed-off-by: Yue Gao <[email protected]>

Author: yue-fred-gao

tests/common/testbed.py

@@ -61,6 +61,7 @@ def __init__(self, testbed_file):
             # create yaml testbed file
             self.dump_testbeds_to_yaml()
         self.parse_topo()
+        self._normalize_topo_names()
 
     def _cidr_to_ip_mask(self, network):
         addr = ipaddress.IPNetwork(network)
@@ -396,6 +397,13 @@ def parse_topo(self):
                 tb['topo']['ptf_map_disabled'] = self.calculate_ptf_index_map_disabled(tb)
                 tb['topo']['ptf_dut_intf_map'] = self.calculate_ptf_dut_intf_map(tb)
 
+    def _normalize_topo_names(self):
+        """Normalize topology names by removing the '-vpp' suffix if present."""
+        for tb_name, tb in list(self.testbed_topo.items()):
+            topo_name = tb["topo"]["name"]
+            if topo_name.endswith("-vpp"):
+                tb["topo"]["name"] = topo_name[:-4]  # Remove the last 4 characters ("-vpp")
+
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(