From 92ff19c63d31deb2612800828ab09e5749e12476 Mon Sep 17 00:00:00 2001
From: "Michael S. Pedersen" <michaelx.pedersen@intel.com>
Date: Fri, 23 Apr 2021 10:04:20 +0000
Subject: Update BMRA to v21.03

Update Kuberef to use most recent release of BMRA.
Also updates configuration with minor changes and additions.

Signed-off-by: Michael S. Pedersen <michaelx.pedersen@intel.com>
Change-Id: Ifc4ef114564a2085000c23347390089227c0ebd9
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72429
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Reviewed-by: Rihab Banday <rihab.banday@ericsson.com>
---
 hw_config/equinix-metal/idf.yaml | 26 +++++++++++++++++++-------
 hw_config/ericsson-pod1/idf.yaml | 26 +++++++++++++++++++-------
 hw_config/intel/idf.yaml         | 26 +++++++++++++++++++-------
 3 files changed, 57 insertions(+), 21 deletions(-)

(limited to 'hw_config')

diff --git a/hw_config/equinix-metal/idf.yaml b/hw_config/equinix-metal/idf.yaml
index d085c7c..7b6c07e 100644
--- a/hw_config/equinix-metal/idf.yaml
+++ b/hw_config/equinix-metal/idf.yaml
@@ -44,14 +44,21 @@ bmra:
   network_roles:
     sriov:
       - name: eno2
-        bus_info: "19:00.1"
-        device_info: "8086:1572:0200"
-        driver: iavf
+        pci: "19:00.1"
+        pf_driver: i40e
+        vf_driver: iavf
     sriov_dpdk:
       - name: eno4
-        bus_info: "19:00.3"
-        device_info: "8086:1572:0200"
-        driver: vfio-pci
+        pci: "19:00.3"
+        pf_driver: i40e
+        vf_driver: vfio-pci
+  device_roles:
+#    qat:
+#      - name: crypto01
+#        pci: "0000:ab:00.0"
+#        mod_type: qat_c62x
+#        pci_type: c6xx
+#        vfs: 4
   features:
     sriov:
       enable: true
@@ -66,7 +73,8 @@ bmra:
       hugepages_2M: 10240
     isolcpus:
       enable: true
-      cpus: "8-27,36-55"
+      autogenerate: true
+      cpus: "8-27,36-55" # Not used when autogenerate is true
     nfd: true
     cmk:
       enable: true
@@ -78,4 +86,8 @@ bmra:
     tas:
       enable: true
       demo_policy: false
+    bond_cni: true
     psp: true
+    qat:
+      enable: false
+      update_drivers: false
diff --git a/hw_config/ericsson-pod1/idf.yaml b/hw_config/ericsson-pod1/idf.yaml
index a160e0a..10e2433 100644
--- a/hw_config/ericsson-pod1/idf.yaml
+++ b/hw_config/ericsson-pod1/idf.yaml
@@ -73,14 +73,21 @@ bmra:
   network_roles:
     sriov:
       - name: eth2
-        bus_info: "05:00.0"
-        device_info: "8086:10f8:0200"
-        driver: vfio-pci
+        pci: "05:00.0"
+        pf_driver: i40e
+        vf_driver: vfio-pci
     sriov_dpdk:
       - name: eth3
-        bus_info: "05:00.1"
-        device_info: "8086:10f8:0200"
-        driver: vfio-pci
+        pci: "05:00.1"
+        pf_driver: i40e
+        vf_driver: vfio-pci
+  device_roles:
+#    qat:
+#      - name: crypto01
+#        pci: "0000:ab:00.0"
+#        mod_type: qat_c62x
+#        pci_type: c6xx
+#        vfs: 4
   features:
     sriov:
       enable: false
@@ -95,7 +102,8 @@ bmra:
       hugepages_2M: 10240
     isolcpus:
       enable: true
-      cpus: "4-9,14-19,24-29,34-39"
+      autogenerate: true
+      cpus: "4-9,14-19,24-29,34-39" # Not used when autogenerate is true
     nfd: true
     cmk:
       enable: true
@@ -107,4 +115,8 @@ bmra:
     tas:
       enable: true
       demo_policy: false
+    bond_cni: true
     psp: true
+    qat:
+      enable: false
+      update_drivers: false
diff --git a/hw_config/intel/idf.yaml b/hw_config/intel/idf.yaml
index 07c45cc..4ce7c47 100644
--- a/hw_config/intel/idf.yaml
+++ b/hw_config/intel/idf.yaml
@@ -73,14 +73,21 @@ bmra:
   network_roles:
     sriov:
       - name: eth0
-        bus_info: "18:00.0"
-        device_info: "8086:158b:0200"
-        driver: vfio-pci
+        pci: "18:00.0"
+        pf_driver: i40e
+        vf_driver: vfio-pci
     sriov_dpdk:
       - name: eth1
-        bus_info: "18:00.1"
-        device_info: "8086:158b:0200"
-        driver: iavf
+        pci: "18:00.1"
+        pf_driver: i40e
+        vf_driver: iavf
+  device_roles:
+#    qat:
+#      - name: crypto01
+#        pci: "0000:ab:00.0"
+#        mod_type: qat_c62x
+#        pci_type: c6xx
+#        vfs: 4
   features:
     sriov:
       enable: true
@@ -95,7 +102,8 @@ bmra:
       hugepages_2M: 10240
     isolcpus:
       enable: true
-      cpus: "4-19,24-39,44-59,64-79"
+      autogenerate: true
+      cpus: "4-19,24-39,44-59,64-79" # Not used when autogenerate is true
     nfd: true
     cmk:
       enable: true
@@ -107,4 +115,8 @@ bmra:
     tas:
       enable: true
       demo_policy: false
+    bond_cni: true
     psp: true
+    qat:
+      enable: false
+      update_drivers: false
-- 
cgit 1.2.3-korg