aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/libraries/python/TrafficGenerator.py1
-rw-r--r--resources/libraries/python/VatJsonUtil.py5
-rw-r--r--resources/libraries/robot/performance.robot15
-rw-r--r--topologies/available/lf_testbed2-XL710-XL710.yaml69
-rw-r--r--topologies/available/lf_testbed2.yaml4
5 files changed, 89 insertions, 5 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index a98fb0df12..91a43fb0ca 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -182,7 +182,6 @@ class TrafficGenerator(object):
"- port_limit : 2\n"
" version : 2\n"
" interfaces : [\"{}\",\"{}\"]\n"
- " port_bandwidth_gb : 10\n"
" port_info :\n"
" - dest_mac : [{}]\n"
" src_mac : [{}]\n"
diff --git a/resources/libraries/python/VatJsonUtil.py b/resources/libraries/python/VatJsonUtil.py
index e17375ab56..1cafff0d27 100644
--- a/resources/libraries/python/VatJsonUtil.py
+++ b/resources/libraries/python/VatJsonUtil.py
@@ -95,8 +95,9 @@ class VatJsonUtil(object):
interface_dict = VatJsonUtil.get_vpp_interface_by_mac(
interface_list, if_mac)
if not interface_dict:
- raise Exception('Interface {0} not found by MAC {1}'
- .format(ifc, if_mac))
+ logger.trace('Interface {0} not found by MAC {1}'
+ .format(ifc, if_mac))
+ continue
ifc['name'] = interface_dict["interface_name"]
ifc['vpp_sw_index'] = interface_dict["sw_if_index"]
ifc['mtu'] = interface_dict["mtu"]
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 53fbf26488..cb9abe5176 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -53,6 +53,14 @@
| | ${10Ge_linerate_pps_1522B}= | Set Variable | 810635
| | ${10Ge_linerate_pps_9000B}= | Set Variable | 138580
| | ${10Ge_linerate_pps_9004B}= | Set Variable | 138519
+| | ${40Ge_linerate_pps_64B}= | Set Variable | 59523809
+| | ${40Ge_linerate_pps_68B}= | Set Variable | 56818181
+| | ${40Ge_linerate_pps_78B}= | Set Variable | 51020408
+| | ${40Ge_linerate_pps_1518B}= | Set Variable | 3250975
+| | ${40Ge_linerate_pps_1522B}= | Set Variable | 3242542
+| | ${40Ge_linerate_pps_9000B}= | Set Variable | 554323
+| | ${40Ge_linerate_pps_9004B}= | Set Variable | 554078
+
| | Set Suite Variable | ${10Ge_linerate_pps_64B}
| | Set Suite Variable | ${10Ge_linerate_pps_68B}
| | Set Suite Variable | ${10Ge_linerate_pps_78B}
@@ -60,6 +68,13 @@
| | Set Suite Variable | ${10Ge_linerate_pps_1522B}
| | Set Suite Variable | ${10Ge_linerate_pps_9000B}
| | Set Suite Variable | ${10Ge_linerate_pps_9004B}
+| | Set Suite Variable | ${40Ge_linerate_pps_64B}
+| | Set Suite Variable | ${40Ge_linerate_pps_68B}
+| | Set Suite Variable | ${40Ge_linerate_pps_78B}
+| | Set Suite Variable | ${40Ge_linerate_pps_1518B}
+| | Set Suite Variable | ${40Ge_linerate_pps_1522B}
+| | Set Suite Variable | ${40Ge_linerate_pps_9000B}
+| | Set Suite Variable | ${40Ge_linerate_pps_9004B}
| Setup performance global Variables
| | [Documentation] | Setup performance global Variables
diff --git a/topologies/available/lf_testbed2-XL710-XL710.yaml b/topologies/available/lf_testbed2-XL710-XL710.yaml
new file mode 100644
index 0000000000..7bb3f501ca
--- /dev/null
+++ b/topologies/available/lf_testbed2-XL710-XL710.yaml
@@ -0,0 +1,69 @@
+---
+metadata:
+ version: 0.1
+ schema:
+ - resources/topology_schemas/3_node_topology.sch.yaml
+ - resources/topology_schemas/topology.sch.yaml
+ tags: [hw, 3-node]
+
+nodes:
+ TG:
+ type: TG
+ subtype: TREX
+ host: "10.30.51.20"
+ port: 22
+ username: testuser
+ password: Cisco1234
+ interfaces:
+ port3:
+ # t2-tg1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
+ mac_address: "68:05:ca:37:1f:1c"
+ pci_address: "0000:86:00.0"
+ driver: i40e
+ link: link1
+ model: Intel-XL710
+ port5:
+ # t2-tg1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
+ mac_address: "68:05:ca:37:1f:19"
+ pci_address: "0000:86:00.1"
+ driver: i40e
+ link: link2
+ model: Intel-XL710
+ DUT1:
+ type: DUT
+ host: "10.30.51.21"
+ port: 22
+ username: testuser
+ password: Cisco1234
+ interfaces:
+ port5:
+ # t2-sut1-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
+ mac_address: "68:05:ca:35:77:08"
+ pci_address: "0000:85:00.0"
+ link: link3
+ model: Intel-XL710
+ port6:
+ # t2-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
+ mac_address: "68:05:ca:35:77:09"
+ pci_address: "0000:85:00.1"
+ link: link1
+ model: Intel-XL710
+ DUT2:
+ type: DUT
+ host: "10.30.51.22"
+ port: 22
+ username: testuser
+ password: Cisco1234
+ interfaces:
+ port5:
+ # t2-sut2-c4/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
+ mac_address: "68:05:ca:35:76:98"
+ pci_address: "0000:85:00.0"
+ link: link2
+ model: Intel-XL710
+ port6:
+ # t2-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
+ mac_address: "68:05:ca:35:76:99"
+ pci_address: "0000:85:00.1"
+ link: link3
+ model: Intel-XL710
diff --git a/topologies/available/lf_testbed2.yaml b/topologies/available/lf_testbed2.yaml
index 5e03d33028..c20346c3a8 100644
--- a/topologies/available/lf_testbed2.yaml
+++ b/topologies/available/lf_testbed2.yaml
@@ -138,7 +138,7 @@ nodes:
model: Intel-XL710
port6:
# t2-sut1-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
- mac_address: "68:05:ca:35:77:0d"
+ mac_address: "68:05:ca:35:77:09"
pci_address: "0000:85:00.1"
link: link7
model: Intel-XL710
@@ -205,7 +205,7 @@ nodes:
model: Intel-XL710
port6:
# t2-sut2-c4/p2 - 40GE port2 on Intel NIC xl710 2p40GE.
- mac_address: "68:05:ca:35:76:9d"
+ mac_address: "68:05:ca:35:76:99"
pci_address: "0000:85:00.1"
link: link14
model: Intel-XL710