docs(infra): 1n-alt

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

diff --git a/docs/content/infrastructure/fdio_dc_testbed_specifications.md b/docs/content/infrastructure/fdio_dc_testbed_specifications.md
index 2ef663c..d157d29 100644 (file)
--- a/docs/content/infrastructure/fdio_dc_testbed_specifications.md
+++ b/docs/content/infrastructure/fdio_dc_testbed_specifications.md
@@ -434,15 +434,16 @@ FD.io CSIT lab contains following server types:
         - Motherboard: MP32-AR1-00
         - Processors: 1* Ampere(R) Altra(R) Q80-30 Processor (Neoverse N1)
         - Processor Signature: Implementor 0x0a, Variant 0x1, Architecture 6, Part 0x000, Revision 1
-        - RAM Memory: 32* 16GB DDR4-3200MT/s
-        - Disks: 1* 960GB SSD Samsung M.2 NVMe PM9A3
+        - RAM Memory: 16* 32GB DDR4-3200MT/s
+        - Disks: 2* 960GB SSD Samsung U.2 NVMe PM9A3
     - NICs configuration:
         - Numa0:
-            - PCIe Slot4 05:00.xx: XL710-QDA2-2p40GE Intel.
-            - PCIe Slot8 0b:00.xx: ConnectX5-2p10/25GE Mellanox.
+            - PCIe Slot0 0000:01:00.xx: XL710-QDA2-2p40GE Intel.
+            - PCIe Slot1 0001:01:00.xx: ConnectX6-2p100GE Mellanox.
+            - PCIe Slot2 0002:03:00.xx: ConnectX5-2p10/25GE Mellanox.
         - Numa1:
-            - PCIe Slot14 91:00.xx: XL710-QDA2-2p40GE Intel.
-            - PCIe Slot26 9a:00.xx: ConnectX5-2p10/25GE Mellanox.
+            - PCIe Slot3 0003:02:00.xx: XL710-QDA2-2p40GE Intel.
+            - PCIe Slot5 0005:02:00.xx: ConnectX5-2p10/25GE Mellanox.
 
 15. **Server-Type-E31**: Purpose - Skylake Xeon Shared TG for FD.io performance testing.
     - Quantity: 1.
@@ -820,28 +821,32 @@ FD.io CSIT lab contains following server types:
     - IPMI IP: 10.30.50.70
     - Host IP: 10.30.51.70
     - portnames:
-        - s70-t13-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s70-t13-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s70-t13-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
-        - s70-t13-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
-        - s70-t13-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s70-t13-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s70-t13-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
-        - s70-t13-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s70-t13-sut1-c1/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s70-t13-sut1-c1/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s70-t13-sut1-c2/p1 - 25GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s70-t13-sut1-c2/p2 - 25GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s70-t13-sut1-c3/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s70-t13-sut1-c3/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s70-t13-sut1-c4/p1 - 25GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s70-t13-sut1-c4/p2 - 25GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s70-t13-sut1-c5/p1 - 100GE-port1 ConnectX6-2p100GE Mellanox.
+        - s70-t13-sut1-c5/p2 - 100GE-port2 ConnectX6-2p100GE Mellanox.
 - SUT [Server-Type-E25]:
     - testbedname: testbed14
     - hostname: s71-t14-sut1
     - IPMI IP: 10.30.50.71
     - Host IP: 10.30.51.71
     - portnames:
-        - s71-t14-sut1-c4/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s71-t14-sut1-c4/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s71-t14-sut1-c8/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
-        - s71-t14-sut1-c8/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
-        - s71-t14-sut1-c14/p1 - 40GE-port1 XL710-QDA2-2p40GE.
-        - s71-t14-sut1-c14/p2 - 40GE-port2 XL710-QDA2-2p40GE.
-        - s71-t14-sut1-c26/p1 - 40GE-port1 ConnectX5-2p10/25GE Mellanox.
-        - s71-t14-sut1-c26/p2 - 40GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c1/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s71-t14-sut1-c1/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s71-t14-sut1-c2/p1 - 25GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c2/p2 - 25GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c3/p1 - 40GE-port1 XL710-QDA2-2p40GE.
+        - s71-t14-sut1-c3/p2 - 40GE-port2 XL710-QDA2-2p40GE.
+        - s71-t14-sut1-c4/p1 - 25GE-port1 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c4/p2 - 25GE-port2 ConnectX5-2p10/25GE Mellanox.
+        - s71-t14-sut1-c5/p1 - 100GE-port1 ConnectX6-2p100GE Mellanox.
+        - s71-t14-sut1-c5/p2 - 100GE-port2 ConnectX6-2p100GE Mellanox.
 ```
 
 ### 1-Node-SapphireRapids (1n-spr)

diff --git a/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md b/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md
index 3626446..b4741cf 100644 (file)
--- a/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md
+++ b/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md
@@ -97,8 +97,8 @@ Captured inventory data:
  s80-t38-tg1           | 3n-icx       | SYS-740GP-TNRT | C7470KL03P50454 | 10.30.51.80  | 10.30.50.80  | 3016.11    | u23-u26
  s30-t15-sut1          | nomad-client | SYS-741GE-TNRT | C7490FL47A50154 | 10.30.51.30  | 10.30.50.30  | 3016.11    | u19-u22
  s31-t16-sut1          | nomad-client | SYS-741GE-TNRT | C7490FL47A50149 | 10.30.51.31  | 10.30.50.31  | 3016.11    | u15-u18
- s70-t13-sut1          | 1n-alt       | WIWYNN         | N/A             | 10.30.51.70  | 10.30.50.70  | 3016.11    | u13-u14
- s71-t14-sut1          | 1n-alt       | WIWYNN         | N/A             | 10.30.51.71  | 10.30.50.71  | 3016.11    | u11-u12
+ s70-t13-sut1          | 1n-alt       | E252-P30-00    | GMG252012A0098  | 10.30.51.70  | 10.30.50.70  | 3016.11    | u13-u14
+ s71-t14-sut1          | 1n-alt       | E252-P30-00    | GMG252012A0089  | 10.30.51.71  | 10.30.50.71  | 3016.11    | u11-u12
  s62-t34-sut1          | 3n-alt       | WIWYNN         | 04000059N0SC    | 10.30.51.72  | 10.30.50.72  | 3016.11    | u9-u10
  s63-t34-sut2          | 3n-alt       | WIWYNN         | 0390003EN0SC    | 10.30.51.73  | 10.30.50.73  | 3016.11    | u7-u8
  s64-t34-tg1           | 3n-alt       | SYS-740GP-TNRT | C7470KK40P50249 | 10.30.51.74  | 10.30.50.74  | 3016.11    | u3-u6

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index c2b169f..0190d6b 100644 (file)
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -1,5 +1,5 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
-# Copyright (c) 2023 PANTHEON.tech and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
+# Copyright (c) 2024 PANTHEON.tech 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:
@@ -45,7 +45,7 @@ function activate_docker_topology () {
     device_image="$(< ${CSIT_DIR}/${IMAGE_VER_FILE})"
     case_text="${NODENESS}_${FLAVOR}"
     case "${case_text}" in
-        "1n_skx" | "1n_tx2" | "1n_spr")
+        "1n_skx" | "1n_alt" | "1n_spr")
             # We execute reservation over csit-shim-dcr (ssh) which runs sourced
             # script's functions. Env variables are read from ssh output
             # back to localhost for further processing.
@@ -328,7 +328,7 @@ function deactivate_docker_topology () {
 
     case_text="${NODENESS}_${FLAVOR}"
     case "${case_text}" in
-        "1n_skx" | "1n_tx2" | "1n_spr")
+        "1n_skx" | "1n_alt" | "1n_spr")
             ssh="ssh root@172.17.0.1 -p 6022"
             env_vars=$(env | grep CSIT_ | tr '\n' ' ' ) || die
             # The "declare -f" output is long and boring.
@@ -452,9 +452,9 @@ function get_test_code () {
             NODENESS="1n"
             FLAVOR="spr"
             ;;
-        *"1n-tx2")
+        *"1n-alt")
             NODENESS="1n"
-            FLAVOR="tx2"
+            FLAVOR="alt"
             ;;
         *"1n-aws")
             NODENESS="1n"
@@ -1106,7 +1106,7 @@ function select_tags () {
             test_tag_array+=("!vhost")
             test_tag_array+=("!flow")
             ;;
-        *"1n-tx2")
+        *"1n-alt")
             test_tag_array+=("!flow")
             ;;
         *"2n-clx")
@@ -1222,7 +1222,7 @@ function select_topology () {
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-c6in*.yaml )
             TOPOLOGIES_TAGS="1_node_single_link_topo"
             ;;
-        "1n_tx2" | "1n_spr")
+        "1n_alt" | "1n_spr")
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*vpp_device*.template )
             TOPOLOGIES_TAGS="2_node_single_link_topo"
             ;;

diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh
index 9bf4a85..ee0ebdf 100644 (file)
--- a/resources/libraries/bash/function/device.sh
+++ b/resources/libraries/bash/function/device.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 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:
@@ -312,12 +312,12 @@ function get_available_interfaces () {
             dut1_netdev=(ens5 enp175)
             ports_per_nic=2
             ;;
-       "1n_tx2")
+       "1n_alt")
             # Add Intel Corporation XL710/X710 Virtual Function to the
             # whitelist.
             pci_id="0x154c"
-            tg_netdev=(enp5)
-            dut1_netdev=(enp145)
+            tg_netdev=(enp1s0f0 enp1s0f1)
+            dut1_netdev=(enP3p2s0f0 enP3p2s0f1)
             ports_per_nic=2
             ;;
         "1n_spr")