X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance.robot;h=4dcd84e223371d5bdc8748918a6937db13f03d3e;hp=6c99e1d5aa1a4fadfbbc9d24b63cdae1fab9623a;hb=5aa9925436c3ca40e9af9d353245674f631d440d;hpb=f94e16167519c74707ec8b606da3f7b97c749c66

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 6c99e1d5aa..4dcd84e223 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -31,35 +31,65 @@
 | | [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}
+| | ... | - 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_72B - Maximum number of packet per second
+| | ... |                           for 10GE with 72B 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_1526B - Maximum number of packet per second
+| | ... |                             for 10GE with 1526B 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_9008B - Maximum number of packet per second
+| | ... |                             for 10GE with 9008B L2 Frame.
+| | ... | - 40Ge_linerate_pps_64B - Maximum number of packet per second
+| | ... |                           for 40GE with 64B L2 Frame.
+| | ... | - 40Ge_linerate_pps_68B - Maximum number of packet per second
+| | ... |                           for 40GE with 68B L2 Frame.
+| | ... | - 40Ge_linerate_pps_72B - Maximum number of packet per second
+| | ... |                           for 40GE with 72B L2 Frame.
+| | ... | - 40Ge_linerate_pps_78B - Maximum number of packet per second
+| | ... |                           for 40GE with 78B L2 Frame.
+| | ... | - 40Ge_linerate_pps_1518B - Maximum number of packet per second
+| | ... |                             for 40GE with 1518B L2 Frame.
+| | ... | - 40Ge_linerate_pps_1522B - Maximum number of packet per second
+| | ... |                             for 40GE with 1522B L2 Frame.
+| | ... | - 40Ge_linerate_pps_1526B - Maximum number of packet per second
+| | ... |                             for 40GE with 1526B L2 Frame.
+| | ... | - 40Ge_linerate_pps_9000B - Maximum number of packet per second
+| | ... |                             for 40GE with 9000B L2 Frame.
+| | ... | - 40Ge_linerate_pps_9004B - Maximum number of packet per second
+| | ... |                             for 40GE with 9004B L2 Frame.
+| | ... | - 40Ge_linerate_pps_9008B - Maximum number of packet per second
+| | ... |                             for 40GE with 9008B L2 Frame.
+| | ...
+| | Set Suite Variable | ${10Ge_linerate_pps_64B} | 14880952
+| | Set Suite Variable | ${10Ge_linerate_pps_68B} | 14204545
+| | Set Suite Variable | ${10Ge_linerate_pps_72B} | 13586956
+| | Set Suite Variable | ${10Ge_linerate_pps_78B} | 12755102
+| | Set Suite Variable | ${10Ge_linerate_pps_1518B} | 812743
+| | Set Suite Variable | ${10Ge_linerate_pps_1522B} | 810635
+| | Set Suite Variable | ${10Ge_linerate_pps_9000B} | 138580
+| | Set Suite Variable | ${10Ge_linerate_pps_9004B} | 138519
+| | Set Suite Variable | ${10Ge_linerate_pps_9008B} | 138458
+| | Set Suite Variable | ${40Ge_linerate_pps_64B} | 59523809
+| | Set Suite Variable | ${40Ge_linerate_pps_68B} | 56818181
+| | Set Suite Variable | ${40Ge_linerate_pps_72B} | 54347826
+| | Set Suite Variable | ${40Ge_linerate_pps_78B} | 51020408
+| | Set Suite Variable | ${40Ge_linerate_pps_1518B} | 3250975
+| | Set Suite Variable | ${40Ge_linerate_pps_1522B} | 3242542
+| | Set Suite Variable | ${40Ge_linerate_pps_9000B} | 554323
+| | Set Suite Variable | ${40Ge_linerate_pps_9004B} | 554078
+| | Set Suite Variable | ${40Ge_linerate_pps_9008B} | 553832
 
 | Setup performance global Variables
 | | [Documentation] | Setup performance global Variables
@@ -68,10 +98,22 @@
 | | ... | - ${glob_loss_acceptance} - Loss acceptance treshold
 | | ... | - ${glob_loss_acceptance_type} - Loss acceptance treshold type
 | | ...
-| | ${glob_loss_acceptance}= | Set Variable | 0.5
-| | ${glob_loss_acceptance_type}= | Set Variable | percentage
-| | Set Suite Variable | ${glob_loss_acceptance}
-| | Set Suite Variable | ${glob_loss_acceptance_type}
+| | Set Suite Variable | ${glob_loss_acceptance} | 0.5
+| | Set Suite Variable | ${glob_loss_acceptance_type} | percentage
+
+| 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']}
@@ -93,6 +135,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 +184,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
@@ -139,10 +209,8 @@
 | | Set Interface State | ${dut2} | ${dut2_if2} | up
 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
-| | ${dut1_if1_mac}= | Get Interface MAC | ${dut1} | ${dut1_if1}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut1_if1}
-| | ${dut2_if2_mac}= | Get Interface MAC | ${dut2} | ${dut1_if2}
+| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | dut1_v4.set_arp | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac}
 | | dut1_v4.set_arp | ${dut1_if2} | 1.1.1.2 | ${dut2_if1_mac}
 | | dut2_v4.set_arp | ${dut2_if1} | 1.1.1.1 | ${dut1_if2_mac}
@@ -161,7 +229,7 @@
 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
-| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut1_if1}
+| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if1} | 2001:1::1 | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | 2001:3::1 | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | 2001:3::2 | ${prefix}
@@ -190,29 +258,58 @@
 | | 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
 | | Update All Interface Data On All Nodes | ${nodes}
+| | Show vpp version on all DUTs
 | | Setup performance rate Variables
 | | Setup performance global Variables
 | | 3-node circular Topology Variables Setup
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
-| | ...                          | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | ...                          | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | ...                          | ${dut1} | ${dut1_if1}
+| | ...                          | ${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
 | | Update All Interface Data On All Nodes | ${nodes}
+| | Show vpp version on all DUTs
 | | Setup performance rate Variables
 | | Setup performance global Variables
 | | 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}
+| | ...                          | ${dut1} | ${dut1_if1}
+| | ...                          | ${dut2} | ${dut2_if2}
 | | ...                          | ${topology_type}
 
 | 3-node Performance Suite Teardown
@@ -477,8 +574,10 @@
 | | ${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
+| | Set Test Message | (${nr_streams}x ${rate_per_stream} pps)
+| | ...              | append=yes
+| | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
+| | ...              | append=yes
 
 | Display result of PDR search
 | | [Documentation] | Display result of PDR search in packet per seconds (total
@@ -503,8 +602,10 @@
 | | ${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
+| | Set Test Message | (${nr_streams}x ${rate_per_stream} pps)
+| | ...              | append=yes
+| | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
+| | ...              | append=yes
 | | Set Test Message | ${\n}LOSS_ACCEPTANCE: ${loss_acceptance} ${loss_acceptance_type}
 | | ...              | append=yes