X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance.robot;h=de5067b6390c206ed888b86386fae6bd4a2ff1a5;hp=a3cb2e53afcbb5fe09ae0860d4cda83c30cea131;hb=c8790d06d412b1daf303f6da9d8d11d97d053697;hpb=1739f04bbed020135f2bbf0ffcedf961fc1b5474

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index a3cb2e53af..de5067b639 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -43,6 +43,34 @@
 | | Set Suite Variable | ${dut2_if1}
 | | Set Suite Variable | ${dut2_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
+| | ...             | tg, tg_if1, tg_if2, dut1, dut1_if1, dut1_if2,
+| | ...             | dut2, dut2_if1, dut2_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['DUT2']} | 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
+| | ${dut2_if1} | ${dut2}= | Next Interface
+| | ${dut2_if2} | ${dut2}= | 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}
+| | Set Suite Variable | ${dut2}
+| | Set Suite Variable | ${dut2_if1}
+| | Set Suite Variable | ${dut2_if2}
+
 | 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
@@ -87,10 +115,20 @@
 | | ...                          | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | ...                          | ${topology_type}
 
+3-node Performance Suite Setup with DUT's NIC model
+| | [Arguments] | ${topology_type} | ${nic_model}
+| | 3-node circular Topology Variables Setup with DUT interface model
+| | ... | ${nic_model}
+| | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
+| | ...                          | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | ...                          | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | ...                          | ${topology_type}
+
 | 3-node Performance Suite Teardown
 | | Teardown traffic generator | ${tg}
 
 | Find NDR using linear search and pps
+| | [Documentation] | Find throughput by using RFC2544 linear search
 | | [Arguments] | ${framesize} | ${start_rate} | ${step_rate}
 | | ...         | ${topology_type} | ${min_rate} | ${max_rate}
 | | Set Duration | 60
@@ -99,10 +137,11 @@
 | | Set Search Frame Size | ${framesize}
 | | Set Search Rate Type pps
 | | Linear Search | ${start_rate} | ${topology_type}
-| | ${result_rate}= | Verify Search Result
-| | Set Test Message | FINAL_RATE: ${result_rate} pps
+| | ${rate_per_stream}= | Verify Search Result
+| | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
 
 | 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
@@ -110,10 +149,12 @@
 | | Set Search Rate Type pps
 | | Set Binary Convergence Threshold | ${threshold}
 | | Binary Search | ${binary_min} | ${binary_max} | ${topology_type}
-| | ${result_rate}= | Verify Search Result
-| | Set Test Message | FINAL_RATE: ${result_rate} pps
+| | ${rate_per_stream}= | Verify Search Result
+| | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
 
 | 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
@@ -123,11 +164,22 @@
 | | Set Search Rate Type pps
 | | Set Binary Convergence Threshold | ${threshold}
 | | Combined Search | ${start_rate} | ${topology_type}
-| | ${result_rate}= | Verify Search Result
-| | Set Test Message | FINAL_RATE: ${result_rate} pps
+| | ${rate_per_stream}= | Verify Search Result
+| | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
+
+| Display result of NDR search
+| | [Documentation] | Display result of NDR search in packet per seconds (total
+| | ...             | and per stream) and Gbps
+| | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams}
+| | ${rate_total}= | Evaluate | ${rate_per_stream}*${nr_streams}
+| | ${bandwidth_total}= | Evaluate | ${rate_total}*(${framesize}+20)*8/(10**9)
+| | Set Test Message | FINAL_RATE: ${rate_total} pps
+| | 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 occured
+| | No traffic loss occurred