X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=resources%2Flibraries%2Frobot%2Fperformance.robot;h=cb9abe5176f69373d342ee1f5523c620d57cd99f;hb=3bb84bee3516c1e7326becfc3c2f70bf6e3f59ce;hp=efa4d278455fe22b410a957caa6694309568d6cf;hpb=e6ff078693aa8fb1f77f3264886908feffa66a83;p=csit.git

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index efa4d27845..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
@@ -73,6 +88,20 @@
 | | Set Suite Variable | ${glob_loss_acceptance}
 | | Set Suite Variable | ${glob_loss_acceptance_type}
 
+| 2-node circular Topology Variables Setup
+| | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | Compute Path
+| | ${tg_if1} | ${tg}= | Next Interface
+| | ${dut1_if1} | ${dut1}= | Next Interface
+| | ${dut1_if2} | ${dut1}= | Next Interface
+| | ${tg_if2} | ${tg}= | Next Interface
+| | Set Suite Variable | ${tg}
+| | Set Suite Variable | ${tg_if1}
+| | Set Suite Variable | ${tg_if2}
+| | Set Suite Variable | ${dut1}
+| | Set Suite Variable | ${dut1_if1}
+| | Set Suite Variable | ${dut1_if2}
+
 | 3-node circular Topology Variables Setup
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
 | | ...          | ${nodes['TG']}
@@ -93,6 +122,27 @@
 | | Set Suite Variable | ${dut2_if1}
 | | Set Suite Variable | ${dut2_if2}
 
+| 2-node circular Topology Variables Setup with DUT interface model
+| | [Documentation] | Find a path between TG-DUT1-TG based on interface
+| | ...             | model provided as an argument. Set suite variables
+| | ...             | tg, tg_if1, tg_if2, dut1, dut1_if1, dut1_if2,
+| | [Arguments] | ${iface_model}
+| | ${iface_model_list}= | Create list | ${iface_model}
+| | Append Node | ${nodes['TG']}
+| | Append Node | ${nodes['DUT1']} | filter_list=${iface_model_list}
+| | Append Node | ${nodes['TG']}
+| | Compute Path
+| | ${tg_if1} | ${tg}= | Next Interface
+| | ${dut1_if1} | ${dut1}= | Next Interface
+| | ${dut1_if2} | ${dut1}= | Next Interface
+| | ${tg_if2} | ${tg}= | Next Interface
+| | Set Suite Variable | ${tg}
+| | Set Suite Variable | ${tg_if1}
+| | Set Suite Variable | ${tg_if2}
+| | Set Suite Variable | ${dut1}
+| | Set Suite Variable | ${dut1_if1}
+| | Set Suite Variable | ${dut1_if2}
+
 | 3-node circular Topology Variables Setup with DUT interface model
 | | [Documentation] | Find a path between TG-DUT1-DUT2-TG based on interface
 | | ...             | model provided as an argument. Set suite variables
@@ -121,7 +171,14 @@
 | | Set Suite Variable | ${dut2_if1}
 | | Set Suite Variable | ${dut2_if2}
 
-| VPP interfaces in path are up
+| VPP interfaces in path are up in a 2-node circular topology
+| | [Documentation] | *Set UP state on VPP interfaces in path on nodes.*
+| | ...
+| | Set Interface State | ${dut1} | ${dut1_if1} | up
+| | Set Interface State | ${dut1} | ${dut1_if2} | up
+| | Vpp Node Interfaces Ready Wait | ${dut1}
+
+| VPP interfaces in path are up in a 3-node circular topology
 | | [Documentation] | *Set UP state on VPP interfaces in path on nodes.*
 | | ...
 | | Set Interface State | ${dut1} | ${dut1_if1} | up
@@ -188,6 +245,19 @@
 | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
+| 2-node Performance Suite Setup
+| | [Arguments] | ${topology_type}
+| | Setup default startup configuration of VPP on all DUTs
+| | Update All Interface Data On All Nodes | ${nodes}
+| | Show vpp version on all DUTs
+| | Setup performance rate Variables
+| | Setup performance global Variables
+| | 2-node circular Topology Variables Setup
+| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
+| | ...                          | ${dut1} | ${dut1_if1}
+| | ...                          | ${dut1} | ${dut1_if2}
+| | ...                          | ${topology_type}
+
 | 3-node Performance Suite Setup
 | | [Arguments] | ${topology_type}
 | | Setup default startup configuration of VPP on all DUTs
@@ -201,6 +271,20 @@
 | | ...                          | ${dut2} | ${dut2_if2}
 | | ...                          | ${topology_type}
 
+2-node Performance Suite Setup with DUT's NIC model
+| | [Arguments] | ${topology_type} | ${nic_model}
+| | Setup default startup configuration of VPP on all DUTs
+| | Update All Interface Data On All Nodes | ${nodes}
+| | Show vpp version on all DUTs
+| | Setup performance rate Variables
+| | Setup performance global Variables
+| | 2-node circular Topology Variables Setup with DUT interface model
+| | ... | ${nic_model}
+| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
+| | ...                          | ${dut1} | ${dut1_if1}
+| | ...                          | ${dut1} | ${dut1_if2}
+| | ...                          | ${topology_type}
+
 3-node Performance Suite Setup with DUT's NIC model
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | Setup default startup configuration of VPP on all DUTs