Add Intel E810CQ 100G NIC configuration

for Intel E810CQ 100G NIC, kernel driver of PF is ice, kernel driver of VF
is iavf, its VF hardware support VPP native avf driver.

Signed-off-by: Yulong Pei <yulong.pei@intel.com>
Change-Id: Ic8d86e5ee00057bbbcd09df619a38bd1371c8fd7

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 73d8b63..97bd63b 100644 (file)
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -266,6 +266,7 @@ class Constants:
         u"Intel-X710": 10000000000,
         u"Intel-XL710": 24500000000,
         u"Intel-XXV710": 24500000000,
+        u"Intel-E810CQ": 100000000000,
         u"Mellanox-CX556A": 100000000000,
         u"Amazon-Nitro-50G": 10000000000,
         u"virtual": 100000000,
@@ -280,6 +281,7 @@ class Constants:
         u"Intel-X710": 14880952,
         u"Intel-XL710": 18750000,
         u"Intel-XXV710": 18750000,
+        u"Intel-E810CQ": 58500000,
         u"Mellanox-CX556A": 60000000, # 148809523,
         u"Amazon-Nitro-50G": 1500000,
         u"virtual": 14880952,
@@ -294,6 +296,7 @@ class Constants:
         u"Intel-X710": u"10ge2p1x710",
         u"Intel-XL710": u"40ge2p1xl710",
         u"Intel-XXV710": u"25ge2p1xxv710",
+        u"Intel-E810CQ": u"100ge2p1e810cq",
         u"Amazon-Nitro-50G": u"50ge1p1ENA",
         u"Mellanox-CX556A": u"100ge2p1cx556a",
     }
@@ -307,6 +310,7 @@ class Constants:
         u"Intel-X710": [u"vfio-pci", u"avf"],
         u"Intel-XL710": [u"vfio-pci", u"avf"],
         u"Intel-XXV710": [u"vfio-pci", u"avf"],
+        u"Intel-E810CQ": [u"vfio-pci", u"avf"],
         u"Amazon-Nitro-50G": [u"vfio-pci"],
         u"Mellanox-CX556A": [u"rdma-core"],
     }
@@ -348,6 +352,7 @@ class Constants:
         u"Intel-X710": [u"vfio-pci"],
         u"Intel-XL710": [u"vfio-pci"],
         u"Intel-XXV710": [u"vfio-pci"],
+        u"Intel-E810CQ": [u"vfio-pci"],
         u"Amazon-Nitro-50G": [u"vfio-pci"],
         u"Mellanox-CX556A": [u"mlx5_core"],
     }

diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index bfc0ba7..e751160 100644 (file)
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -1569,9 +1569,9 @@ class InterfaceUtil:
         pf_mac_addr = Topology.get_interface_mac(node, ifc_key).split(":")
         uio_driver = Topology.get_uio_driver(node)
         kernel_driver = Topology.get_interface_driver(node, ifc_key)
-        if kernel_driver not in (u"i40e", u"i40evf"):
+        if kernel_driver not in (u"ice", u"iavf", u"i40e", u"i40evf"):
             raise RuntimeError(
-                f"AVF needs i40e-compatible driver, not {kernel_driver} "
+                f"AVF needs ice or i40e compatible driver, not {kernel_driver}"
                 f"at node {node[u'host']} ifc {ifc_key}"
             )
         current_driver = DUTSetup.get_pci_dev_driver(

diff --git a/topologies/available/2n_hw_testbed1.yaml.example b/topologies/available/2n_hw_testbed1.yaml.example
index ee2faaf..d39a722 100644 (file)
--- a/topologies/available/2n_hw_testbed1.yaml.example
+++ b/topologies/available/2n_hw_testbed1.yaml.example
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -40,6 +40,16 @@ nodes:
         pci_address: "0000:00:09.0"
         link: link2
         model: Intel-X553
+      port6:
+        mac_address: "08:00:27:35:66:0a"
+        pci_address: "0000:00:0a.0"
+        link: link3
+        model: Intel-E810CQ
+      port7:
+        mac_address: "08:00:27:46:77:0b"
+        pci_address: "0000:00:0b.0"
+        link: link4
+        model: Intel-E810CQ
   DUT1:
     type: DUT
     host: 10.0.0.1
@@ -59,3 +69,13 @@ nodes:
         pci_address: "0000:00:09.0"
         link: link2
         model: Intel-X553
+      port6:
+        mac_address: "08:00:27:ae:0a:2b"
+        pci_address: "0000:00:0a.0"
+        link: link3
+        model: Intel-E810CQ
+      port7:
+        mac_address: "08:00:27:f3:0b:f0"
+        pci_address: "0000:00:0b.0"
+        link: link4
+        model: Intel-E810CQ