FIX: Workaround AVF interface down until VPP-1934

[csit.git] / resources / libraries / python / TrafficGenerator.py

diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index 54d0fbd..f44ff87 100644 (file)
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -244,7 +244,6 @@ class TrafficGenerator(AbstractMeasurer):
         )
 
     # TODO: pylint says disable=too-many-locals.
-    # A fix is developed in https://gerrit.fd.io/r/c/csit/+/22221
     def initialize_traffic_generator(
             self, tg_node, tg_if1, tg_if2, tg_if1_adj_node, tg_if1_adj_if,
             tg_if2_adj_node, tg_if2_adj_if, osi_layer, tg_if1_dst_mac=None,
@@ -369,7 +368,8 @@ class TrafficGenerator(AbstractMeasurer):
                 # Configure TRex.
                 ports = ''
                 for port in tg_node[u"interfaces"].values():
-                    ports += f" {port.get(u'pci_address')}"
+                    if u'Mellanox' not in port.get(u'model'):
+                        ports += f" {port.get(u'pci_address')}"
 
                 cmd = f"sh -c \"cd {Constants.TREX_INSTALL_DIR}/scripts/ && " \
                     f"./dpdk_nic_bind.py -u {ports} || true\""
@@ -615,7 +615,7 @@ class TrafficGenerator(AbstractMeasurer):
         if subtype == NodeSubTypeTG.TREX:
             if u"trex-astf" in self.traffic_profile:
                 self.trex_astf_stop_remote_exec(self._node)
-            elif u"trex-sl" in self.traffic_profile:
+            elif u"trex-stl" in self.traffic_profile:
                 self.trex_stl_stop_remote_exec(self._node)
             else:
                 raise ValueError(u"Unsupported T-Rex traffic profile!")
@@ -892,8 +892,7 @@ class TrafficGenerator(AbstractMeasurer):
                     async_call, latency, warmup_time, traffic_directions,
                     tx_port, rx_port
                 )
-            # TODO: rename all t-rex stateless profiles to use 'trex-stl'
-            elif u"trex-sl" in self.traffic_profile:
+            elif u"trex-stl" in self.traffic_profile:
                 unit_rate_str = str(rate) + u"pps"
                 self.trex_stl_start_remote_exec(
                     duration, unit_rate_str, frame_size, self.traffic_profile,