fix(infra): Octeon bits

Signed-off-by: Peter Mikus <[email protected]>
Change-Id: Ie2b3b854963199129de257fbc86776e65f04bb3e

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.95.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.95.yaml
index 5d95ddb..b0ce5be 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.95.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.95.yaml
@@ -9,4 +9,12 @@ grub:
   maxcpus: "24"
 
 inventory_ipmi_hostname: "10.30.50.95"
-cpu_microarchitecture: "octeon"
\ No newline at end of file
+cpu_microarchitecture: "octeon"
+
+static_interfaces:
+  - name: "enP2p2s0"
+    pci_address: "0002:02:00.0"
+    mac_address: "1a:cc:6a:50:05:2a"
+  - name: "enP2p3s0"
+    pci_address: "0002:03:00.0"
+    mac_address: "1a:cc:6a:50:05:2b"
\ No newline at end of file

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.96.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.96.yaml
index 029a482..08fd230 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.96.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.96.yaml
@@ -9,4 +9,12 @@ grub:
   maxcpus: "24"
 
 inventory_ipmi_hostname: "10.30.50.96"
-cpu_microarchitecture: "octeon"
\ No newline at end of file
+cpu_microarchitecture: "octeon"
+
+static_interfaces:
+  - name: "enP2p2s0"
+    pci_address: "0002:02:00.0"
+    mac_address: "40:60:5a:02:e1:60"
+  - name: "enP2p3s0"
+    pci_address: "0002:03:00.0"
+    mac_address: "40:a6:b7:67:2b:ec"
\ No newline at end of file

diff --git a/fdio.infra.ansible/roles/cleanup/tasks/reset_network_interfaces.yaml b/fdio.infra.ansible/roles/cleanup/tasks/reset_network_interfaces.yaml
new file mode 100644 (file)
index 0000000..5dfbb18
--- /dev/null
+++ b/fdio.infra.ansible/roles/cleanup/tasks/reset_network_interfaces.yaml
@@ -0,0 +1,19 @@
+---
+# file: tasks/reset_network_interfaces.yaml
+
+- name: Reset Network Interfaces
+  block:
+  - name: Bind Network Interfaces
+    ansible.builtin.shell: "dpdk-devbind.py -b rvu_nicpf {{ item.pci_address }}"
+    loop:
+      "{{ static_interfaces }}"
+    tags:
+      - bind-network-interfaces
+
+  - name: Set MAC Address
+    ansible.builtin.shell: "macchanger -m {{ item.mac_address }} {{ item.name }}"
+    loop:
+      "{{ static_interfaces }}"
+    failed_when: false
+    tags:
+      - set-mac-address
\ No newline at end of file

diff --git a/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml b/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml
index fa0d898..2d4ff50 100644 (file)
--- a/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml
+++ b/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml
@@ -89,7 +89,7 @@
       tags:
         - kill-containers
 
-    - name: "Set SSH port to 6001 if docker_sut"
+    - name: Set SSH port to 6001 if docker_sut
       set_fact:
         ansible_port: 6001
       when: docker_sut is defined
@@ -104,7 +104,7 @@
       tags:
         - remove-package
 
-    - name: "Set SSH port to 6002 if docker_sut"
+    - name: Set SSH port to 6002 if docker_sut
       set_fact:
         ansible_port: 6002
       when: docker_sut is defined
@@ -119,7 +119,7 @@
       tags:
         - remove-package
 
-    - name: "Set SSH port to 22 if docker_sut"
+    - name: Set SSH port to 22 if docker_sut
       set_fact:
         ansible_port: 22
       when: docker_sut is defined
@@ -132,4 +132,10 @@
       vars:
         package: "*vpp*"
       tags:
-        - remove-package
\ No newline at end of file
+        - remove-package
+
+    - name: Reset Network Interfaces
+      import_tasks: reset_network_interfaces.yaml
+      when: cpu_microarchitecture == "octeon"
+      tags:
+        - reset-network-interfaces
\ No newline at end of file

diff --git a/resources/job_specs/report_coverage/3n-oct/ip4-00.md b/resources/job_specs/report_coverage/3n-oct/ip4-00.md
new file mode 100644 (file)
index 0000000..911af72
--- /dev/null
+++ b/resources/job_specs/report_coverage/3n-oct/ip4-00.md
@@ -0,0 +1,8 @@
+# 3n-oct
+## ./ip4
+### Cavium-100G
+#### dpdk-vfio-pci
+##### ethip4-ip4base
+1c AND 64b AND ndrpdr AND cavium-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 64b AND ndrpdr AND cavium-100g AND drv_vfio_pci AND ethip4-ip4base
+4c AND 64b AND ndrpdr AND cavium-100g AND drv_vfio_pci AND ethip4-ip4base
\ No newline at end of file

diff --git a/resources/job_specs/report_iterative/3n-oct/vpp-mrr-00.md b/resources/job_specs/report_iterative/3n-oct/vpp-mrr-00.md
new file mode 100644 (file)
index 0000000..efcd313
--- /dev/null
+++ b/resources/job_specs/report_iterative/3n-oct/vpp-mrr-00.md
@@ -0,0 +1,8 @@
+# 3n-oct
+## ./ip4
+### Cavium-100G
+#### dpdk-vfio-pci
+##### ethip4-ip4base
+1c AND 64b AND mrr AND cavium-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 64b AND mrr AND cavium-100g AND drv_vfio_pci AND ethip4-ip4base
+4c AND 64b AND mrr AND cavium-100g AND drv_vfio_pci AND ethip4-ip4base
\ No newline at end of file

diff --git a/resources/job_specs/report_iterative/3n-oct/vpp-ndrpdr-00.md b/resources/job_specs/report_iterative/3n-oct/vpp-ndrpdr-00.md
new file mode 100644 (file)
index 0000000..911af72
--- /dev/null
+++ b/resources/job_specs/report_iterative/3n-oct/vpp-ndrpdr-00.md
@@ -0,0 +1,8 @@
+# 3n-oct
+## ./ip4
+### Cavium-100G
+#### dpdk-vfio-pci
+##### ethip4-ip4base
+1c AND 64b AND ndrpdr AND cavium-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 64b AND ndrpdr AND cavium-100g AND drv_vfio_pci AND ethip4-ip4base
+4c AND 64b AND ndrpdr AND cavium-100g AND drv_vfio_pci AND ethip4-ip4base
\ No newline at end of file

diff --git a/topologies/available/lf_3n_oct_testbed215.yaml b/topologies/available/lf_3n_oct_testbed215.yaml
index 6c47914..f919978 100644 (file)
--- a/topologies/available/lf_3n_oct_testbed215.yaml
+++ b/topologies/available/lf_3n_oct_testbed215.yaml
@@ -90,7 +90,7 @@ nodes:
         pci_address: "0002:03:00.0"
         ip4_address: 172.16.20.2
         driver: rvu_nicpf
-        link: link2
+        link: link3
         model: Cavium-A063-100G
       port2:
         # s87-t215-sut1-c6/p1 - 100GE port2 Cavium A063 2p100GE.
@@ -98,5 +98,5 @@ nodes:
         pci_address: "0002:02:00.0"
         ip4_address: 172.16.30.2
         driver: rvu_nicpf
-        link: link3
+        link: link2
         model: Cavium-A063-100G
\ No newline at end of file