X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FDPDK%2FL3fwdTest.py;h=178c747da558fa2e41e6846a4bbcbbba31acb665;hb=9c926fdd75cc1d65faa1ee50ce9133e754fdd498;hp=2ceeab2a51fca65acf906ddab7b96636900e685c;hpb=1cd46e5b0125f405af0aa6c9aa715f543428f1d7;p=csit.git

diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py
index 2ceeab2a51..178c747da5 100644
--- a/resources/libraries/python/DPDK/L3fwdTest.py
+++ b/resources/libraries/python/DPDK/L3fwdTest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2023 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -55,12 +55,12 @@ class L3fwdTest:
         """
         cpu_count_int = dp_count_int = int(phy_cores)
         dp_cores = cpu_count_int+1
-        for node in nodes:
-            if u"DUT" in node:
-                compute_resource_info = CpuUtils.get_affinity_vswitch(
-                    nodes, node, phy_cores, rx_queues=rx_queues,
-                    rxd=rxd, txd=txd
-                )
+        tg_flip = topology_info[f"tg_if1_pci"] > topology_info[f"tg_if2_pci"]
+        compute_resource_info = CpuUtils.get_affinity_vswitch(
+            nodes, phy_cores, rx_queues=rx_queues, rxd=rxd, txd=txd
+        )
+        for node_name, node in nodes.items():
+            if node["type"] == NodeType.DUT:
                 if dp_count_int > 1:
                     BuiltIn().set_tags('MTHREAD')
                 else:
@@ -69,14 +69,14 @@ class L3fwdTest:
                     f"{dp_count_int}T{cpu_count_int}C"
                 )
 
-                cpu_dp = compute_resource_info[u"cpu_dp"]
-                rxq_count_int = compute_resource_info[u"rxq_count_int"]
-                if1 = topology_info[f"{node}_pf1"][0]
-                if2 = topology_info[f"{node}_pf2"][0]
+                cpu_dp = compute_resource_info[f"{node_name}_cpu_dp"]
+                rxq_count_int = compute_resource_info["rxq_count_int"]
+                if1 = topology_info[f"{node_name}_pf1"][0]
+                if2 = topology_info[f"{node_name}_pf2"][0]
                 L3fwdTest.start_l3fwd(
-                    nodes, nodes[node], if1=if1, if2=if2, lcores_list=cpu_dp,
+                    nodes, node, if1=if1, if2=if2, lcores_list=cpu_dp,
                     nb_cores=dp_count_int, queue_nums=rxq_count_int,
-                    jumbo_frames=jumbo_frames
+                    jumbo_frames=jumbo_frames, tg_flip=tg_flip
                 )
         for node in nodes:
             if u"DUT" in node:
@@ -88,7 +88,8 @@ class L3fwdTest:
                         L3fwdTest.start_l3fwd(
                             nodes, nodes[node], if1=if1, if2=if2,
                             lcores_list=cpu_dp, nb_cores=dp_count_int,
-                            queue_nums=rxq_count_int, jumbo_frames=jumbo_frames
+                            queue_nums=rxq_count_int, jumbo_frames=jumbo_frames,
+                            tg_flip=tg_flip
                         )
                 else:
                     message = f"Failed to start l3fwd at node {node}"
@@ -97,10 +98,14 @@ class L3fwdTest:
     @staticmethod
     def start_l3fwd(
             nodes, node, if1, if2, lcores_list, nb_cores, queue_nums,
-            jumbo_frames):
+            jumbo_frames, tg_flip):
         """
         Execute the l3fwd on the dut_node.
 
+        L3fwd uses default IP forwarding table, but sorts ports by API address.
+        When that does not match the traffic profile (depends on topology),
+        the only way to fix is is to latch and recompile l3fwd app.
+
         :param nodes: All the nodes info in the topology file.
         :param node: DUT node.
         :param if1: The test link interface 1.
@@ -110,6 +115,7 @@ class L3fwdTest:
         :param queue_nums: The queues number for the NIC
         :param jumbo_frames: Indication if the jumbo frames are used (True) or
                              not (False).
+        :param tg_flip: Whether TG ports are reordered.
         :type nodes: dict
         :type node: dict
         :type if1: str
@@ -118,10 +124,11 @@ class L3fwdTest:
         :type nb_cores: str
         :type queue_nums: str
         :type jumbo_frames: bool
+        :type tg_flip: bool
         """
         if node[u"type"] == NodeType.DUT:
             adj_mac0, adj_mac1, if_pci0, if_pci1 = L3fwdTest.get_adj_mac(
-                nodes, node, if1, if2
+                nodes, node, if1, if2, tg_flip
             )
 
             lcores = [int(item) for item in lcores_list.split(u",")]
@@ -184,18 +191,24 @@ class L3fwdTest:
             exec_cmd_no_error(node, command, timeout=1800, message=message)
 
     @staticmethod
-    def get_adj_mac(nodes, node, if1, if2):
+    def get_adj_mac(nodes, node, if1, if2, tg_flip):
         """
         Get adjacency MAC addresses of the DUT node.
 
+        Interfaces are re-ordered according to PCI address,
+        but the need to patch and recompile also depends on TG port order.
+        "tg_flip" signals whether TG ports are reordered.
+
         :param nodes: All the nodes info in the topology file.
         :param node: DUT node.
         :param if1: The test link interface 1.
         :param if2: The test link interface 2.
+        :param tg_flip: Whether tg ports are reordered.
         :type nodes: dict
         :type node: dict
         :type if1: str
         :type if2: str
+        :type tg_flip: bool
         :returns: Returns MAC addresses of adjacency DUT nodes and PCI
             addresses.
         :rtype: str
@@ -205,9 +218,19 @@ class L3fwdTest:
         if_pci0 = Topology.get_interface_pci_addr(node, if_key0)
         if_pci1 = Topology.get_interface_pci_addr(node, if_key1)
 
+        # Flipping routes logic:
+        # If TG and DUT ports are reordered -> flip
+        # If TG reordered and DUT not reordered -> don't flip
+        # If DUT reordered and TG not reordered -> don't flip
+        # If DUT and TG not reordered -> flip
+
         # Detect which is the port 0.
-        if min(if_pci0, if_pci1) != if_pci0:
+        dut_flip = if_pci0 > if_pci1
+        if dut_flip:
             if_key0, if_key1 = if_key1, if_key0
+            if tg_flip:
+                L3fwdTest.patch_l3fwd(node, u"patch_l3fwd_flip_routes")
+        elif not tg_flip:
             L3fwdTest.patch_l3fwd(node, u"patch_l3fwd_flip_routes")
 
         adj_node0, adj_if_key0 = Topology.get_adjacent_node_and_interface(