X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance.robot;h=b7e70c72264b14e3300f63941af7893644512b65;hp=6849e9820a2c9808e91d23676fb85191e3f99f59;hb=9d64f8be1cc66fa60717a5118cd193ae3f8c9089;hpb=bdc400b3feacd10d8130dedaa7df8df2d2d57feb

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 6849e9820a..b7e70c7226 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
+| Library | Collections
 | Library | resources.libraries.python.topology.Topology
 | Library | resources.libraries.python.NodePath
 | Library | resources.libraries.python.DpdkUtil
@@ -27,153 +28,10 @@
 | Resource | resources/libraries/robot/ipv4.robot
 | Resource | resources/libraries/robot/ipv6.robot
 | Resource | resources/libraries/robot/qemu.robot
+| Resource | resources/libraries/robot/tagging.robot
 | Documentation | Performance suite keywords
 
 *** Keywords ***
-| Setup performance rate Variables
-| | [Documentation]
-| | ... | Setup performance linerates as Suite Variables. Variables are used
-| | ... | as search boundaries in RFC2544 throughput search.
-| | ...
-| | ... | _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_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.
-| | ... | - 10Ge_linerate_pps_IMIX_v4_1 - Maximum number of packet per second
-| | ... |                                 for 10GE with IMIX_v4_1 profile.
-| | ... | - 10Ge_lisp_linerate_pps_72B - Maximum number of packets per second
-| | ... |                                for 10GE with 72B L2 Frame, Lisp and
-| | ... |                                IPv4 header.
-| | ... | - 10Ge_lisp_linerate_pps_86B - Maximum number of packets per second
-| | ... |                                for 10GE with 86B L2 Frame, Lisp and
-| | ... |                                IPv4 header.
-| | ... | - 10Ge_lisp_linerate_pps_1488B - Maximum number of packets per
-| | ... |                                  second for 10GE with 1488B L2
-| | ... |                                  Frame, Lisp and IPv6 header.
-| | ... | - 10Ge_lisp_linerate_pps_9008B - Maximum number of packets per
-| | ... |                                  second for 10GE with 9008B L2
-| | ... |                                  Frame, Lisp, IPv4 or IPv6 header.
-| | ... | - 10Ge_lisp_iph_linerate_pps_112B - Maximum number of packets per
-| | ... |                                     second for 10GE with 112B L2
-| | ... |                                     Frame, Lisp, IPv4 and IPv6
-| | ... |                                     header.
-| | ... | - 10Ge_lisp_iph_linerate_pps_126B - Maximum number of packets per
-| | ... |                                     second for 10GE with 126B L2
-| | ... |                                     Frame, Lisp, IPv4 and IPv6
-| | ... |                                     header.
-| | ... | - 10Ge_lisp_iph_linerate_pps_1508B - Maximum number of packets per
-| | ... |                                      second for 10GE with 1508B L2
-| | ... |                                      Frame, Lisp, IPv4 and IPv6
-| | ... |                                      header.
-| | ... | - 10Ge_lisp_iph_linerate_pps_9048B - Maximum number of packets per
-| | ... |                                      second for 10GE with 9048B L2
-| | ... |                                      Frame, Lisp, IPv4 and IPv6
-| | ... |                                      header.
-| | ... | - 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.
-| | ... | - 40Ge_linerate_pps_IMIX_v4_1 - Maximum number of packet per second
-| | ... |                                 for 40GE with IMIX_v4_1 profile.
-| | ... | - 40Ge_lisp_linerate_pps_72B - Maximum number of packets per second
-| | ... |                                for 40GE with 72B L2 Frame, Lisp and
-| | ... |                                IPv4 header.
-| | ... | - 40Ge_lisp_linerate_pps_86B - Maximum number of packets per second
-| | ... |                                for 40GE with 86B L2 Frame, Lisp and
-| | ... |                                IPv4 header.
-| | ... | - 40Ge_lisp_linerate_pps_1488B - Maximum number of packets per
-| | ... |                                  second for 40GE with 1488B L2
-| | ... |                                  Frame, Lisp and IPv6 header.
-| | ... | - 40Ge_lisp_linerate_pps_9008B - Maximum number of packets per
-| | ... |                                  second for 40GE with 9008B L2
-| | ... |                                  Frame, Lisp, IPv4 or IPv6 header.
-| | ... | - 40Ge_lisp_iph_linerate_pps_112B - Maximum number of packets per
-| | ... |                                     second for 40GE with 112B L2
-| | ... |                                     Frame, Lisp, IPv4 and IPv6
-| | ... |                                     header.
-| | ... | - 40Ge_lisp_iph_linerate_pps_126B - Maximum number of packets per
-| | ... |                                     second for 40GE with 126B L2
-| | ... |                                     Frame, Lisp, IPv4 and IPv6
-| | ... |                                     header.
-| | ... | - 40Ge_lisp_iph_linerate_pps_1508B - Maximum number of packets per
-| | ... |                                      second for 40GE with 1508B L2
-| | ... |                                      Frame, Lisp, IPv4 and IPv6
-| | ... |                                      header.
-| | ... | - 40Ge_lisp_iph_linerate_pps_9048B - Maximum number of packets per
-| | ... |                                      second for 40GE with 9048B L2
-| | ... |                                      Frame, Lisp, IPv4 and IPv6
-| | ... |                                      header.
-| | ...
-| | 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 | ${10Ge_linerate_pps_IMIX_v4_1} | 3343736
-| | Set Suite Variable | ${10Ge_lisp_linerate_pps_72B} | 13586956
-| | Set Suite Variable | ${10Ge_lisp_linerate_pps_86B} | 11792452
-| | Set Suite Variable | ${10Ge_lisp_linerate_pps_1488B} | 828912
-| | Set Suite Variable | ${10Ge_lisp_linerate_pps_9008B} | 138458
-| | Set Suite Variable | ${10Ge_lisp_iph_linerate_pps_112B} | 9469696
-| | Set Suite Variable | ${10Ge_lisp_iph_linerate_pps_126B} | 8561643
-| | Set Suite Variable | ${10Ge_lisp_iph_linerate_pps_1508B} | 818062
-| | Set Suite Variable | ${10Ge_lisp_iph_linerate_pps_9048B} | 137847
-| | 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
-| | Set Suite Variable | ${40Ge_linerate_pps_IMIX_v4_1} | 13374944
-| | Set Suite Variable | ${40Ge_lisp_linerate_pps_72B} | 54347826
-| | Set Suite Variable | ${40Ge_lisp_linerate_pps_86B} | 47169811
-| | Set Suite Variable | ${40Ge_lisp_linerate_pps_1488B} | 3315649
-| | Set Suite Variable | ${40Ge_lisp_linerate_pps_9008B} | 553832
-| | Set Suite Variable | ${40Ge_lisp_iph_linerate_pps_112B} | 37878787
-| | Set Suite Variable | ${40Ge_lisp_iph_linerate_pps_126B} | 34246575
-| | Set Suite Variable | ${40Ge_lisp_iph_linerate_pps_1508B} | 3272251
-| | Set Suite Variable | ${40Ge_lisp_iph_linerate_pps_9048B} | 551389
-
 | Calculate pps
 | | [Documentation]
 | | ... | Calculate pps for given rate and L2 frame size,
@@ -190,6 +48,7 @@
 | | ...
 | | ... | \| Calculate pps \| 10000000000 | 64
 | | [Arguments] | ${bps} | ${framesize}
+| | ${framesize}= | Get Frame Size | ${framesize}
 | | ${ret}= | Evaluate | (${bps}/((${framesize}+20)*8)).__trunc__()
 | | Return From Keyword | ${ret}
 
@@ -221,7 +80,7 @@
 | | ...
 | | Set Suite Variable | ${glob_loss_acceptance} | 0.5
 | | Set Suite Variable | ${glob_loss_acceptance_type} | percentage
-| | Set Suite Variable | ${glob_vm_image} | /var/lib/vm/csit-nested-1.3.img
+| | Set Suite Variable | ${glob_vm_image} | /var/lib/vm/csit-nested-1.5.img
 
 | 2-node circular Topology Variables Setup
 | | [Documentation]
@@ -310,7 +169,7 @@
 | | Append Node | ${nodes['TG']}
 | | Append Node | ${nodes['DUT1']} | filter_list=${iface_model_list}
 | | Append Node | ${nodes['TG']}
-| | Compute Path
+| | Compute Path | always_same_link=${FALSE}
 | | ${tg_if1} | ${tg}= | Next Interface
 | | ${dut1_if1} | ${dut1}= | Next Interface
 | | ${dut1_if2} | ${dut1}= | Next Interface
@@ -587,6 +446,36 @@
 | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 5.5.5.2 | ${dut2_vif2}
 | | ... | vrf=${fib_table_2}
 
+| IPv4 policer 2r3c-${t} initialized in a 3-node circular topology
+| | [Documentation]
+| | ... | Setup of 2r3c color-aware or color-blind policer with dst ip match
+| | ... | on all DUT nodes in 3-node circular topology. Policer is applied on
+| | ... | links TG - DUT1 and DUT2 - TG.
+| | ...
+| | ${dscp}= | DSCP AF22
+| | Policer Set Name | policer1
+| | Policer Set CIR | ${cir}
+| | Policer Set EIR | ${eir}
+| | Policer Set CB | ${cb}
+| | Policer Set EB | ${eb}
+| | Policer Set Rate Type pps
+| | Policer Set Round Type Closest
+| | Policer Set Type 2R3C 2698
+| | Policer Set Conform Action Transmit
+| | Policer Set Exceed Action Mark and Transmit | ${dscp}
+| | Policer Set Violate Action Transmit
+| | Policer Enable Color Aware
+| | Run Keyword If | ${t} == 'ca' | Policer Enable Color Aware
+| | Policer Classify Set Precolor Exceed
+| | Policer Set Node | ${dut1}
+| | Policer Classify Set Interface | ${dut1_if1}
+| | Policer Classify Set Match IP | 20.20.20.2 | ${False}
+| | Policer Set Configuration
+| | Policer Set Node | ${dut2}
+| | Policer Classify Set Interface | ${dut2_if2}
+| | Policer Classify Set Match IP | 10.10.10.2 | ${False}
+| | Policer Set Configuration
+
 | IPv6 forwarding initialized in a 3-node circular topology
 | | [Documentation]
 | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
@@ -648,9 +537,9 @@
 | | Vpp Route Add | ${dut1} | 2001:1::0 | ${host_prefix} | 2001:3::2
 | | ...           | interface=${dut1_if1} | count=${count}
 | | Vpp Route Add | ${dut2} | 2001:1::0 | ${host_prefix} | 2001:4::1
-| | ...           | interface=${dut2_if2} | count=${count}
-| | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2
 | | ...           | interface=${dut2_if1} | count=${count}
+| | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2
+| | ...           | interface=${dut2_if2} | count=${count}
 
 | IPv6 iAcl whitelist initialized in a 3-node circular topology
 | | [Documentation]
@@ -681,6 +570,91 @@
 | | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
+| L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| | [Documentation]
+| | ... | Setup L2 xconnect topology with VXLANoIPv4 by cross connecting
+| | ... | physical and vxlan interfaces on each DUT. All interfaces are brought
+| | ... | up. IPv4 addresses with prefix /24 are configured on interfaces
+| | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as
+| | ... | interfaces.
+| | ...
+| | VPP interfaces in path are up in a 3-node circular topology
+| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1
+| | ...                                | 24
+| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2
+| | ...                                | 24
+| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
+| | Add arp on dut | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if1} | 172.16.0.1 | ${dut1_if2_mac}
+| | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24
+| | ...             | 172.16.0.1 | 172.16.0.2
+| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
+| | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
+| | ...             | 172.16.0.2 | 172.16.0.1
+| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
+
+| L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| | [Documentation]
+| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross
+| | ... | connect each Vhost interface with one physical interface.
+| | ...
+| | ... | *Arguments:*
+| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string
+| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| L2 xconnect with Vhost-User initialized in a 3-node \
+| | ... |    circular topology \| /tmp/sock1 \| /tmp/sock2 \|
+| | [Arguments] | ${sock1} | ${sock2}
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | ...                                                | ${sock1}
+| | ...                                                | ${sock2}
+| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${vhost_if1}
+| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if2} | ${vhost_if2}
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | ...                                                | ${sock1}
+| | ...                                                | ${sock2}
+| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${vhost_if1}
+| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${vhost_if2}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
+| L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology
+| | [Documentation]
+| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross
+| | ... | connect each Vhost interface with one physical interface.
+| | ... | Setup VLAN between DUTs. All interfaces are brought up.
+| | ...
+| | ... | *Arguments:*
+| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string
+| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string
+| | ... | - subid - ID of the sub-interface to be created. Type: string
+| | ... | - tag_rewrite - Method of tag rewrite. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| L2 xconnect with Vhost-User and VLAN initialized in a 3-node\
+| | ... | circular topology \| /tmp/sock1 \| /tmp/sock2 \| 10 \| pop-1 \|
+| | ...
+| | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite}
+| | ...
+| | VPP interfaces in path are up in a 3-node circular topology
+| | VLAN dot1q subinterfaces initialized on 3-node topology
+| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
+| | L2 tag rewrite method setup on interfaces
+| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
+| | ... | ${tag_rewrite}
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | ... | ${sock1} | ${sock2}
+| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${vhost_if1}
+| | L2 setup xconnect on DUT | ${dut1} | ${subif_index_1} | ${vhost_if2}
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | ... | ${sock1} | ${sock2}
+| | L2 setup xconnect on DUT | ${dut2} | ${subif_index_2} | ${vhost_if1}
+| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${vhost_if2}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
 | L2 bridge domain initialized in a 3-node circular topology
 | | [Documentation]
 | | ... | Setup L2 DB topology by adding two interfaces on each DUT into BD
@@ -691,6 +665,150 @@
 | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
+| L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| | [Documentation]
+| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
+| | ... | Vhost-User interface into L2 bridge domains with learning enabled
+| | ... | with physical inteface.
+| | ...
+| | ... | *Arguments:*
+| | ... | - bd_id1 - Bridge domain ID. Type: integer
+| | ... | - bd_id2 - Bridge domain ID. Type: integer
+| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string
+| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| L2 bridge domains with Vhost-User initialized in a 3-node \
+| | ... |    circular topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \|
+| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | ...                                                | ${sock1}
+| | ...                                                | ${sock2}
+| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
+| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | ...                                                | ${sock1}
+| | ...                                                | ${sock2}
+| | Interface is added to bridge domain | ${dut2} | ${dut2_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
+| L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
+| | [Documentation]
+| | ... | Setup L2 bridge domain topology with VXLANoIPv4 by connecting
+| | ... | physical and vxlan interfaces on each DUT. All interfaces are brought
+| | ... | up. IPv4 addresses with prefix /24 are configured on interfaces
+| | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as
+| | ... | interfaces.
+| | ...
+| | VPP interfaces in path are up in a 3-node circular topology
+| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
+| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
+| | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
+| | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
+| | Add arp on dut | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac}
+| | Add arp on dut | ${dut2} | ${dut2_if1} | 172.16.0.1 | ${dut1_if2_mac}
+| | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24
+| | ... | 172.16.0.1 | 172.16.0.2
+| | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
+| | ... | 172.16.0.2 | 172.16.0.1
+| | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
+| | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
+| L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology
+| | [Documentation]
+| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
+| | ... | Vhost-User interface into L2 bridge domains with learning enabled
+| | ... | with physical inteface.
+| | ... | Setup VXLANoIPv4 between DUTs by connecting physical and vxlan
+| | ... | interfaces on each DUT. All interfaces are brought up.
+| | ... | IPv4 addresses with prefix /24 are configured on interfaces between
+| | ... | DUTs. VXLAN sub-interfaces has same IPv4 address as interfaces.
+| | ...
+| | ... | *Arguments:*
+| | ... | - bd_id1 - Bridge domain ID. Type: integer
+| | ... | - bd_id2 - Bridge domain ID. Type: integer
+| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string
+| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a\
+| | ... | 3-node circular topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \|
+| | ...
+| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
+| | ...
+| | VPP interfaces in path are up in a 3-node circular topology
+| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
+| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
+| | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24
+| | ... | 172.16.0.1 | 172.16.0.2
+| | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
+| | ... | 172.16.0.2 | 172.16.0.1
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | ... | ${sock1} | ${sock2}
+| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | Interface is added to bridge domain | ${dut1} | ${dut1s_vxlan} | ${bd_id2}
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | ... | ${sock1} | ${sock2}
+| | Interface is added to bridge domain | ${dut2} | ${dut2s_vxlan} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
+| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
+| L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology
+| | [Documentation]
+| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
+| | ... | Vhost-User interface into L2 bridge domains with learning enabled
+| | ... | with physical inteface.
+| | ... | Setup VLAN between DUTs. All interfaces are brought up.
+| | ...
+| | ... | *Arguments:*
+| | ... | - bd_id1 - Bridge domain ID. Type: integer
+| | ... | - bd_id2 - Bridge domain ID. Type: integer
+| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string
+| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string
+| | ... | - subid - ID of the sub-interface to be created. Type: string
+| | ... | - tag_rewrite - Method of tag rewrite. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| L2 bridge domains with Vhost-User and VLAN initialized in a 3-node\
+| | ... | circular topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \| 10\
+| | ... | pop-1 \|
+| | ...
+| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid}
+| | ... | ${tag_rewrite}
+| | ...
+| | VPP interfaces in path are up in a 3-node circular topology
+| | VLAN dot1q subinterfaces initialized on 3-node topology
+| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
+| | L2 tag rewrite method setup on interfaces
+| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
+| | ... | ${tag_rewrite}
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | ... | ${sock1} | ${sock2}
+| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | Interface is added to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2}
+| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | ... | ${sock1} | ${sock2}
+| | Interface is added to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
+| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
+| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | All Vpp Interfaces Ready Wait | ${nodes}
+
 2-node Performance Suite Setup with DUT's NIC model
 | | [Documentation]
 | | ... | Suite preparation phase that setup default startup configuration of
@@ -706,12 +824,11 @@
 | | ...
 | | ... | \| 2-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
 | | [Arguments] | ${topology_type} | ${nic_model}
-| | Setup default startup configuration of VPP on all DUTs
 | | 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}
+| | Setup default startup configuration of VPP on all DUTs
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ...                          | ${dut1} | ${dut1_if1}
 | | ...                          | ${dut1} | ${dut1_if2}
@@ -732,12 +849,11 @@
 | | ...
 | | ... | \| 3-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
 | | [Arguments] | ${topology_type} | ${nic_model}
-| | Setup default startup configuration of VPP on all DUTs
 | | 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}
+| | Setup default startup configuration of VPP on all DUTs
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ...                          | ${dut1} | ${dut1_if1}
 | | ...                          | ${dut2} | ${dut2_if2}
@@ -777,7 +893,19 @@
 | | Set Search Frame Size | ${framesize}
 | | Set Search Rate Type pps
 | | Linear Search | ${start_rate} | ${topology_type}
-| | ${rate_per_stream} | ${latency}= | Verify Search Result
+| | ${rate_per_stream} | ${lat}= | Verify Search Result
+| | ${tmp}= | Create List | 100%NDR | ${lat}
+| | ${latency}= | Create List | ${tmp}
+| | ${rate_50p}= | Evaluate | int(${rate_per_stream}*0.5)
+| | ${lat_50p}= | Measure latency pps | ${duration} | ${rate_50p}
+| | ...                               | ${framesize} | ${topology_type}
+| | ${tmp}= | Create List | 50%NDR | ${lat_50p}
+| | Append To List | ${latency} | ${tmp}
+| | ${rate_10p}= | Evaluate | int(${rate_per_stream}*0.1)
+| | ${lat_10p}= | Measure latency pps | ${duration} | ${rate_10p}
+| | ...                               | ${framesize} | ${topology_type}
+| | ${tmp}= | Create List | 10%NDR | ${lat_10p}
+| | Append To List | ${latency} | ${tmp}
 | | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
 | | ...                          | ${latency}
 | | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
@@ -852,7 +980,19 @@
 | | Set Search Rate Type pps
 | | Set Binary Convergence Threshold | ${threshold}
 | | Binary Search | ${binary_min} | ${binary_max} | ${topology_type}
-| | ${rate_per_stream} | ${latency}= | Verify Search Result
+| | ${rate_per_stream} | ${lat}= | Verify Search Result
+| | ${tmp}= | Create List | 100%NDR | ${lat}
+| | ${latency}= | Create List | ${tmp}
+| | ${rate_50p}= | Evaluate | int(${rate_per_stream}*0.5)
+| | ${lat_50p}= | Measure latency pps | ${duration} | ${rate_50p}
+| | ...                               | ${framesize} | ${topology_type}
+| | ${tmp}= | Create List | 50%NDR | ${lat_50p}
+| | Append To List | ${latency} | ${tmp}
+| | ${rate_10p}= | Evaluate | int(${rate_per_stream}*0.1)
+| | ${lat_10p}= | Measure latency pps | ${duration} | ${rate_10p}
+| | ...                               | ${framesize} | ${topology_type}
+| | ${tmp}= | Create List | 10%NDR | ${lat_10p}
+| | Append To List | ${latency} | ${tmp}
 | | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
 | | ...                          | ${latency}
 | | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
@@ -893,7 +1033,9 @@
 | | ...            | Set Loss Acceptance Type Percentage
 | | Set Binary Convergence Threshold | ${threshold}
 | | Binary Search | ${binary_min} | ${binary_max} | ${topology_type}
-| | ${rate_per_stream} | ${latency}= | Verify Search Result
+| | ${rate_per_stream} | ${lat}= | Verify Search Result
+| | ${tmp}= | Create List | 100%NDR | ${lat}
+| | ${latency}= | Create List | ${tmp}
 | | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2
 | | ...                          | ${loss_acceptance} | ${loss_acceptance_type}
 | | ...                          | ${latency}
@@ -931,7 +1073,19 @@
 | | Set Search Rate Type pps
 | | Set Binary Convergence Threshold | ${threshold}
 | | Combined Search | ${start_rate} | ${topology_type}
-| | ${rate_per_stream} | ${latency}= | Verify Search Result
+| | ${rate_per_stream} | ${lat}= | Verify Search Result
+| | ${tmp}= | Create List | 100%NDR | ${lat}
+| | ${latency}= | Create List | ${tmp}
+| | ${rate_50p}= | Evaluate | int(${rate_per_stream}*0.5)
+| | ${lat_50p}= | Measure latency pps | ${duration} | ${rate_50p}
+| | ...                               | ${framesize} | ${topology_type}
+| | ${tmp}= | Create List | 50%NDR | ${lat_50p}
+| | Append To List | ${latency} | ${tmp}
+| | ${rate_10p}= | Evaluate | int(${rate_per_stream}*0.1)
+| | ${lat_10p}= | Measure latency pps | ${duration} | ${rate_10p}
+| | ...                               | ${framesize} | ${topology_type}
+| | ${tmp}= | Create List | 10%NDR | ${lat_10p}
+| | Append To List | ${latency} | ${tmp}
 | | Display result of NDR search | ${rate_per_stream} | ${framesize} | 2
 | | ...                          | ${latency}
 | | Traffic should pass with no loss | ${duration} | ${rate_per_stream}pps
@@ -1001,7 +1155,7 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Display result of NDR search \| 4400000 \| 64 \| 2 \
-| | ... | \| (0, 10/10/10) \|
+| | ... | \| [100%NDR, [10/10/10, 1/2/3]] \|
 | | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams}
 | | ...         | ${latency}
 | | ${framesize}= | Get Frame Size | ${framesize}
@@ -1012,9 +1166,9 @@
 | | ...              | append=yes
 | | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
 | | ...              | append=yes
-| | :FOR | ${idx} | ${lat} | IN ENUMERATE | @{latency}
-| | | Set Test Message | ${\n}LATENCY_STREAM_${idx}: ${lat} usec (min/avg/max)
-| | ...                | append=yes
+| | Set Test Message | ${\n}LATENCY usec [min/avg/max] | append=yes
+| | :FOR | ${lat} | IN | @{latency}
+| | | Set Test Message | ${\n}LAT_${lat[0]}: ${lat[1]} | append=yes
 
 | Display result of PDR search
 | | [Documentation]
@@ -1036,7 +1190,7 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| Display result of PDR search \| 4400000 \| 64 \| 2 \| 0.5 \
-| | ... | \| percentage \| (0, 10/10/10) \|
+| | ... | \| percentage \| [100%NDR, [10/10/10, 1/2/3]] \|
 | | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams}
 | | ...         | ${loss_acceptance} | ${loss_acceptance_type} | ${latency}
 | | ${framesize}= | Get Frame Size | ${framesize}
@@ -1047,12 +1201,34 @@
 | | ...              | append=yes
 | | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
 | | ...              | append=yes
-| | :FOR | ${idx} | ${lat} | IN ENUMERATE | @{latency}
-| | | Set Test Message | ${\n}LATENCY_STREAM_${idx}: ${lat} usec (min/avg/max)
-| | ...                | append=yes
+| | Set Test Message | ${\n}LATENCY usec [min/avg/max] | append=yes
+| | :FOR | ${lat} | IN | @{latency}
+| | | Set Test Message | ${\n}LAT_${lat[0]}: ${lat[1]} | append=yes
 | | Set Test Message | ${\n}LOSS_ACCEPTANCE: ${loss_acceptance} ${loss_acceptance_type}
 | | ...              | append=yes
 
+| Measure latency pps
+| | [Documentation]
+| | ... | Send traffic at specified rate. Measure min/avg/max latency
+| | ...
+| | ... | *Arguments:*
+| | ... | - duration - Duration of traffic run [s]. Type: integer
+| | ... | - rate - Rate for sending packets. Type: integer
+| | ... | - framesize - L2 Frame Size [B]. Type: integer
+| | ... | - topology_type - Topology type. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Measure latency \| 10 \| 4.0 \| 64 \| 3-node-IPv4
+| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
+| | Return From Keyword If | ${rate} <= 10000 | ${-1}
+| | ${ret}= | For DPDK Performance Test
+| | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs
+| | Send traffic on tg | ${duration} | ${rate}pps | ${framesize}
+| | ...                | ${topology_type} | warmup_time=0
+| | Run Keyword If | ${ret}==${FALSE} | Show statistics on all DUTs
+| | Run keyword and return | Get latency
+
 | Traffic should pass with no loss
 | | [Documentation]
 | | ... | Send traffic at specified rate. No packet loss is accepted at loss
@@ -1072,10 +1248,11 @@
 | | ...         | ${fail_on_loss}=${True}
 | | Clear and show runtime counters with running traffic | ${duration}
 | | ...  | ${rate} | ${framesize} | ${topology_type}
-| | Clear all counters on all DUTs
+| | ${ret}= | For DPDK Performance Test
+| | Run Keyword If | ${ret}==${FALSE} | 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 | ${ret}==${FALSE} | Show statistics on all DUTs
 | | Run Keyword If | ${fail_on_loss} | No traffic loss occurred
 
 | Traffic should pass with partial loss
@@ -1100,10 +1277,11 @@
 | | ...         | ${fail_on_loss}=${True}
 | | Clear and show runtime counters with running traffic | ${duration}
 | | ...  | ${rate} | ${framesize} | ${topology_type}
-| | Clear all counters on all DUTs
+| | ${ret}= | For DPDK Performance Test
+| | Run Keyword If | ${ret}==${FALSE} | 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 | ${ret}==${FALSE} | Show statistics on all DUTs
 | | Run Keyword If | ${fail_on_loss} | Partial traffic loss accepted
 | | ...            | ${loss_acceptance} | ${loss_acceptance_type}
 
@@ -1127,9 +1305,10 @@
 | | Send traffic on tg | -1 | ${rate} | ${framesize}
 | | ...                | ${topology_type} | warmup_time=0 | async_call=${True}
 | | ...                | latency=${False}
-| | Clear runtime counters on all DUTs
+| | ${ret}= | For DPDK Performance Test
+| | Run Keyword If | ${ret}==${FALSE} | Clear runtime counters on all DUTs
 | | Sleep | ${duration}
-| | Show runtime counters on all DUTs
+| | Run Keyword If | ${ret}==${FALSE} | Show runtime counters on all DUTs
 | | Stop traffic on tg
 
 | Add PCI devices to DUTs from 3-node single link topology
@@ -1143,49 +1322,57 @@
 | Guest VM with dpdk-testpmd connected via vhost-user is setup
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
-| | ... | DPDK testpmd. Qemu Guest is using 3 cores pinned to physical cores 5,
-| | ... | 6, 7 and 2048M. Testpmd is using 3 cores (1 main core and 2 cores
-| | ... | dedicated to io) socket-mem=1024, mem-channel=4, txq/rxq=2048,
-| | ... | burst=64, disable-hw-vlan, total-num-mbufs, driver
-| | ... | usr/lib/librte_pmd_virtio.so.
+| | ... | DPDK testpmd. Qemu Guest is using 5 cores pinned to physical cores
+| | ... | 5-9, and 2048M. Testpmd is using 5 cores (1 main core and 4 cores
+| | ... | dedicated to io) mem-channel=4, txq/rxq=256, burst=64,
+| | ... | disable-hw-vlan, disable-rss, driver usr/lib/librte_pmd_virtio.so
+| | ... | and fwd mode is io.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node to start guest VM on. Type: dictionary
 | | ... | - sock1 - Socket path for first Vhost-User interface. Type: string
 | | ... | - sock2 - Socket path for second Vhost-User interface. Type: string
 | | ... | - vm_name - QemuUtil instance name. Type: string
+| | ... | - skip - number of cpus which will be skipped. Type: int
+| | ... | - count - number of cpus which will be allocated for qemu. Type: int
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \
-| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \|
-| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name}
+| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${5} \
+| | ... | \| ${5} \|
+| | ...
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} | ${skip}=${5}
+| | ... | ${count}=${5}
+| | ...
 | | Import Library | resources.libraries.python.QemuUtils
-| | ...            | WITH NAME | ${vm_name}
+| | ... | WITH NAME | ${vm_name}
+| | ${dut_numa}= | Get interfaces numa node | ${dut_node}
+| | ... | ${dut1_if1} | ${dut1_if2}
+| | ${cpus}= | Cpu list per node | ${dut_node} | ${dut_numa}
+| | ${end_idx}= | Evaluate | ${skip} + ${count}
+| | ${qemu_cpus}= | Get Slice From List | ${cpus} | ${skip} | ${end_idx}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
 | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
-| | Run keyword | ${vm_name}.Qemu Set Smp | 3 | 3 | 1 | 1
+| | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1
 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048
-| | Run keyword | ${vm_name}.Qemu Set Huge Allocate
 | | Run keyword | ${vm_name}.Qemu Set Disk Image | ${glob_vm_image}
 | | ${vm}= | Run keyword | ${vm_name}.Qemu Start
-| | Run keyword | ${vm_name}.Qemu Set Affinity | 5 | 6 | 7
-| | Dpdk Testpmd Start | ${vm} | eal_coremask=0x7
-| | ...                | eal_mem_channels=4
-| | ...                | eal_socket_mem=1024
-| | ...                | pmd_fwd_mode=io
-| | ...                | pmd_disable_hw_vlan=${True}
+| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
+| | Run keyword | ${vm_name}.Qemu Set Scheduler Policy
+| | Dpdk Testpmd Start | ${vm} | eal_coremask=0x1f | eal_mem_channels=4
+| | ... | pmd_fwd_mode=io | pmd_disable_hw_vlan=${True}
 | | Return From Keyword | ${vm}
 
 | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
-| | ... | DPDK testpmd. Qemu Guest is using 3 cores pinned to physical cores 5,
-| | ... | 6, 7 and 2048M. Testpmd is using 3 cores (1 main core and 2 cores
-| | ... | dedicated to io) socket-mem=1024, mem-channel=4, txq/rxq=2048,
-| | ... | burst=64, disable-hw-vlan, total-num-mbufs=65K, driver
-| | ... | usr/lib/librte_pmd_virtio.so and fwd mode is mac rewrite.
+| | ... | DPDK testpmd. Qemu Guest is using 5 cores pinned to physical cores
+| | ... | 5-9 and 2048M. Testpmd is using 5 cores (1 main core and 4 cores
+| | ... | dedicated to io) mem-channel=4, txq/rxq=256, burst=64,
+| | ... | disable-hw-vlan, disable-rss, driver usr/lib/librte_pmd_virtio.so
+| | ... | and fwd mode is mac rewrite.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node to start guest VM on. Type: dictionary
@@ -1194,33 +1381,37 @@
 | | ... | - vm_name - QemuUtil instance name. Type: string
 | | ... | - eth0_mac - MAC address of first Vhost interface. Type: string
 | | ... | - eth1_mac - MAC address of second Vhost interface. Type: string
+| | ... | - skip - number of cpus which will be skipped. Type: int
+| | ... | - count - number of cpus which will be allocated for qemu. Type: int
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| Guest VM with dpdk-testpmd for Vhost L2BD forwarding is setup \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \
-| | ... | \| 00:00:00:00:00:01 \| 00:00:00:00:00:02 \|
+| | ... | \| 00:00:00:00:00:01 \| 00:00:00:00:00:02 \| ${5} \| ${5} \|
+| | ...
 | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name}
-| | ...         | ${eth0_mac} | ${eth1_mac}
+| | ... | ${eth0_mac} | ${eth1_mac} | ${skip}=${5} | ${count}=${5}
+| | ...
 | | Import Library | resources.libraries.python.QemuUtils
-| | ...            | WITH NAME | ${vm_name}
+| | ... | WITH NAME | ${vm_name}
+| | ${dut_numa}= | Get interfaces numa node | ${dut_node}
+| | ... | ${dut1_if1} | ${dut1_if2}
+| | ${cpus}= | Cpu list per node | ${dut_node} | ${dut_numa}
+| | ${end_idx}= | Evaluate | ${skip} + ${count}
+| | ${qemu_cpus}= | Get Slice From List | ${cpus} | ${skip} | ${end_idx}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
 | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
-| | Run keyword | ${vm_name}.Qemu Set Smp | 3 | 3 | 1 | 1
+| | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1
 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048
-| | Run keyword | ${vm_name}.Qemu Set Huge Allocate
-| | Run keyword | ${vm_name}.Qemu Set Disk Image
-| | ...         | /var/lib/vm/csit-nested-1.3.img
+| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${glob_vm_image}
 | | ${vm}= | Run keyword | ${vm_name}.Qemu Start
-| | Run keyword | ${vm_name}.Qemu Set Affinity | 5 | 6 | 7
-| | Dpdk Testpmd Start | ${vm} | eal_coremask=0x7
-| | ...                | eal_mem_channels=4
-| | ...                | eal_socket_mem=1024
-| | ...                | pmd_fwd_mode=mac
-| | ...                | pmd_eth_peer_0=0,${eth0_mac}
-| | ...                | pmd_eth_peer_1=1,${eth1_mac}
-| | ...                | pmd_disable_hw_vlan=${True}
+| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
+| | Run keyword | ${vm_name}.Qemu Set Scheduler Policy
+| | Dpdk Testpmd Start | ${vm} | eal_coremask=0x1f
+| | ... | eal_mem_channels=4 | pmd_fwd_mode=mac | pmd_eth_peer_0=0,${eth0_mac}
+| | ... | pmd_eth_peer_1=1,${eth1_mac} | pmd_disable_hw_vlan=${True}
 | | Return From Keyword | ${vm}
 
 | Guest VM with Linux Bridge connected via vhost-user is setup
@@ -1234,23 +1425,34 @@
 | | ... | - sock1 - Socket path for first Vhost-User interface. Type: string
 | | ... | - sock2 - Socket path for second Vhost-User interface. Type: string
 | | ... | - vm_name - QemuUtil instance name. Type: string
+| | ... | - skip - number of cpus which will be skipped. Type: int
+| | ... | - count - number of cpus which will be allocated for qemu. Type: int
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| Guest VM with Linux Bridge connected via vhost-user is setup \
-| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \|
-| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name}
+| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${5} \
+| | ... | \| ${5} \|
+| | ...
+| | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name} | ${skip}=${5}
+| | ... | ${count}=${5}
+| | ...
 | | Import Library | resources.libraries.python.QemuUtils
-| | ...            | WITH NAME | ${vm_name}
+| | ... | WITH NAME | ${vm_name}
+| | ${dut_numa}= | Get interfaces numa node | ${dut_node}
+| | ... | ${dut1_if1} | ${dut1_if2}
+| | ${cpus}= | Cpu list per node | ${dut_node} | ${dut_numa}
+| | ${end_idx}= | Evaluate | ${skip} + ${count}
+| | ${qemu_cpus}= | Get Slice From List | ${cpus} | ${skip} | ${end_idx}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1}
 | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2}
 | | Run keyword | ${vm_name}.Qemu Set Node | ${dut_node}
-| | Run keyword | ${vm_name}.Qemu Set Smp | 3 | 3 | 1 | 1
+| | Run keyword | ${vm_name}.Qemu Set Smp | ${count} | ${count} | 1 | 1
 | | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048
-| | Run keyword | ${vm_name}.Qemu Set Huge Allocate
 | | Run keyword | ${vm_name}.Qemu Set Disk Image | ${glob_vm_image}
 | | ${vm}= | Run keyword | ${vm_name}.Qemu Start
-| | Run keyword | ${vm_name}.Qemu Set Affinity | 5 | 6 | 7
+| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus}
+| | Run keyword | ${vm_name}.Qemu Set Scheduler Policy
 | | ${br}= | Set Variable | br0
 | | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1}
 | | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2}
@@ -1457,11 +1659,11 @@
 | | ... | \| Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology \
 | | ... | \| ${dut1_dut2_ip4_address} \| ${dut1_tg_ip6_address} \
 | | ... | \| ${dut2_dut1_ip4_address} \| ${dut2_tg_ip6_address} \
-| | ... | \| ${prefix4} \| ${prefix6} \|
+| | ... | \| ${prefix6} \| ${prefix4} \|
 | | ...
 | | [Arguments] | ${dut1_dut2_ip4_address} | ${dut1_tg_ip6_address}
 | | ...         | ${dut2_dut1_ip4_address} | ${dut2_tg_ip6_address}
-| | ...         | ${prefix4} | ${prefix6}
+| | ...         | ${prefix6} | ${prefix4}
 | | Set Interface State | ${dut1} | ${dut1_if1} | up
 | | Set Interface State | ${dut1} | ${dut1_if2} | up
 | | Set Interface State | ${dut2} | ${dut2_if1} | up
@@ -1482,3 +1684,78 @@
 | | dut1_v4.set_arp | ${dut1_if2} | ${dut2_dut1_ip4_address} | ${dut2_if1_mac}
 | | dut2_v4.set_arp | ${dut2_if1} | ${dut1_dut2_ip4_address} | ${dut1_if2_mac}
 
+DPDK 2-node Performance Suite Setup with DUT's NIC model
+| | [Documentation]
+| | ... | Updates interfaces on all nodes and setup global
+| | ... | variables used in test cases based on interface model provided as an
+| | ... | argument. Initializes traffic generator. Initializes DPDK test
+| | ... | environment.
+| | ...
+| | ... | *Arguments:*
+| | ... | - topology_type - Topology type. Type: string
+| | ... | - nic_model - Interface model. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| DPDK 2-node Performance Suite Setup with DUT's NIC model \
+| | ... | \| L2 \| Intel-X520-DA2 \|
+| | [Arguments] | ${topology_type} | ${nic_model}
+| | 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}
+| | Initialize DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
+
+DPDK 3-node Performance Suite Setup with DUT's NIC model
+| | [Documentation]
+| | ... | Updates interfaces on all nodes and setup global
+| | ... | variables used in test cases based on interface model provided as an
+| | ... | argument. Initializes traffic generator. Initializes DPDK test
+| | ... | environment.
+| | ...
+| | ... | *Arguments:*
+| | ... | - topology_type - Topology type. Type: string
+| | ... | - nic_model - Interface model. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| 3-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
+| | [Arguments] | ${topology_type} | ${nic_model}
+| | 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}
+| | ...                          | ${dut2} | ${dut2_if2}
+| | ...                          | ${topology_type}
+| | Initialize DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | Initialize DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2}
+
+DPDK 3-node Performance Suite Teardown
+| | [Documentation]
+| | ... | Suite teardown phase with traffic generator teardown.
+| | ... | Cleanup DPDK test environment.
+| | ...
+| | Teardown traffic generator | ${tg}
+| | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | Cleanup DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2}
+
+DPDK 2-node Performance Suite Teardown
+| | [Documentation]
+| | ... | Suite teardown phase with traffic generator teardown.
+| | ... | Cleanup DPDK test environment.
+| | ...
+| | Teardown traffic generator | ${tg}
+| | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
+
+For DPDK Performance Test
+| | [Documentation]
+| | ... | Return TRUE if variable DPDK_TEST exist, otherwise FALSE.
+| | ${ret} | ${tmp}=  | Run Keyword And Ignore Error
+| | ... | Variable Should Exist | ${DPDK_TEST}
+| | Return From Keyword If | "${ret}" == "PASS" | ${TRUE}
+| | Return From Keyword | ${FALSE}
+