X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance.robot;h=5c8af8ede2d50096870e8a52922159f16667a8c2;hp=d43073d30d9331dfbbdba0169e5ce41fb7f17fdd;hb=3bd53d390eab74356cfbed5898e000356f776530;hpb=10f3b07a5c883e20ef345c8b1c8e24063a50281f

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index d43073d30d..5c8af8ede2 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -27,6 +27,40 @@
 | Documentation | Performance suite keywords
 
 *** Keywords ***
+| Setup performance rate Variables
+| | [Documentation] | Setup performance rates as Suite Variables
+| | ...
+| | ... | _NOTE:_ This KW sets following suite variables:
+| | ... | - ${10Ge_linerate_pps_64B} - Maximum number of packet per second
+| | ... |                              for 10GE with 64B L2 Frame.
+| | ... | - ${10Ge_linerate_pps_68B} - Maximum number of packet per second
+| | ... |                              for 10GE with 68B L2 Frame.
+| | ... | - ${10Ge_linerate_pps_78B} - Maximum number of packet per second
+| | ... |                              for 10GE with 78B L2 Frame.
+| | ... | - ${10Ge_linerate_pps_1518B} - Maximum number of packet per second
+| | ... |                                for 10GE with 1518B L2 Frame.
+| | ... | - ${10Ge_linerate_pps_1522B} - Maximum number of packet per second
+| | ... |                                for 10GE with 1522B L2 Frame.
+| | ... | - ${10Ge_linerate_pps_9000B} - Maximum number of packet per second
+| | ... |                                for 10GE with 9000B L2 Frame.
+| | ... | - ${10Ge_linerate_pps_9004B} - Maximum number of packet per second
+| | ... |                                for 10GE with 9004B L2 Frame.
+| | ...
+| | ${10Ge_linerate_pps_64B}= | Set Variable | 14880952
+| | ${10Ge_linerate_pps_68B}= | Set Variable | 14204545
+| | ${10Ge_linerate_pps_78B}= | Set Variable | 12755102
+| | ${10Ge_linerate_pps_1518B}= | Set Variable | 812743
+| | ${10Ge_linerate_pps_1522B}= | Set Variable | 810635
+| | ${10Ge_linerate_pps_9000B}= | Set Variable | 138580
+| | ${10Ge_linerate_pps_9004B}= | Set Variable | 138519
+| | Set Suite Variable | ${10Ge_linerate_pps_64B}
+| | Set Suite Variable | ${10Ge_linerate_pps_68B}
+| | Set Suite Variable | ${10Ge_linerate_pps_78B}
+| | Set Suite Variable | ${10Ge_linerate_pps_1518B}
+| | Set Suite Variable | ${10Ge_linerate_pps_1522B}
+| | Set Suite Variable | ${10Ge_linerate_pps_9000B}
+| | Set Suite Variable | ${10Ge_linerate_pps_9004B}
+
 | 3-node circular Topology Variables Setup
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
 | | ...          | ${nodes['TG']}
@@ -75,6 +109,16 @@
 | | Set Suite Variable | ${dut2_if1}
 | | Set Suite Variable | ${dut2_if2}
 
+| VPP interfaces in path are up
+| | [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
+| | Set Interface State | ${dut2} | ${dut2_if1} | up
+| | Set Interface State | ${dut2} | ${dut2_if2} | up
+| | Vpp Node Interfaces Ready Wait | ${dut1}
+| | Vpp Node Interfaces Ready Wait | ${dut2}
+
 | IPv4 forwarding initialized in a 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG
 | | Set Interface State | ${dut1} | ${dut1_if1} | up
@@ -136,8 +180,9 @@
 
 | 3-node Performance Suite Setup
 | | [Arguments] | ${topology_type}
-| | Reset startup configuration of VPP on all DUTs
+| | Setup default startup configuration of VPP on all DUTs
 | | Update All Interface Data On All Nodes | ${nodes}
+| | Setup performance rate Variables
 | | 3-node circular Topology Variables Setup
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ...                          | ${dut1} | ${dut1_if1} | ${dut1_if2}
@@ -146,8 +191,9 @@
 
 3-node Performance Suite Setup with DUT's NIC model
 | | [Arguments] | ${topology_type} | ${nic_model}
-| | Reset startup configuration of VPP on all DUTs
+| | Setup default startup configuration of VPP on all DUTs
 | | Update All Interface Data On All Nodes | ${nodes}
+| | Setup performance rate Variables
 | | 3-node circular Topology Variables Setup with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
@@ -162,7 +208,8 @@
 | | [Documentation] | Find throughput by using RFC2544 linear search
 | | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
 | | ...         | ${topology_type} | ${min_rate} | ${max_rate}
-| | Set Duration | 60
+| | ${duration}= | Set Variable | 10
+| | Set Duration | ${duration}
 | | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
 | | Set Search Linear Step | ${step_rate}
 | | Set Search Frame Size | ${framesize}
@@ -170,12 +217,16 @@
 | | Linear Search | ${start_rate} | ${topology_type}
 | | ${rate_per_stream}= | Verify Search Result
 | | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
+| | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
+| | ...                              | ${framesize} | ${topology_type}
+| | ...                              | fail_on_loss=${False}
 
 | Find NDR using binary search and pps
 | | [Documentation] | Find throughput by using RFC2544 binary search
 | | [Arguments] | ${framesize} | ${binary_min} | ${binary_max}
 | | ...         | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
-| | Set Duration | 60
+| | ${duration}= | Set Variable | 10
+| | Set Duration | ${duration}
 | | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
 | | Set Search Frame Size | ${framesize}
 | | Set Search Rate Type pps
@@ -183,13 +234,17 @@
 | | Binary Search | ${binary_min} | ${binary_max} | ${topology_type}
 | | ${rate_per_stream}= | Verify Search Result
 | | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
+| | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
+| | ...                              | ${framesize} | ${topology_type}
+| | ...                              | fail_on_loss=${False}
 
 | Find NDR using combined search and pps
 | | [Documentation] | Find throughput by using RFC2544 combined search
 | | ...             | (linear + binary)
 | | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
 | | ...         | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold}
-| | Set Duration | 60
+| | ${duration}= | Set Variable | 10
+| | Set Duration | ${duration}
 | | Set Search Rate Boundaries | ${max_rate} | ${min_rate}
 | | Set Search Linear Step | ${step_rate}
 | | Set Search Frame Size | ${framesize}
@@ -198,6 +253,9 @@
 | | Combined Search | ${start_rate} | ${topology_type}
 | | ${rate_per_stream}= | Verify Search Result
 | | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
+| | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
+| | ...                              | ${framesize} | ${topology_type}
+| | ...                              | fail_on_loss=${False}
 
 | Display result of NDR search
 | | [Documentation] | Display result of NDR search in packet per seconds (total
@@ -209,9 +267,22 @@
 | | Set Test Message | (${nr_streams}x ${rate_per_stream} pps) | append=yes
 | | Set Test Message | FINAL_BANDWIDTH: ${bandwidth_total} Gbps | append=yes
 
-
 | Traffic should pass with no loss
 | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
-| | Send traffic on | ${tg} | ${duration}
-| | ...             | ${rate} | ${framesize} | ${topology_type}
-| | No traffic loss occurred
+| | ...         | ${fail_on_loss}=${True}
+| | Clear and show runtime counters with running traffic | ${duration}
+| | ...  | ${rate} | ${framesize} | ${topology_type}
+| | Clear all counters on all DUTs
+| | Send traffic on tg | ${duration} | ${rate} | ${framesize}
+| | ...                | ${topology_type} | warmup_time=0
+| | Show statistics on all DUTs
+| | Run Keyword If | ${fail_on_loss} | No traffic loss occurred
+
+| Clear and show runtime counters with running traffic
+| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | Send traffic on tg | -1 | ${rate} | ${framesize}
+| | ...                | ${topology_type} | warmup_time=0 | async_call=True
+| | Clear runtime counters on all DUTs
+| | Sleep | ${duration}
+| | Show runtime counters on all DUTs
+| | Stop traffic on tg