fix(infra): 2n-clx links and docs

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Iac1743da3eb51c69c67e8496ad4145dcc616341c

diff --git a/docs/lab/testbeds_sm_icx_hw_bios_cfg.md b/docs/lab/testbeds_sm_icx_hw_bios_cfg.md
index bf433b4..d242f8d 100644 (file)
--- a/docs/lab/testbeds_sm_icx_hw_bios_cfg.md
+++ b/docs/lab/testbeds_sm_icx_hw_bios_cfg.md
@@ -1239,9 +1239,9 @@ Memory Device
 
 ```
 Host.           IPMI IP.      BMC.      BIOS. CPLD.     CPU Microcode.  PCI Bus.   X710 Firmware.            i40e.    E810 Firmware.            ice.
 
 ```
 Host.           IPMI IP.      BMC.      BIOS. CPLD.     CPU Microcode.  PCI Bus.   X710 Firmware.            i40e.    E810 Firmware.            ice.

-s65-t37-sut1.   10.30.50.75.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.17.15. 3.10 0x8000ad67 1.3106.0. 1.8.3.
-s66-t37-sut2.   10.30.50.76.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.14.15. 3.10 0x8000ad67 1.3106.0. 1.8.3.
+s65-t37-sut1.   10.30.50.75.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.17.15. 3.20 0x8000d83e 1.3146.0. 1.8.3.
+s66-t37-sut2.   10.30.50.76.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.14.15. 3.20 0x8000d83e 1.3146.0. 1.8.3.

 s67-t37-tg1.    10.30.50.77.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.14.13. N/A.                      N/A.
 s67-t37-tg1.    10.30.50.77.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.14.13. N/A.                      N/A.

-s71-t212-sut1.  10.30.50.81.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.17.15. 3.10 0x8000ad67 1.3106.0. 1.8.3.
+s71-t212-sut1.  10.30.50.81.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.17.15. 3.20 0x8000d83e 1.3146.0. 1.8.3.

 s72-t212-tg1.   10.30.50.82.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.14.13. N/A.                      N/A.
 ```
 s72-t212-tg1.   10.30.50.82.  1.00.21.  1.1.  F1.00.07. 0D000280.       A5.01.24.  8.30 0x8000a49d 1.2926.0. 2.14.13. N/A.                      N/A.
 ```

diff --git a/fdio.infra.ansible/roles/intel/defaults/main.yaml b/fdio.infra.ansible/roles/intel/defaults/main.yaml
index 1d73d87..7f35be3 100644 (file)
--- a/fdio.infra.ansible/roles/intel/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/intel/defaults/main.yaml
@@ -1,5 +1,5 @@
 ---
 ---

-# file: roles/mellanox/defaults/main.yaml
+# file: roles/intel/defaults/main.yaml

 
 packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}"
 
 
 packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}"
 

diff --git a/fdio.infra.ansible/roles/intel/tasks/ice.yaml b/fdio.infra.ansible/roles/intel/tasks/ice.yaml
index 54f68e9..bbd07c6 100644 (file)
--- a/fdio.infra.ansible/roles/intel/tasks/ice.yaml
+++ b/fdio.infra.ansible/roles/intel/tasks/ice.yaml
@@ -54,14 +54,14 @@
   tags:
     - intel-inst
 
   tags:
     - intel-inst
 

-#- name: Inst - Extract Dynamic Device Personalization (DDP) Package
-#  unarchive:
-#    remote_src: true
-#    src: "{{ intel_extract_dir }}/ice_comms-{{ ddp }}.zip"
-#    dest: "{{ intel_extract_dir }}/"
-#  register: intel_driver_extracted
-#  tags:
-#    - intel-inst
+- name: Inst - Extract Dynamic Device Personalization (DDP) Package
+  unarchive:
+    remote_src: true
+    src: "{{ intel_extract_dir }}/ice_comms-{{ ddp }}.zip"
+    dest: "{{ intel_extract_dir }}/"
+  register: intel_driver_extracted
+  tags:
+    - intel-inst

 
 - name: Inst - Copy Dynamic Device Personalization (DDP) Package
   copy:
 
 - name: Inst - Copy Dynamic Device Personalization (DDP) Package
   copy:

diff --git a/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml b/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml
index ed7d483..2ad40b0 100644 (file)
--- a/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml
+++ b/fdio.infra.ansible/roles/mellanox/tasks/ofed.yaml
@@ -1,5 +1,5 @@
 ---
 ---

-# file: roles/intel/tasks/i40e.yaml
+# file: roles/mellanox/tasks/ofed.yaml

 
 - name: Inst - Get OFED
   get_url:
 
 - name: Inst - Get OFED
   get_url:

diff --git a/topologies/available/lf_2n_clx_testbed27.yaml b/topologies/available/lf_2n_clx_testbed27.yaml
index 5567212..2373d98 100644 (file)
--- a/topologies/available/lf_2n_clx_testbed27.yaml
+++ b/topologies/available/lf_2n_clx_testbed27.yaml
@@ -121,22 +121,22 @@ nodes:
     password: Csit1234
     uio_driver: vfio-pci
     interfaces:
     password: Csit1234
     uio_driver: vfio-pci
     interfaces:

-      port1:
-        # s33-t27-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:98"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s33-t27-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e9:99"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
+      #port1:
+      #  # s33-t27-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
+      #  mac_address: "3c:fd:fe:ca:e9:98"
+      #  pci_address: "0000:18:00.0"
+      #  ip4_address: "172.16.10.1"
+      #  driver: i40e
+      #  link: link1
+      #  model: Intel-X710
+      #port2:
+      #  # s33-t27-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
+      #  mac_address: "3c:fd:fe:ca:e9:99"
+      #  pci_address: "0000:18:00.1"
+      #  ip4_address: "172.16.20.1"
+      #  driver: i40e
+      #  link: link2
+      #  model: Intel-X710

       port3:
         # s33-t27-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:ca:e9:9a"
       port3:
         # s33-t27-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:ca:e9:9a"

diff --git a/topologies/available/lf_2n_clx_testbed28.yaml b/topologies/available/lf_2n_clx_testbed28.yaml
index 07a8e11..cbba883 100644 (file)
--- a/topologies/available/lf_2n_clx_testbed28.yaml
+++ b/topologies/available/lf_2n_clx_testbed28.yaml
@@ -121,22 +121,22 @@ nodes:
     password: Csit1234
     uio_driver: vfio-pci
     interfaces:
     password: Csit1234
     uio_driver: vfio-pci
     interfaces:

-      port1:
-        # s35-t28-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e3:b0"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s35-t28-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:e3:b1"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
+      #port1:
+      #  # s35-t28-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
+      #  mac_address: "3c:fd:fe:ca:e3:b0"
+      #  pci_address: "0000:18:00.0"
+      #  ip4_address: "172.16.10.1"
+      #  driver: i40e
+      #  link: link1
+      #  model: Intel-X710
+      #port2:
+      #  # s35-t28-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
+      #  mac_address: "3c:fd:fe:ca:e3:b1"
+      #  pci_address: "0000:18:00.1"
+      #  ip4_address: "172.16.20.1"
+      #  driver: i40e
+      #  link: link2
+      #  model: Intel-X710

       port3:
         # s35-t28-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:ca:e3:b2"
       port3:
         # s35-t28-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:ca:e3:b2"

diff --git a/topologies/available/lf_2n_clx_testbed29.yaml b/topologies/available/lf_2n_clx_testbed29.yaml
index 67bcee8..e21cdef 100644 (file)
--- a/topologies/available/lf_2n_clx_testbed29.yaml
+++ b/topologies/available/lf_2n_clx_testbed29.yaml
@@ -105,22 +105,22 @@ nodes:
     password: Csit1234
     uio_driver: vfio-pci
     interfaces:
     password: Csit1234
     uio_driver: vfio-pci
     interfaces:

-      port1:
-        # s37-t29-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:eb:10"
-        pci_address: "0000:18:00.0"
-        ip4_address: "172.16.10.1"
-        driver: i40e
-        link: link1
-        model: Intel-X710
-      port2:
-        # s37-t29-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
-        mac_address: "3c:fd:fe:ca:eb:11"
-        pci_address: "0000:18:00.1"
-        ip4_address: "172.16.20.1"
-        driver: i40e
-        link: link2
-        model: Intel-X710
+      #port1:
+      #  # s37-t29-sut1-c2/p1 - 10GE port1 on Intel NIC x710 4p10GE.
+      #  mac_address: "3c:fd:fe:ca:eb:10"
+      #  pci_address: "0000:18:00.0"
+      #  ip4_address: "172.16.10.1"
+      #  driver: i40e
+      #  link: link1
+      #  model: Intel-X710
+      #port2:
+      #  # s37-t29-sut1-c2/p2 - 10GE port2 on Intel NIC x710 4p10GE.
+      #  mac_address: "3c:fd:fe:ca:eb:11"
+      #  pci_address: "0000:18:00.1"
+      #  ip4_address: "172.16.20.1"
+      #  driver: i40e
+      #  link: link2
+      #  model: Intel-X710

       port3:
         # s37-t29-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:ca:eb:12"
       port3:
         # s37-t29-sut1-c2/p3 - 10GE port3 on Intel NIC x710 4p10GE.
         mac_address: "3c:fd:fe:ca:eb:12"