fix(infra): Final 3na-spr cablingoper-rls2306-230529

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I96a9005b82777589783880f65b249bc0e2eac1bd
(cherry picked from commit bdb7ac490888b14cfc566a3764f195544e6d9352)

1 files changed, 34 insertions, 50 deletions

diff --git a/topologies/available/lf_3na_spr_testbed21.yaml b/topologies/available/lf_3na_spr_testbed21.yaml
index 8e32563d56..d9b4eaaa67 100644
--- a/topologies/available/lf_3na_spr_testbed21.yaml
+++ b/topologies/available/lf_3na_spr_testbed21.yaml
@@ -16,23 +16,7 @@ nodes:
     username: testuser
     password: Csit1234
     interfaces:
-#      port1:
-#        # s53-t21-tg1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
-#        mac_address: "b8:3f:d2:b7:a0:70"
-#        pci_address: "0000:17:00.0"
-#        ip4_address: "172.16.10.1"
-#        driver: mlx5_core
-#        link: link1
-#        model: Mellanox-CX7VEAT
-#      port2:
-#        # s53-t21-tg1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
-#        mac_address: "b8:3f:d2:b7:a0:71"
-#        pci_address: "0000:17:00.1"
-#        ip4_address: "172.16.20.1"
-#        driver: mlx5_core
-#        link: link2
-#        model: Mellanox-CX7VEAT
-      port3:
+      port1:
         # s53-t21-tg1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:e8"
         pci_address: "0000:2a:00.0"
@@ -40,15 +24,15 @@ nodes:
         driver: mlx5_core
         link: link3
         model: Mellanox-CX7VEAT
-#      port4:
+#      port2:
 #        # s53-t21-tg1-c4/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
 #        mac_address: "b8:3f:d2:b7:a0:e9"
 #        pci_address: "0000:2a:00.1"
 #        ip4_address: "172.16.40.1"
 #        driver: mlx5_core
-#        link: link4
+#        link: none
 #        model: Mellanox-CX7VEAT
-      port5:
+      port3:
         # s53-t21-tg1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:58"
         pci_address: "0000:3d:00.0"
@@ -56,7 +40,7 @@ nodes:
         driver: mlx5_core
         link: link5
         model: Mellanox-CX7VEAT
-      port6:
+      port4:
         # s53-t21-tg1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:59"
         pci_address: "0000:3d:00.1"
@@ -64,7 +48,7 @@ nodes:
         driver: mlx5_core
         link: link6
         model: Mellanox-CX7VEAT
-      port7:
+      port5:
         # s53-t21-tg1-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:48"
         pci_address: "0000:ab:00.0"
@@ -72,15 +56,15 @@ nodes:
         driver: mlx5_core
         link: link7
         model: Mellanox-CX7VEAT
-#      port8:
+#      port6:
 #        # s53-t21-tg1-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
 #        mac_address: "b8:3f:d2:b7:a0:49"
 #        pci_address: "0000:ab:00.1"
 #        ip4_address: "172.16.80.1"
 #        driver: mlx5_core
-#        link: link8
+#        link: none
 #        model: Mellanox-CX7VEAT
-      port9:
+      port7:
         # s53-t21-tg1-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:f8"
         pci_address: "0000:bd:00.0"
@@ -88,7 +72,7 @@ nodes:
         driver: mlx5_core
         link: link9
         model: Mellanox-CX7VEAT
-      port10:
+      port8:
         # s53-t21-tg1-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a0:f9"
         pci_address: "0000:bd:00.1"
@@ -106,22 +90,6 @@ nodes:
     uio_driver: vfio-pci
     interfaces:
       port1:
-        # s52-t21-sut1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a0:50"
-        pci_address: "0000:17:00.0"
-        ip4_address: "172.16.10.2"
-        driver: mlx5_core
-        link: link610
-        model: Mellanox-CX7VEAT
-      port2:
-        # s52-t21-sut1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a0:51"
-        pci_address: "0000:17:00.1"
-        ip4_address: "172.16.20.2"
-        driver: mlx5_core
-        link: link37
-        model: Mellanox-CX7VEAT
-      port3:
         # s52-t21-sut1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:08"
         pci_address: "0000:2a:00.0"
@@ -129,7 +97,7 @@ nodes:
         driver: mlx5_core
         link: link3
         model: Mellanox-CX7VEAT
-      port4:
+      port2:
         # s52-t21-sut1-c4/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:09"
         pci_address: "0000:2a:00.1"
@@ -137,7 +105,7 @@ nodes:
         driver: mlx5_core
         link: link59
         model: Mellanox-CX7VEAT
-      port5:
+      port3:
         # s52-t21-sut1-c2/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:88"
         pci_address: "0000:3d:00.0"
@@ -145,7 +113,7 @@ nodes:
         driver: mlx5_core
         link: link5
         model: Mellanox-CX7VEAT
-      port6:
+      port4:
         # s52-t21-sut1-c2/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:89"
         pci_address: "0000:3d:00.1"
@@ -153,6 +121,22 @@ nodes:
         driver: mlx5_core
         link: link6
         model: Mellanox-CX7VEAT
+      port5:
+        # s52-t21-sut1-c10/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:50"
+        pci_address: "0000:17:00.0"
+        ip4_address: "172.16.10.2"
+        driver: mlx5_core
+        link: link610
+        model: Mellanox-CX7VEAT
+      port6:
+        # s52-t21-sut1-c10/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+        mac_address: "b8:3f:d2:b7:a0:51"
+        pci_address: "0000:17:00.1"
+        ip4_address: "172.16.20.2"
+        driver: mlx5_core
+        link: link37
+        model: Mellanox-CX7VEAT
   DUT2:
     type: DUT
     host: "10.30.51.52"
@@ -162,9 +146,9 @@ nodes:
     password: Csit1234
     uio_driver: vfio-pci
     interfaces:
-      port1:
+      port2:
         # s52-t21-sut2-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a0:f0"
+        mac_address: "b8:3f:d2:b7:a1:20"
         pci_address: "0000:ab:00.0"
         ip4_address: "172.16.10.3"
         driver: mlx5_core
@@ -172,7 +156,7 @@ nodes:
         model: Mellanox-CX7VEAT
       port2:
         # s52-t21-sut2-c9/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a0:f1"
+        mac_address: "b8:3f:d2:b7:a1:21"
         pci_address: "0000:ab:00.1"
         ip4_address: "172.16.20.3"
         driver: mlx5_core
@@ -180,7 +164,7 @@ nodes:
         model: Mellanox-CX7VEAT
       port3:
         # s52-t21-sut2-c7/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a1:20"
+        mac_address: "b8:3f:d2:b7:a0:f0"
         pci_address: "0000:bd:00.0"
         ip4_address: "172.16.30.3"
         driver: mlx5_core
@@ -188,7 +172,7 @@ nodes:
         model: Mellanox-CX7VEAT
       port4:
         # s52-t21-sut2-c7/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
-        mac_address: "b8:3f:d2:b7:a1:21"
+        mac_address: "b8:3f:d2:b7:a0:f1"
         pci_address: "0000:bd:00.1"
         ip4_address: "172.16.40.3"
         driver: mlx5_core