feat(infra): 2n-icx -> Noble

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: I87777a164806ca1c56554829a5bd58d6d8c9ccb2

4 files changed, 26 insertions, 26 deletions

diff --git a/topologies/available/lf_2n_icx_testbed212.yaml b/topologies/available/lf_2n_icx_testbed212.yaml
index 5ea3d46772..d91451e94e 100644
--- a/topologies/available/lf_2n_icx_testbed212.yaml
+++ b/topologies/available/lf_2n_icx_testbed212.yaml
@@ -12,12 +12,12 @@ nodes:
     subtype: TREX
     host: "10.30.51.82"
     arch: x86_64
-    port: 22
+    port: 6001
     username: testuser
     password: Csit1234
     interfaces:
       port1:
-        # s72-t212-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
+        # s82-t212-tg1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
         mac_address: "b4:96:91:b2:a0:40"
         pci_address: "0000:17:00.0"
         ip4_address: "172.16.10.2"
@@ -25,7 +25,7 @@ nodes:
         link: link1
         model: Intel-E810CQ
       port2:
-        # s72-t212-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE.
+        # s82-t212-tg1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE.
         mac_address: "b4:96:91:b2:a0:41"
         pci_address: "0000:17:00.1"
         ip4_address: "172.16.20.2"
@@ -33,7 +33,7 @@ nodes:
         link: link2
         model: Intel-E810CQ
       port3:
-        # s72-t212-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE.
+        # s82-t212-tg1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE.
         mac_address: "b4:96:91:a5:78:b4"
         pci_address: "0000:31:00.0"
         ip4_address: "172.16.30.2"
@@ -41,7 +41,7 @@ nodes:
         link: link3
         model: Intel-E810XXV
       port4:
-        # s72-t212-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE.
+        # s82-t212-tg1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE.
         mac_address: "b4:96:91:a5:78:b5"
         pci_address: "0000:31:00.1"
         ip4_address: "172.16.40.2"
@@ -49,7 +49,7 @@ nodes:
         link: link4
         model: Intel-E810XXV
       port5:
-        # s72-t212-tg1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE.
+        # s82-t212-tg1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE.
         mac_address: "b4:96:91:a5:78:b6"
         pci_address: "0000:31:00.2"
         ip4_address: "172.16.50.2"
@@ -57,7 +57,7 @@ nodes:
         link: link5
         model: Intel-E810XXV
       port6:
-        # s72-t212-tg1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE.
+        # s82-t212-tg1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE.
         mac_address: "b4:96:91:a5:78:b7"
         pci_address: "0000:31:00.3"
         ip4_address: "172.16.60.2"
@@ -65,7 +65,7 @@ nodes:
         link: link6
         model: Intel-E810XXV
       port7:
-        # s72-t212-tg1-c2/p1 - 25GE port1 Intel NIC xxv710 4p25GE.
+        # s82-t212-tg1-c2/p1 - 25GE port1 Intel NIC xxv710 4p25GE.
         mac_address: "40:a6:b7:4c:34:48"
         pci_address: "0000:4b:00.0"
         ip4_address: "172.16.70.2"
@@ -73,7 +73,7 @@ nodes:
         link: link7
         model: Intel-XXV710
       port8:
-        # s72-t212-tg1-c2/p2 - 25GE port2 Intel NIC xxv710 4p25GE.
+        # s82-t212-tg1-c2/p2 - 25GE port2 Intel NIC xxv710 4p25GE.
         mac_address: "40:a6:b7:4c:34:49"
         pci_address: "0000:4b:00.1"
         ip4_address: "172.16.80.2"
@@ -81,7 +81,7 @@ nodes:
         link: link8
         model: Intel-XXV710
       port9:
-        # s72-t212-tg1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+        # s82-t212-tg1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:18"
         pci_address: "0000:b1:00.0"
         ip4_address: "172.16.90.2"
@@ -89,7 +89,7 @@ nodes:
         link: link10
         model: Mellanox-CX7VEAT
       port10:
-        # s72-t212-tg1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+        # s82-t212-tg1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:19"
         pci_address: "0000:b1:00.1"
         ip4_address: "172.16.100.2"
@@ -97,7 +97,7 @@ nodes:
         link: link9
         model: Mellanox-CX7VEAT
       port11:
-        # s72-t212-tg1-c6/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
+        # s82-t212-tg1-c6/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
         mac_address: "b4:96:91:b2:a7:00"
         pci_address: "0000:ca:00.0"
         ip4_address: "172.16.110.2"
@@ -105,7 +105,7 @@ nodes:
         link: link11
         model: Intel-E810CQ
       port12:
-        # s72-t212-tg1-c6/p2 - 100GE port2 Intel E810-CQDA2 2p100GE.
+        # s82-t212-tg1-c6/p2 - 100GE port2 Intel E810-CQDA2 2p100GE.
         mac_address: "b4:96:91:b2:a7:01"
         pci_address: "0000:ca:00.1"
         ip4_address: "172.16.120.2"
@@ -122,7 +122,7 @@ nodes:
     uio_driver: vfio-pci
     interfaces:
       port1:
-        # s71-t212-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
+        # s81-t212-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
         mac_address: "b4:96:91:b2:a8:48"
         pci_address: "0000:17:00.0"
         ip4_address: "172.16.10.1"
@@ -130,7 +130,7 @@ nodes:
         link: link1
         model: Intel-E810CQ
       port2:
-        # s71-t212-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE.
+        # s81-t212-sut1-c9/p2 - 100GE port2 Intel E810-CQDA2 2p100GE.
         mac_address: "b4:96:91:b2:a8:49"
         pci_address: "0000:17:00.1"
         ip4_address: "172.16.20.1"
@@ -138,7 +138,7 @@ nodes:
         link: link2
         model: Intel-E810CQ
       port3:
-        # s71-t212-sut1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE.
+        # s81-t212-sut1-c4/p1 - 25GE port1 Intel E810-XXVDA4 4p25GE.
         mac_address: "b4:96:91:a5:79:4c"
         pci_address: "0000:31:00.0"
         ip4_address: "172.16.30.1"
@@ -146,7 +146,7 @@ nodes:
         link: link3
         model: Intel-E810XXV
       port4:
-        # s71-t212-sut1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE.
+        # s81-t212-sut1-c4/p2 - 25GE port2 Intel E810-XXVDA4 4p25GE.
         mac_address: "b4:96:91:a5:79:4d"
         pci_address: "0000:31:00.1"
         ip4_address: "172.16.40.1"
@@ -154,7 +154,7 @@ nodes:
         link: link4
         model: Intel-E810XXV
       port5:
-        # s71-t212-sut1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE.
+        # s81-t212-sut1-c4/p3 - 25GE port3 Intel E810-XXVDA4 4p25GE.
         mac_address: "b4:96:91:a5:79:4e"
         pci_address: "0000:31:00.2"
         ip4_address: "172.16.50.1"
@@ -162,7 +162,7 @@ nodes:
         link: link5
         model: Intel-E810XXV
       port6:
-        # s71-t212-sut1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE.
+        # s81-t212-sut1-c4/p4 - 25GE port4 Intel E810-XXVDA4 4p25GE.
         mac_address: "b4:96:91:a5:79:4f"
         pci_address: "0000:31:00.3"
         ip4_address: "172.16.60.1"
@@ -170,7 +170,7 @@ nodes:
         link: link6
         model: Intel-E810XXV
       port7:
-        # s71-t212-sut1-c2/p1 - 25GE port1 Intel NIC xxv710 2p25GE.
+        # s81-t212-sut1-c2/p1 - 25GE port1 Intel NIC xxv710 2p25GE.
         mac_address: "40:a6:b7:4c:34:2c"
         pci_address: "0000:4b:00.0"
         ip4_address: "172.16.70.1"
@@ -178,7 +178,7 @@ nodes:
         link: link7
         model: Intel-XXV710
       port8:
-        # s71-t212-sut1-c2/p2 - 25GE port2 Intel NIC xxv710 2p25GE.
+        # s81-t212-sut1-c2/p2 - 25GE port2 Intel NIC xxv710 2p25GE.
         mac_address: "40:a6:b7:4c:34:2d"
         pci_address: "0000:4b:00.1"
         ip4_address: "172.16.80.1"
@@ -186,7 +186,7 @@ nodes:
         link: link8
         model: Intel-XXV710
       port9:
-        # s71-t212-sut1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
+        # s81-t212-sut1-c8/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:80"
         pci_address: "0000:b1:00.0"
         ip4_address: "172.16.90.1"
@@ -194,7 +194,7 @@ nodes:
         link: link9
         model: Mellanox-CX7VEAT
       port10:
-        # s71-t212-sut1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
+        # s81-t212-sut1-c8/p2 - 200GE port2 Mellanox ConnectX7-2p200GE.
         mac_address: "b8:3f:d2:b7:a1:81"
         pci_address: "0000:b1:00.1"
         ip4_address: "172.16.100.1"
diff --git a/topologies/available/lf_2n_icx_testbed213.yaml b/topologies/available/lf_2n_icx_testbed213.yaml
index 2f7536ce76..e5f090b6cf 100644
--- a/topologies/available/lf_2n_icx_testbed213.yaml
+++ b/topologies/available/lf_2n_icx_testbed213.yaml
@@ -12,7 +12,7 @@ nodes:
     subtype: TREX
     host: "10.30.51.84"
     arch: x86_64
-    port: 22
+    port: 6001
     username: testuser
     password: Csit1234
     interfaces:
diff --git a/topologies/available/lf_2n_icx_testbed214.yaml b/topologies/available/lf_2n_icx_testbed214.yaml
index 03bb8c22e1..8f987af691 100644
--- a/topologies/available/lf_2n_icx_testbed214.yaml
+++ b/topologies/available/lf_2n_icx_testbed214.yaml
@@ -12,7 +12,7 @@ nodes:
     subtype: TREX
     host: "10.30.51.86"
     arch: x86_64
-    port: 22
+    port: 6001
     username: testuser
     password: Csit1234
     interfaces:
diff --git a/topologies/disabled/lf_3n_oct_testbed215.yaml b/topologies/disabled/lf_3n_oct_testbed215.yaml
index 6b0b0dee0c..f1996cb34d 100644
--- a/topologies/disabled/lf_3n_oct_testbed215.yaml
+++ b/topologies/disabled/lf_3n_oct_testbed215.yaml
@@ -12,7 +12,7 @@ nodes:
     subtype: TREX
     host: "10.30.51.88"
     arch: x86_64
-    port: 22
+    port: 6001
     username: testuser
     password: Csit1234
     interfaces: