diff options
18 files changed, 1277 insertions, 157 deletions
diff --git a/resources/libraries/robot/l2/tagging.robot b/resources/libraries/robot/l2/tagging.robot index aa10c1032c..80dada454e 100644 --- a/resources/libraries/robot/l2/tagging.robot +++ b/resources/libraries/robot/l2/tagging.robot @@ -23,8 +23,8 @@ | Initialize VLAN sub-interfaces in 3-node circular topology | | [Arguments] | ${DUT1} | ${INT1} | ${DUT2} | ${INT2} | ${SUB_ID} -| | ... | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID} | ${TYPE_SUBIF} -| | [Documentation] | *Create two subinterfaces on DUTs.* +| | ... | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID} | ${TYPE_SUBIF} +| | [Documentation] | Create two subinterfaces on DUTs. | | ... | | ... | *Arguments:* | | ... | - DUT1 - Node to add sub-interface. @@ -44,14 +44,12 @@ | | ... | | ${INT1_name}= | Get interface name | ${DUT1} | ${INT1} | | ${subif_name_1} | ${subif_index_1}= | Create subinterface | ${DUT1} -| | ... | ${INT1_name} | ${SUB_ID} -| | ... | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID} -| | ... | ${TYPE_SUBIF} +| | ... | ${INT1_name} | ${SUB_ID} | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID} +| | ... | ${TYPE_SUBIF} | | ${INT2_name}= | Get interface name | ${DUT2} | ${INT2} | | ${subif_name_2} | ${subif_index_2}= | Create subinterface | ${DUT2} -| | ... | ${INT2_name} | ${SUB_ID} -| | ... | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID} -| | ... | ${TYPE_SUBIF} +| | ... | ${INT2_name} | ${SUB_ID} | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID} +| | ... | ${TYPE_SUBIF} | | Set Interface State | ${DUT1} | ${subif_index_1} | up | | Set Interface State | ${DUT2} | ${subif_index_2} | up | | Set Test Variable | ${subif_name_1} @@ -62,7 +60,7 @@ | Initialize VLAN dot1q sub-interfaces in circular topology | | [Arguments] | ${DUT1} | ${INT1} | ${DUT2}=${None} | ${INT2}=${None} | | ... | ${SUB_ID}=10 -| | [Documentation] | *Create two dot1q subinterfaces on DUTs.* +| | [Documentation] | Create two dot1q subinterfaces on DUTs. | | ... | | ... | *Arguments:* | | ... | - DUT1 - Node to add sub-interface. @@ -104,7 +102,7 @@ | Configure L2 tag rewrite method on interfaces | | [Arguments] | ${DUT1} | ${SUB_INT1} | ${DUT2}=${None} | ${SUB_INT2}=${None} | | ... | ${TAG_REWRITE_METHOD}=${None} -| | [Documentation] | *Setup tag rewrite on sub-interfaces on DUTs.* +| | [Documentation] | Setup tag rewrite on sub-interfaces on DUTs. | | ... | | ... | *Arguments:* | | ... | - DUT1 - Node to rewrite tags. @@ -118,10 +116,10 @@ | | ... | L2 Vlan tag rewrite | ${DUT2} | ${SUB_INT2} | ${TAG_REWRITE_METHOD} | Connect interfaces and VLAN sub-interfaces using L2XC -| | [Arguments] | ${DUT1} | ${INT1} | ${SUB_INT1} -| | ... | ${DUT2} | ${INT2} | ${SUB_INT2} -| | [Documentation] | *Add interface and subinterface to bidirectional -| | ... | L2-xconnect on DUTs.* +| | [Arguments] | ${DUT1} | ${INT1} | ${SUB_INT1} | ${DUT2}=${None} +| | ... | ${INT2}=${None} | ${SUB_INT2}=${None} +| | [Documentation] | Add interface and subinterface to bidirectional +| | ... | L2-xconnect on DUTs. | | ... | | ... | *Arguments:* | | ... | - DUT1 - Node to add bidirectional cross-connect. @@ -132,7 +130,8 @@ | | ... | - SUB_INT2 - Sub-interface to add to the cross-connect. | | ... | | Configure L2XC | ${DUT1} | ${INT1} | ${SUB_INT1} -| | Configure L2XC | ${DUT2} | ${INT2} | ${SUB_INT2} +| | Run Keyword Unless | ${DUT2} == ${None} +| | ... | Configure L2XC | ${DUT2} | ${INT2} | ${SUB_INT2} | Create vlan sub-interface | | [Documentation] | Create VLAN sub-interface on DUT and set admin status up. @@ -220,7 +219,9 @@ | | [Arguments] | ${dut_node} | ${interface} | ${tag_rewrite_method} | | ... | ${push_dot1q}=${True} | ${tag1_id}=${None} | ${tag2_id}=${None} | | ${result}= | Evaluate | isinstance($interface, int) -| | ${interface_name}= | Run Keyword If | ${result} | Set Variable | ${interface} -| | ... | ELSE | Get interface name | ${dut_node} | ${interface} -| | L2 Vlan Tag Rewrite | ${dut_node} | ${interface_name} | ${tag_rewrite_method} -| | ... | push_dot1q=${push_dot1q} | tag1_id=${tag1_id} | tag2_id=${tag2_id} +| | ${interface_name}= | Run Keyword If | ${result} +| | ... | Set Variable | ${interface} +| | ... | ELSE | Get interface name | ${dut_node} | ${interface} +| | L2 Vlan Tag Rewrite | ${dut_node} | ${interface_name} +| | ... | ${tag_rewrite_method} | push_dot1q=${push_dot1q} | tag1_id=${tag1_id} +| | ... | tag2_id=${tag2_id} diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 543e76e56d..fef3fc89f7 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -1789,11 +1789,13 @@ | | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${dut1_bd_id1} | | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${dut1_bd_id2} -| Initialize L2 bridge domains with VLAN dot1q sub-interfaces in a 3-node circular topology +| Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology | | [Documentation] -| | ... | Setup L2 bridge domain topology with learning enabled with VLAN -| | ... | between DUTs by connecting physical and vlan interfaces on each DUT. -| | ... | All interfaces are brought up. +| | ... | Setup L2 bridge domain topology with learning enabled with VLAN by +| | ... | connecting physical and vlan interfaces on each DUT. In case of 3-node +| | ... | topology create VLAN sub-interfaces between DUTs. In case of 2-node +| | ... | topology create VLAN sub-interface on dut1-if2 interface. All +| | ... | interfaces are brought up. | | ... | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer @@ -1814,16 +1816,30 @@ | | ... | | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | ... +| | ${dut2_status} | ${value}= | Run Keyword And Ignore Error +| | ... | Variable Should Exist | ${dut2} +| | ... | | Set interfaces in path up -| | Initialize VLAN dot1q sub-interfaces in circular topology +| | ... +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Initialize VLAN dot1q sub-interfaces in circular topology | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | Configure L2 tag rewrite method on interfaces -| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} -| | ... | ${tag_rewrite} +| | ... | ELSE | Initialize VLAN dot1q sub-interfaces in circular topology +| | ... | ${dut1} | ${dut1_if2} | SUB_ID=${subid} +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Configure L2 tag rewrite method on interfaces | ${dut1} +| | ... | ${subif_index_1} | ${dut2} | ${subif_index_2} | ${tag_rewrite} +| | ... | ELSE | Configure L2 tag rewrite method on interfaces +| | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} +| | ... | | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} | | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id1} -| | Add interface to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id2} -| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Add interface to bridge domain | ${dut2} | ${subif_index_2} +| | ... | ${bd_id2} +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Add interface to bridge domain | ${dut2} | ${dut2_if2} +| | ... | ${bd_id2} | Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology | | [Documentation] diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot index 6613cb16a2..b3425719e2 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-mrr.robot @@ -28,23 +28,22 @@ | ... | Test Template | Local Template | ... -| Documentation | *Raw results L2BD test cases with 802.1q test cases* +| Documentation | *Raw results L2BD with IEEE 802.1Q test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.\ -| ... | 802.1q tagging is applied on link between DUT1 and DUT2. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge\ -| ... | domain and MAC learning enabled. DUT1 and DUT2 tested with 2p10GE NIC -| ... | X520 Niantic by Intel. +| ... | domain and MAC learning enabled. DUT1 and DUT2 are tested with 2p10GE\ +| ... | NIC X520 Niantic by Intel. | ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\ | ... | at line rate and reports total received/sent packets over trial period.\ -| ... | Test packets are generated by TG on\ -| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\ -| ... | (flow-group per direction, 254 flows per flow-group) with all packets\ -| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\ -| ... | payload. MAC addresses are matching MAC addresses of the TG node\ -| ... | interfaces. +| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\ +| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per\ +| ... | flow-group) with all packets containing Ethernet header, IPv4 header\ +| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** @@ -62,8 +61,8 @@ *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] DUT runs L2BD config with VLAN. -| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. +| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. | | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... @@ -80,7 +79,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in a 3-node circular topology +| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot index 4706c1ec36..cafebdb6d0 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr.robot @@ -29,27 +29,25 @@ | ... | Test Template | Local Template | ... -| Documentation | *RFC2544: Pkt throughput L2BD test cases with 802.1q test\ -| ... | cases* +| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.\ -| ... | 802.1q tagging is applied on link between DUT1 and DUT2. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge\ -| ... | domain and MAC learning enabled. DUT1 and DUT2 tested with 2p10GE NIC -| ... | X520 Niantic by Intel. -| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop -| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop -| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage -| ... | of packets transmitted. NDR and PDR are discovered for different -| ... | Ethernet L2 frame sizes using MLRsearch library. -| ... | Test packets are generated by TG on\ -| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\ -| ... | (flow-group per direction, 254 flows per flow-group) with all packets\ -| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\ -| ... | payload. MAC addresses are matching MAC addresses of the TG node\ -| ... | interfaces. +| ... | domain and MAC learning enabled. DUT1 and DUT2 are tested with 2p10GE\ +| ... | NIC X520 Niantic by Intel. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library. Test packets are\ +| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61\ +| ... | and static payload. MAC addresses are matching MAC addresses of the TG\ +| ... | node interfaces. | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** @@ -67,9 +65,9 @@ *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] DUT runs L2BD config with VLAN. -| | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads. -| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ +| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm. | | ... | | ... | *Arguments:* | | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). @@ -87,7 +85,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in a 3-node circular topology +| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot index 0d91c61dcb..3da3ad3dac 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-mrr.robot @@ -29,22 +29,21 @@ | ... | Test Template | Local Template | ... -| Documentation | *Raw results L2XC with 802.1q test cases* +| Documentation | *Raw results L2XC with IEEE 802.1Q test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. 802.1q\ -| ... | tagging is applied on link between DUT1 and DUT2. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-\ -| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel. +| ... | connect. DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel. | ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\ | ... | at line rate and reports total received/sent packets over trial period.\ -| ... | Test packets are generated by TG on\ -| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\ -| ... | (flow-group per direction, 253 flows per flow-group) with all packets\ -| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\ -| ... | payload. MAC addresses are matching MAC addresses of the TG node\ -| ... | interfaces. +| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\ +| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per\ +| ... | flow-group) with all packets containing Ethernet header, IPv4 header\ +| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** @@ -59,8 +58,8 @@ *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] DUT runs L2XC config with VLAN dot1q with ${phy_cores} phy -| | ... | core(s). +| | ... | [Cfg] Each DUT runs L2XC config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. | | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... diff --git a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot index 191cfdb7f2..32a5f2c795 100644 --- a/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x520-dot1q-l2xcbase-ndrpdr.robot @@ -30,25 +30,24 @@ | ... | Test Template | Local Template | ... -| Documentation | *RFC2544: Pkt throughput L2XC with 802.1q test cases* +| Documentation | *RFC2544: Pkt throughput L2XC with IEEE 802.1Q test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. 802.1q\ -| ... | tagging is applied on link between DUT1 and DUT2. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-\ -| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X520 Niantic by Intel. -| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop -| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop -| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage -| ... | of packets transmitted. NDR and PDR are discovered for different -| ... | Ethernet L2 frame sizes using MLRsearch library. -| ... | Test packets are generated by TG on\ -| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\ -| ... | (flow-group per direction, 253 flows per flow-group) with all packets\ -| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\ -| ... | payload. MAC addresses are matching MAC addresses of the TG node\ -| ... | interfaces. +| ... | connect. DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library. Test packets are\ +| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61\ +| ... | and static payload. MAC addresses are matching MAC addresses of the TG\ +| ... | node interfaces. | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** @@ -63,9 +62,9 @@ *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] DUT runs L2XC config with VLAN dot1q with ${phy_cores} phy -| | ... | core(s). -| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ +| | ... | [Cfg] Each DUT runs L2XC config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm. | | ... | | ... | *Arguments:* | | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot index d034b1fd9f..e6269f7861 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot @@ -28,23 +28,22 @@ | ... | Test Template | Local Template | ... -| Documentation | *Raw results L2BD test cases with 802.1q test cases* +| Documentation | *Raw results L2BD with IEEE 802.1Q test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.\ -| ... | 802.1q tagging is applied on link between DUT1 and DUT2. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge\ -| ... | domain and MAC learning enabled. DUT1 and DUT2 tested with 2p10GE NIC -| ... | X710 by Intel. +| ... | domain and MAC learning enabled. DUT1 and DUT2 are tested with 2p10GE\ +| ... | NIC X710 by Intel. | ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\ | ... | at line rate and reports total received/sent packets over trial period.\ -| ... | Test packets are generated by TG on\ -| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\ -| ... | (flow-group per direction, 254 flows per flow-group) with all packets\ -| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\ -| ... | payload. MAC addresses are matching MAC addresses of the TG node\ -| ... | interfaces. +| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\ +| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per\ +| ... | flow-group) with all packets containing Ethernet header, IPv4 header\ +| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** @@ -62,8 +61,8 @@ *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] DUT runs L2BD config with VLAN with ${phy_cores} phy -| | ... | core(s). +| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. | | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... @@ -80,7 +79,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in a 3-node circular topology +| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | Then Traffic should pass with maximum rate | | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot index 76a552a90f..0b1ed19aeb 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot @@ -29,26 +29,25 @@ | ... | Test Template | Local Template | ... -| Documentation | *RFC2544: Pkt throughput L2BD test cases with 802.1q* +| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.\ -| ... | 802.1q tagging is applied on link between DUT1 and DUT2. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 bridge\ -| ... | domain and MAC learning enabled. DUT1 and DUT2 tested with 2p10GE NIC -| ... | X710 by Intel. -| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop -| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop -| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage -| ... | of packets transmitted. NDR and PDR are discovered for different -| ... | Ethernet L2 frame sizes using MLRsearch library. -| ... | Test packets are generated by TG on\ -| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\ -| ... | (flow-group per direction, 254 flows per flow-group) with all packets\ -| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\ -| ... | payload. MAC addresses are matching MAC addresses of the TG node\ -| ... | interfaces. +| ... | domain and MAC learning enabled. DUT1 and DUT2 are tested with 2p10GE\ +| ... | NIC X710 by Intel. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library. Test packets are\ +| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61\ +| ... | and static payload. MAC addresses are matching MAC addresses of the TG\ +| ... | node interfaces. | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** @@ -66,9 +65,9 @@ *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] DUT runs L2BD config with VLAN with ${phy_cores} phy -| | ... | core(s). -| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ +| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm. | | ... | | ... | *Arguments:* | | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). @@ -86,7 +85,7 @@ | | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg | | ... | ${s_limit} | ${framesize} | overhead=${overhead} | | And Apply startup configuration on all VPP DUTs -| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in a 3-node circular topology +| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology | | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | Then Find NDR and PDR intervals using optimized search | | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot index 5d143f36b5..6061adc577 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-mrr.robot @@ -29,22 +29,21 @@ | ... | Test Template | Local Template | ... -| Documentation | *Raw results L2XC with 802.1q test cases* +| Documentation | *Raw results L2XC with IEEE 802.1Q test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. 802.1q\ -| ... | tagging is applied on link between DUT1 and DUT2. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-\ -| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel. +| ... | connect. DUT1 and DUT2 are tested with 2p10GE NIC X710 by Intel. | ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\ | ... | at line rate and reports total received/sent packets over trial period.\ -| ... | Test packets are generated by TG on\ -| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\ -| ... | (flow-group per direction, 253 flows per flow-group) with all packets\ -| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\ -| ... | payload. MAC addresses are matching MAC addresses of the TG node\ -| ... | interfaces. +| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\ +| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per\ +| ... | flow-group) with all packets containing Ethernet header, IPv4 header\ +| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** @@ -59,8 +58,8 @@ *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] DUT runs L2XC config with VLAN dot1q with ${phy_cores} phy -| | ... | core(s). +| | ... | [Cfg] Each DUT runs L2XC config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. | | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ | | ... | trial throughput test. | | ... diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot index 0bf0d59930..c27941156a 100644 --- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot +++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot @@ -30,25 +30,24 @@ | ... | Test Template | Local Template | ... -| Documentation | *RFC2544: Pkt throughput L2XC with 802.1q test cases* +| Documentation | *RFC2544: Pkt throughput L2XC with IEEE 802.1Q test cases* | ... | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\ | ... | with single links between nodes. -| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. 802.1q\ -| ... | tagging is applied on link between DUT1 and DUT2. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1 and DUT2. | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2 cross-\ -| ... | connect. DUT1 and DUT2 tested with 2p10GE NIC X710 by Intel. -| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop -| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop -| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage -| ... | of packets transmitted. NDR and PDR are discovered for different -| ... | Ethernet L2 frame sizes using MLRsearch library. -| ... | Test packets are generated by TG on\ -| ... | links to DUTs. TG traffic profile contains two L3 flow-groups\ -| ... | (flow-group per direction, 253 flows per flow-group) with all packets\ -| ... | containing Ethernet header, IPv4 header with IP protocol=61 and static\ -| ... | payload. MAC addresses are matching MAC addresses of the TG node\ -| ... | interfaces. +| ... | connect. DUT1 and DUT2 are tested with 2p10GE NIC X710 by Intel. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library. Test packets are\ +| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61\ +| ... | and static payload. MAC addresses are matching MAC addresses of the TG\ +| ... | node interfaces. | ... | *[Ref] Applicable standard specifications:* RFC2544. *** Variables *** @@ -63,8 +62,8 @@ *** Keywords *** | Local Template | | [Documentation] -| | ... | [Cfg] DUT runs L2XC config with VLAN dot1q with ${phy_cores} phy -| | ... | core(s). +| | ... | [Cfg] Each DUT runs L2XC config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. | | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ | | ... | | ... | *Arguments:* diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot new file mode 100644 index 0000000000..3489910cdb --- /dev/null +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-mrr.robot @@ -0,0 +1,133 @@ +# Copyright (c) 2018 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/performance/performance_setup.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR +| ... | NIC_Intel-X710 | BASE | DOT1Q | L2BDMACLRN +| ... +| Suite Setup | Set up 2-node performance topology with DUT's NIC model +| ... | L2 | Intel-X710 +| ... +| Suite Teardown | Tear down 2-node performance topology +| ... +| Test Setup | Set up performance test +| ... +| Test Teardown | Tear down performance mrr test +| ... +| Test Template | Local Template +| ... +| Documentation | *Raw results L2BD with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ +| ... | single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1-if2 and TG-if2. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\ +| ... | and MAC learning enabled. DUT1 is tested with 2p10GE NIC X710 by Intel. +| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\ +| ... | at line rate and reports total received/sent packets over trial period.\ +| ... | Test packets are generated by TG on links to DUT1. TG traffic profile\ +| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per\ +| ... | flow-group) with all packets containing Ethernet header, IPv4 header\ +| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +| ${overhead}= | ${4} +# X710-DA2 bandwidth limit +| ${s_limit}= | ${10000000000} +# Bridge domain IDs +| ${bd_id1}= | 1 +| ${bd_id2}= | 2 +# Traffic profile: +| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ +| | ... | trial throughput test. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add PCI devices to all DUTs +| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg +| | ... | ${s_limit} | ${framesize} | overhead=${overhead} +| | And Apply startup configuration on all VPP DUTs +| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} +| | Then Traffic should pass with maximum rate +| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} + +*** Test Cases *** +| tc01-64B-1c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 64B | 1C +| | framesize=${64} | phy_cores=${1} + +| tc02-64B-2c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 64B | 2C +| | framesize=${64} | phy_cores=${2} + +| tc03-64B-4c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 64B | 4C +| | framesize=${64} | phy_cores=${4} + +| tc04-1518B-1c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 1518B | 1C +| | framesize=${1518} | phy_cores=${1} + +| tc05-1518B-2c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 1518B | 2C +| | framesize=${1518} | phy_cores=${2} + +| tc06-1518B-4c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 1518B | 4C +| | framesize=${1518} | phy_cores=${4} + +| tc07-9000B-1c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 9000B | 1C +| | framesize=${9000} | phy_cores=${1} + +| tc08-9000B-2c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 9000B | 2C +| | framesize=${9000} | phy_cores=${2} + +| tc09-9000B-4c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 9000B | 4C +| | framesize=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | IMIX | 1C +| | framesize=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | IMIX | 2C +| | framesize=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | IMIX | 4C +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot new file mode 100644 index 0000000000..07c774df2c --- /dev/null +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot @@ -0,0 +1,139 @@ +# Copyright (c) 2018 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/performance/performance_setup.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR +| ... | NIC_Intel-X710 | BASE | DOT1Q | L2BDMACLRN +| ... +| Suite Setup | Set up 2-node performance topology with DUT's NIC model +| ... | L2 | Intel-X710 +| ... +| Suite Teardown | Tear down 2-node performance topology +| ... +| Test Setup | Set up performance test +| ... +| Test Teardown | Tear down performance discovery test | ${min_rate}pps +| ... | ${framesize} | ${traffic_profile} +| ... +| Test Template | Local Template +| ... +| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ +| ... | single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1-if2 and TG-if2. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\ +| ... | and MAC learning enabled. DUT1 is tested with 2p10GE NIC X710 by Intel. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library. Test packets are\ +| ... | generated by TG on links to DUT1. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61\ +| ... | and static payload. MAC addresses are matching MAC addresses of the TG\ +| ... | node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +| ${overhead}= | ${4} +# X710-DA2 bandwidth limit +| ${s_limit}= | ${10000000000} +# Bridge domain IDs +| ${bd_id1}= | 1 +| ${bd_id2}= | 2 +# Traffic profile: +| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Set Test Variable | ${framesize} +| | Set Test Variable | ${min_rate} | ${10000} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add PCI devices to all DUTs +| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg +| | ... | ${s_limit} | ${framesize} | overhead=${overhead} +| | And Apply startup configuration on all VPP DUTs +| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} +| | Then Find NDR and PDR intervals using optimized search +| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} + +*** Test Cases *** +| tc01-64B-1c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 1C +| | framesize=${64} | phy_cores=${1} + +| tc02-64B-2c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 2C +| | framesize=${64} | phy_cores=${2} + +| tc03-64B-4c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 4C +| | framesize=${64} | phy_cores=${4} + +| tc04-1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 1C +| | framesize=${1518} | phy_cores=${1} + +| tc05-1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 2C +| | framesize=${1518} | phy_cores=${2} + +| tc06-1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 4C +| | framesize=${1518} | phy_cores=${4} + +| tc07-9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 1C +| | framesize=${9000} | phy_cores=${1} + +| tc08-9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 2C +| | framesize=${9000} | phy_cores=${2} + +| tc09-9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 4C +| | framesize=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 1C +| | framesize=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 2C +| | framesize=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 4C +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-mrr.robot new file mode 100644 index 0000000000..bdf6575562 --- /dev/null +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-mrr.robot @@ -0,0 +1,136 @@ +# Copyright (c) 2018 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/l2/tagging.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR +| ... | NIC_Intel-X710 | L2XCFWD | BASE | DOT1Q +| ... +| Suite Setup | Set up 2-node performance topology with DUT's NIC model +| ... | L2 | Intel-X710 +| ... +| Suite Teardown | Tear down 2-node performance topology +| ... +| Test Setup | Set up performance test +| ... +| Test Teardown | Tear down performance mrr test +| ... +| Test Template | Local Template +| ... +| Documentation | *Raw results L2XC with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ +| ... | single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1-if2 and TG-if2. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross- connect.\ +| ... | DUT1 is tested with 2p10GE NIC X710 by Intel. +| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\ +| ... | at line rate and reports total received/sent packets over trial period.\ +| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\ +| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per\ +| ... | flow-group) with all packets containing Ethernet header, IPv4 header\ +| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +| ${overhead}= | ${4} +# X710-DA2 bandwidth limit +| ${s_limit}= | ${10000000000} +# Traffic profile: +| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs L2XC config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ +| | ... | trial throughput test. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add PCI devices to all DUTs +| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg +| | ... | ${s_limit} | ${framesize} | overhead=${overhead} +| | And Apply startup configuration on all VPP DUTs +| | And Set interfaces in path up +| | When Initialize VLAN dot1q sub-interfaces in circular topology +| | ... | ${dut1} | ${dut1_if2} | SUB_ID=${subid} +| | And Configure L2 tag rewrite method on interfaces +| | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} +| | And Connect interfaces and VLAN sub-interfaces using L2XC +| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} +| | Then Traffic should pass with maximum rate +| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} + +*** Test Cases *** +| tc01-64B-1c-dot1q-l2xcbase-mrr +| | [Tags] | 64B | 1C +| | framesize=${64} | phy_cores=${1} + +| tc02-64B-2c-dot1q-l2xcbase-mrr +| | [Tags] | 64B | 2C +| | framesize=${64} | phy_cores=${2} + +| tc03-64B-4c-dot1q-l2xcbase-mrr +| | [Tags] | 64B | 4C +| | framesize=${64} | phy_cores=${4} + +| tc04-1518B-1c-dot1q-l2xcbase-mrr +| | [Tags] | 1518B | 1C +| | framesize=${1518} | phy_cores=${1} + +| tc05-1518B-2c-dot1q-l2xcbase-mrr +| | [Tags] | 1518B | 2C +| | framesize=${1518} | phy_cores=${2} + +| tc06-1518B-4c-dot1q-l2xcbase-mrr +| | [Tags] | 1518B | 4C +| | framesize=${1518} | phy_cores=${4} + +| tc07-9000B-1c-dot1q-l2xcbase-mrr +| | [Tags] | 9000B | 1C +| | framesize=${9000} | phy_cores=${1} + +| tc08-9000B-2c-dot1q-l2xcbase-mrr +| | [Tags] | 9000B | 2C +| | framesize=${9000} | phy_cores=${2} + +| tc09-9000B-4c-dot1q-l2xcbase-mrr +| | [Tags] | 9000B | 4C +| | framesize=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-dot1q-l2xcbase-mrr +| | [Tags] | IMIX | 1C +| | framesize=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-dot1q-l2xcbase-mrr +| | [Tags] | IMIX | 2C +| | framesize=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-dot1q-l2xcbase-mrr +| | [Tags] | IMIX | 4C +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot new file mode 100644 index 0000000000..c82e63ad22 --- /dev/null +++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot @@ -0,0 +1,141 @@ +# Copyright (c) 2018 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/l2/tagging.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR +| ... | NIC_Intel-X710 | L2XCFWD | BASE | DOT1Q +| ... +| Suite Setup | Set up 2-node performance topology with DUT's NIC model +| ... | L2 | Intel-X710 +| ... +| Suite Teardown | Tear down 2-node performance topology +| ... +| Test Setup | Set up performance test +| ... +| Test Teardown | Tear down performance discovery test | ${min_rate}pps +| ... | ${framesize} | ${traffic_profile} +| ... +| Test Template | Local Template +| ... +| Documentation | *RFC2544: Pkt throughput L2XC with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ +| ... | single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1-if2 and TG-if2. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross- connect.\ +| ... | DUT1 is tested with 2p10GE NIC X710 by Intel. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library. Test packets are\ +| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61\ +| ... | and static payload. MAC addresses are matching MAC addresses of the TG\ +| ... | node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +| ${overhead}= | ${4} +# X710-DA2 bandwidth limit +| ${s_limit}= | ${10000000000} +# Traffic profile: +| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs L2XC config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Set Test Variable | ${framesize} +| | Set Test Variable | ${min_rate} | ${10000} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add PCI devices to all DUTs +| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg +| | ... | ${s_limit} | ${framesize} | overhead=${overhead} +| | And Apply startup configuration on all VPP DUTs +| | When Initialize VLAN dot1q sub-interfaces in circular topology +| | ... | ${dut1} | ${dut1_if2} | SUB_ID=${subid} +| | And Configure L2 tag rewrite method on interfaces +| | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} +| | And Connect interfaces and VLAN sub-interfaces using L2XC +| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} +| | Then Find NDR and PDR intervals using optimized search +| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} + +*** Test Cases *** +| tc01-64B-1c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 64B | 1C +| | framesize=${64} | phy_cores=${1} + +| tc02-64B-2c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 64B | 2C +| | framesize=${64} | phy_cores=${2} + +| tc03-64B-4c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 64B | 4C +| | framesize=${64} | phy_cores=${4} + +| tc04-1518B-1c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 1518B | 1C +| | framesize=${1518} | phy_cores=${1} + +| tc05-1518B-2c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 1518B | 2C +| | framesize=${1518} | phy_cores=${2} + +| tc06-1518B-4c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 1518B | 4C +| | framesize=${1518} | phy_cores=${4} + +| tc07-9000B-1c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 9000B | 1C +| | framesize=${9000} | phy_cores=${1} + +| tc08-9000B-2c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 9000B | 2C +| | framesize=${9000} | phy_cores=${2} + +| tc09-9000B-4c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 9000B | 4C +| | framesize=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-dot1q-l2xcbase-ndrpdr +| | [Tags] | IMIX | 1C +| | framesize=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-dot1q-l2xcbase-ndrpdr +| | [Tags] | IMIX | 2C +| | framesize=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-dot1q-l2xcbase-ndrpdr +| | [Tags] | IMIX | 4C +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-mrr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-mrr.robot new file mode 100644 index 0000000000..283ab6b10d --- /dev/null +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-mrr.robot @@ -0,0 +1,137 @@ +# Copyright (c) 2018 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/performance/performance_setup.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR +| ... | NIC_Intel-XXV710 | BASE | DOT1Q | L2BDMACLRN +| ... +| Suite Setup | Set up 2-node performance topology with DUT's NIC model +| ... | L2 | Intel-XXV710 +| ... +| Suite Teardown | Tear down 2-node performance topology +| ... +| Test Setup | Set up performance test +| ... +| Test Teardown | Tear down performance mrr test +| ... +| Test Template | Local Template +| ... +| Documentation | *Raw results L2BD with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ +| ... | single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1-if2 and TG-if2. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\ +| ... | and MAC learning enabled. DUT1 is tested with 2p25GE NIC XXV710 by\ +| ... | Intel. +| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\ +| ... | at line rate and reports total received/sent packets over trial period.\ +| ... | Test packets are generated by TG on links to DUT1. TG traffic profile\ +| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per\ +| ... | flow-group) with all packets containing Ethernet header, IPv4 header\ +| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +| ${overhead}= | ${4} +# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps +| ${s_24.5G}= | ${24500000000} +# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps +| ${s_18.75Mpps}= | ${18750000} +# Bridge domain IDs +| ${bd_id1}= | 1 +| ${bd_id2}= | 2 +# Traffic profile: +| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ +| | ... | trial throughput test. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add PCI devices to all DUTs +| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg +| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} +| | ... | overhead=${overhead} +| | And Apply startup configuration on all VPP DUTs +| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} +| | Then Traffic should pass with maximum rate +| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} + +*** Test Cases *** +| tc01-64B-1c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 64B | 1C +| | framesize=${64} | phy_cores=${1} + +| tc02-64B-2c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 64B | 2C +| | framesize=${64} | phy_cores=${2} + +| tc03-64B-4c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 64B | 4C +| | framesize=${64} | phy_cores=${4} + +| tc04-1518B-1c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 1518B | 1C +| | framesize=${1518} | phy_cores=${1} + +| tc05-1518B-2c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 1518B | 2C +| | framesize=${1518} | phy_cores=${2} + +| tc06-1518B-4c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 1518B | 4C +| | framesize=${1518} | phy_cores=${4} + +| tc07-9000B-1c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 9000B | 1C +| | framesize=${9000} | phy_cores=${1} + +| tc08-9000B-2c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 9000B | 2C +| | framesize=${9000} | phy_cores=${2} + +| tc09-9000B-4c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | 9000B | 4C +| | framesize=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | IMIX | 1C +| | framesize=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | IMIX | 2C +| | framesize=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-mrr +| | [Tags] | IMIX | 4C +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr.robot new file mode 100644 index 0000000000..0934bc1f2b --- /dev/null +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr.robot @@ -0,0 +1,143 @@ +# Copyright (c) 2018 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/performance/performance_setup.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR +| ... | NIC_Intel-XXV710 | BASE | DOT1Q | L2BDMACLRN +| ... +| Suite Setup | Set up 2-node performance topology with DUT's NIC model +| ... | L2 | Intel-XXV710 +| ... +| Suite Teardown | Tear down 2-node performance topology +| ... +| Test Setup | Set up performance test +| ... +| Test Teardown | Tear down performance discovery test | ${min_rate}pps +| ... | ${framesize} | ${traffic_profile} +| ... +| Test Template | Local Template +| ... +| Documentation | *RFC2544: Pkt throughput L2BD with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ +| ... | single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1-if2 and TG-if2. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge domain\ +| ... | and MAC learning enabled. DUT1 is tested with 2p25GE NIC XXV710 by\ +| ... | Intel. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library. Test packets are\ +| ... | generated by TG on links to DUT1. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61\ +| ... | and static payload. MAC addresses are matching MAC addresses of the TG\ +| ... | node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +| ${overhead}= | ${4} +# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps +| ${s_24.5G}= | ${24500000000} +# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps +| ${s_18.75Mpps}= | ${18750000} +# Bridge domain IDs +| ${bd_id1}= | 1 +| ${bd_id2}= | 2 +# Traffic profile: +| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs L2BD config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Set Test Variable | ${framesize} +| | Set Test Variable | ${min_rate} | ${10000} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add PCI devices to all DUTs +| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg +| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} +| | ... | overhead=${overhead} +| | And Apply startup configuration on all VPP DUTs +| | When Initialize L2 bridge domains with VLAN dot1q sub-interfaces in circular topology +| | ... | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} +| | Then Find NDR and PDR intervals using optimized search +| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} + +*** Test Cases *** +| tc01-64B-1c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 1C +| | framesize=${64} | phy_cores=${1} + +| tc02-64B-2c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 2C +| | framesize=${64} | phy_cores=${2} + +| tc03-64B-4c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 64B | 4C +| | framesize=${64} | phy_cores=${4} + +| tc04-1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 1C +| | framesize=${1518} | phy_cores=${1} + +| tc05-1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 2C +| | framesize=${1518} | phy_cores=${2} + +| tc06-1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 1518B | 4C +| | framesize=${1518} | phy_cores=${4} + +| tc07-9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 1C +| | framesize=${9000} | phy_cores=${1} + +| tc08-9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 2C +| | framesize=${9000} | phy_cores=${2} + +| tc09-9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | 9000B | 4C +| | framesize=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 1C +| | framesize=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 2C +| | framesize=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr +| | [Tags] | IMIX | 4C +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2xcbase-mrr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2xcbase-mrr.robot new file mode 100644 index 0000000000..be570f5893 --- /dev/null +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2xcbase-mrr.robot @@ -0,0 +1,139 @@ +# Copyright (c) 2018 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/l2/tagging.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR +| ... | NIC_Intel-XXV710 | L2XCFWD | BASE | DOT1Q +| ... +| Suite Setup | Set up 2-node performance topology with DUT's NIC model +| ... | L2 | Intel-XXV710 +| ... +| Suite Teardown | Tear down 2-node performance topology +| ... +| Test Setup | Set up performance test +| ... +| Test Teardown | Tear down performance mrr test +| ... +| Test Template | Local Template +| ... +| Documentation | *Raw results L2XC with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ +| ... | single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1-if2 and TG-if2. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross- connect.\ +| ... | DUT1 is tested with 2p25GE NIC XXV710 by Intel. +| ... | *[Ver] TG verification:* In MaxReceivedRate tests TG sends traffic\ +| ... | at line rate and reports total received/sent packets over trial period.\ +| ... | Test packets are generated by TG on links to DUTs. TG traffic profile\ +| ... | contains two L3 flow-groups (flow-group per direction, 254 flows per\ +| ... | flow-group) with all packets containing Ethernet header, IPv4 header\ +| ... | with IP protocol=61 and static payload. MAC addresses are matching MAC\ +| ... | addresses of the TG node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +| ${overhead}= | ${4} +# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps +| ${s_24.5G}= | ${24500000000} +# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps +| ${s_18.75Mpps}= | ${18750000} +# Traffic profile: +| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs L2XC config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure MaxReceivedRate for ${framesize}B frames using single\ +| | ... | trial throughput test. +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add PCI devices to all DUTs +| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg +| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} +| | ... | overhead=${overhead} +| | And Apply startup configuration on all VPP DUTs +| | And Set interfaces in path up +| | When Initialize VLAN dot1q sub-interfaces in circular topology +| | ... | ${dut1} | ${dut1_if2} | SUB_ID=${subid} +| | And Configure L2 tag rewrite method on interfaces +| | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} +| | And Connect interfaces and VLAN sub-interfaces using L2XC +| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} +| | Then Traffic should pass with maximum rate +| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile} + +*** Test Cases *** +| tc01-64B-1c-dot1q-l2xcbase-mrr +| | [Tags] | 64B | 1C +| | framesize=${64} | phy_cores=${1} + +| tc02-64B-2c-dot1q-l2xcbase-mrr +| | [Tags] | 64B | 2C +| | framesize=${64} | phy_cores=${2} + +| tc03-64B-4c-dot1q-l2xcbase-mrr +| | [Tags] | 64B | 4C +| | framesize=${64} | phy_cores=${4} + +| tc04-1518B-1c-dot1q-l2xcbase-mrr +| | [Tags] | 1518B | 1C +| | framesize=${1518} | phy_cores=${1} + +| tc05-1518B-2c-dot1q-l2xcbase-mrr +| | [Tags] | 1518B | 2C +| | framesize=${1518} | phy_cores=${2} + +| tc06-1518B-4c-dot1q-l2xcbase-mrr +| | [Tags] | 1518B | 4C +| | framesize=${1518} | phy_cores=${4} + +| tc07-9000B-1c-dot1q-l2xcbase-mrr +| | [Tags] | 9000B | 1C +| | framesize=${9000} | phy_cores=${1} + +| tc08-9000B-2c-dot1q-l2xcbase-mrr +| | [Tags] | 9000B | 2C +| | framesize=${9000} | phy_cores=${2} + +| tc09-9000B-4c-dot1q-l2xcbase-mrr +| | [Tags] | 9000B | 4C +| | framesize=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-dot1q-l2xcbase-mrr +| | [Tags] | IMIX | 1C +| | framesize=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-dot1q-l2xcbase-mrr +| | [Tags] | IMIX | 2C +| | framesize=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-dot1q-l2xcbase-mrr +| | [Tags] | IMIX | 4C +| | framesize=IMIX_v4_1 | phy_cores=${4} diff --git a/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2xcbase-ndrpdr.robot new file mode 100644 index 0000000000..5b01304b98 --- /dev/null +++ b/tests/vpp/perf/l2/2n1l-25ge2p1xxv710-dot1q-l2xcbase-ndrpdr.robot @@ -0,0 +1,144 @@ +# Copyright (c) 2018 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +*** Settings *** +| Resource | resources/libraries/robot/performance/performance_setup.robot +| Resource | resources/libraries/robot/l2/tagging.robot +| ... +| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR +| ... | NIC_Intel-XXV710 | L2XCFWD | BASE | DOT1Q +| ... +| Suite Setup | Set up 2-node performance topology with DUT's NIC model +| ... | L2 | Intel-XXV710 +| ... +| Suite Teardown | Tear down 2-node performance topology +| ... +| Test Setup | Set up performance test +| ... +| Test Teardown | Tear down performance discovery test | ${min_rate}pps +| ... | ${framesize} | ${traffic_profile} +| ... +| Test Template | Local Template +| ... +| Documentation | *RFC2544: Pkt throughput L2XC with IEEE 802.1Q test cases* +| ... +| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with\ +| ... | single links between nodes. +| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 cross connect. IEEE\ +| ... | 802.1Q tagging is applied on link between DUT1-if2 and TG-if2. +| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross- connect.\ +| ... | DUT1 is tested with 2p25GE NIC XXV710 by Intel. +| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\ +| ... | Rate) with zero packet loss tolerance or throughput PDR (Partial Drop\ +| ... | Rate) with non-zero packet loss tolerance (LT) expressed in percentage\ +| ... | of packets transmitted. NDR and PDR are discovered for different\ +| ... | Ethernet L2 frame sizes using MLRsearch library. Test packets are\ +| ... | generated by TG on links to DUTs. TG traffic profile contains two L3\ +| ... | flow-groups (flow-group per direction, 254 flows per flow-group) with\ +| ... | all packets containing Ethernet header, IPv4 header with IP protocol=61\ +| ... | and static payload. MAC addresses are matching MAC addresses of the TG\ +| ... | node interfaces. +| ... | *[Ref] Applicable standard specifications:* RFC2544. + +*** Variables *** +| ${subid}= | 10 +| ${tag_rewrite}= | pop-1 +| ${overhead}= | ${4} +# XXV710-DA2 bandwidth limit ~49Gbps/2=24.5Gbps +| ${s_24.5G}= | ${24500000000} +# XXV710-DA2 Mpps limit 37.5Mpps/2=18.75Mpps +| ${s_18.75Mpps}= | ${18750000} +# Traffic profile: +| ${traffic_profile}= | trex-sl-2n-dot1qip4asym-ip4src254 + +*** Keywords *** +| Local Template +| | [Documentation] +| | ... | [Cfg] Each DUT runs L2XC config with VLAN and uses ${phy_cores}\ +| | ... | physical core(s) for worker threads. +| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\ +| | ... +| | ... | *Arguments:* +| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1). +| | ... | Type: integer, string +| | ... | - phy_cores - Number of physical cores. Type: integer +| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer +| | ... +| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None} +| | ... +| | Set Test Variable | ${framesize} +| | Set Test Variable | ${min_rate} | ${10000} +| | ... +| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq} +| | And Add PCI devices to all DUTs +| | ${max_rate} | ${jumbo} = | Get Max Rate And Jumbo And Handle Multi Seg +| | ... | ${s_24.5G} | ${framesize} | pps_limit=${s_18.75Mpps} +| | ... | overhead=${overhead} +| | And Apply startup configuration on all VPP DUTs +| | When Initialize VLAN dot1q sub-interfaces in circular topology +| | ... | ${dut1} | ${dut1_if2} | SUB_ID=${subid} +| | And Configure L2 tag rewrite method on interfaces +| | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} +| | And Connect interfaces and VLAN sub-interfaces using L2XC +| | ... | ${dut1} | ${dut1_if1} | ${subif_index_1} +| | Then Find NDR and PDR intervals using optimized search +| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate} + +*** Test Cases *** +| tc01-64B-1c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 64B | 1C +| | framesize=${64} | phy_cores=${1} + +| tc02-64B-2c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 64B | 2C +| | framesize=${64} | phy_cores=${2} + +| tc03-64B-4c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 64B | 4C +| | framesize=${64} | phy_cores=${4} + +| tc04-1518B-1c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 1518B | 1C +| | framesize=${1518} | phy_cores=${1} + +| tc05-1518B-2c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 1518B | 2C +| | framesize=${1518} | phy_cores=${2} + +| tc06-1518B-4c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 1518B | 4C +| | framesize=${1518} | phy_cores=${4} + +| tc07-9000B-1c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 9000B | 1C +| | framesize=${9000} | phy_cores=${1} + +| tc08-9000B-2c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 9000B | 2C +| | framesize=${9000} | phy_cores=${2} + +| tc09-9000B-4c-dot1q-l2xcbase-ndrpdr +| | [Tags] | 9000B | 4C +| | framesize=${9000} | phy_cores=${4} + +| tc10-IMIX-1c-dot1q-l2xcbase-ndrpdr +| | [Tags] | IMIX | 1C +| | framesize=IMIX_v4_1 | phy_cores=${1} + +| tc11-IMIX-2c-dot1q-l2xcbase-ndrpdr +| | [Tags] | IMIX | 2C +| | framesize=IMIX_v4_1 | phy_cores=${2} + +| tc12-IMIX-4c-dot1q-l2xcbase-ndrpdr +| | [Tags] | IMIX | 4C +| | framesize=IMIX_v4_1 | phy_cores=${4} |