Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Align suite/test teardown/setup
[csit.git]
/
tests
/
vpp
/
perf
/
l2
/
2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
diff --git
a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
index
377ad7e
..
893b615
100644
(file)
--- a/
tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
+++ b/
tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
@@
-1,4
+1,4
@@
-# Copyright (c) 201
8
Cisco and/or its affiliates.
+# Copyright (c) 201
9
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:
# 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:
@@
-12,34
+12,30
@@
# limitations under the License.
*** Settings ***
# limitations under the License.
*** Settings ***
-| Resource | resources/libraries/robot/
performance/performance_setup
.robot
+| Resource | resources/libraries/robot/
shared/default
.robot
| ...
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
| ... | NIC_Intel-X710 | ETH | L2PATCH | BASE
| ...
| ...
| Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
| ... | NIC_Intel-X710 | ETH | L2PATCH | BASE
| ...
-| Suite Setup | Set up 2-node performance topology with DUT's NIC model
-| ... | L2 | Intel-X710
-| Suite Teardown | Tear down 2-node performance topology
+| Suite Setup | Setup suite single link | performance
+| Suite Teardown | Tear down suite | performance
+| Test Setup | Setup test
+| Test Teardown | Tear down test | performance
| ...
| ...
-| Test
Setup | Set up performance test
+| Test
Template | Local Template
| ...
| ...
-| Test Teardown | Tear down performance discovery test | ${min_rate}pps
-| ... | ${framesize} | ${traffic_profile}
-| ...
-| Test Template | Local template
-| ...
-| Documentation | *Raw results L2patch test cases*
+| Documentation | *RFC2544: Pkt throughput L2patch test cases*
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
| ... | with single links between nodes.
| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 patch.
| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 patch\
| ...
| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology
| ... | with single links between nodes.
| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 patch.
| ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 patch\
-| ... | DUT1 tested with
2p10GE NIC X710 by Intel.
+| ... | DUT1 tested with
${nic_name}.\
| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
| ... | *[Ver] TG verification:* TG finds and reports throughput NDR (Non Drop\
-| ... | Rate) with zero packet loss tolerance
or
throughput PDR (Partial Drop\
+| ... | Rate) with zero packet loss tolerance
and
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\
| ... | 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\
+| ... | 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\
| ... | 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\
@@
-48,83
+44,82
@@
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
| ... | *[Ref] Applicable standard specifications:* RFC2544.
*** Variables ***
-# X710-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| @{plugins_to_enable}= | dpdk_plugin.so
+| ${osi_layer}= | L2
+| ${nic_name}= | Intel-X710
+| ${overhead}= | ${0}
# Traffic profile:
# Traffic profile:
-| ${traffic_profile} | trex-sl-2n-ethip4-ip4src254
+| ${traffic_profile}
=
| trex-sl-2n-ethip4-ip4src254
*** Keywords ***
*** Keywords ***
-| Local
t
emplate
+| Local
T
emplate
| | [Documentation]
| | ... | [Cfg] DUT runs L2 patch config with ${phy_cores} phy
| | ... | core(s).
| | [Documentation]
| | ... | [Cfg] DUT runs L2 patch config with ${phy_cores} phy
| | ... | core(s).
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
\
| | ...
| | ... | *Arguments:*
| | ...
| | ... | *Arguments:*
-| | ... | - framesize - Framesize in Bytes in integer or string (IMIX_v4_1).
+| | ... | - frame
_
size - 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
| | ...
| | ... | 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}
+| | [Arguments] | ${frame
_
size} | ${phy_cores} | ${rxq}=${None}
| | ...
| | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${20000}
+| | Set Test Variable | \${frame_size}
| | ...
| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
| | And Add PCI devices to all DUTs
| | ...
| | 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}
+| | And Set Max Rate And Jumbo And Handle Multi Seg
| | And Apply startup configuration on all VPP DUTs
| | When Initialize L2 patch
| | Then Find NDR and PDR intervals using optimized search
| | And Apply startup configuration on all VPP DUTs
| | When Initialize L2 patch
| | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
*** Test Cases ***
| tc01-64B-1c-eth-l2patch-ndrpdr
| | [Tags] | 64B | 1C
*** Test Cases ***
| tc01-64B-1c-eth-l2patch-ndrpdr
| | [Tags] | 64B | 1C
-| | framesize=${64} | phy_cores=${1}
-
-| tc02-1518B-1c-eth-l2patch-ndrpdr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${64} | phy_cores=${1}
-| tc0
3-9000B-1
c-eth-l2patch-ndrpdr
-| | [Tags] |
9000B | 1
C
-| | frame
size=${9000} | phy_cores=${1
}
+| tc0
2-64B-2
c-eth-l2patch-ndrpdr
+| | [Tags] |
64B | 2
C
+| | frame
_size=${64} | phy_cores=${2
}
-| tc0
4-IMIX-1
c-eth-l2patch-ndrpdr
-| | [Tags] |
IMIX | 1
C
-| | frame
size=IMIX_v4_1 | phy_cores=${1
}
+| tc0
3-64B-4
c-eth-l2patch-ndrpdr
+| | [Tags] |
64B | 4
C
+| | frame
_size=${64} | phy_cores=${4
}
-| tc0
5-64B-2
c-eth-l2patch-ndrpdr
-| | [Tags] |
64B | 2
C
-| | frame
size=${64} | phy_cores=${2
}
+| tc0
4-1518B-1
c-eth-l2patch-ndrpdr
+| | [Tags] |
1518B | 1
C
+| | frame
_size=${1518} | phy_cores=${1
}
-| tc0
6
-1518B-2c-eth-l2patch-ndrpdr
+| tc0
5
-1518B-2c-eth-l2patch-ndrpdr
| | [Tags] | 1518B | 2C
| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc07-9000B-2c-eth-l2patch-ndrpdr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
-| tc0
8-IMIX-2
c-eth-l2patch-ndrpdr
-| | [Tags] |
IMIX | 2
C
-| | frame
size=IMIX_v4_1 | phy_cores=${2
}
+| tc0
6-1518B-4
c-eth-l2patch-ndrpdr
+| | [Tags] |
1518B | 4
C
+| | frame
_size=${1518} | phy_cores=${4
}
-| tc0
9-64B-4
c-eth-l2patch-ndrpdr
-| | [Tags] |
64B | 4
C
-| | frame
size=${64} | phy_cores=${4
}
+| tc0
7-9000B-1
c-eth-l2patch-ndrpdr
+| | [Tags] |
9000B | 1
C
+| | frame
_size=${9000} | phy_cores=${1
}
-| tc
10-1518B-4
c-eth-l2patch-ndrpdr
-| | [Tags] |
1518B | 4
C
-| | frame
size=${1518} | phy_cores=${4
}
+| tc
08-9000B-2
c-eth-l2patch-ndrpdr
+| | [Tags] |
9000B | 2
C
+| | frame
_size=${9000} | phy_cores=${2
}
-| tc
11
-9000B-4c-eth-l2patch-ndrpdr
+| tc
09
-9000B-4c-eth-l2patch-ndrpdr
| | [Tags] | 9000B | 4C
| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
+
+| tc10-IMIX-1c-eth-l2patch-ndrpdr
+| | [Tags] | IMIX | 1C
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
+
+| tc11-IMIX-2c-eth-l2patch-ndrpdr
+| | [Tags] | IMIX | 2C
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
| tc12-IMIX-4c-eth-l2patch-ndrpdr
| | [Tags] | IMIX | 4C
| tc12-IMIX-4c-eth-l2patch-ndrpdr
| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame
_
size=IMIX_v4_1 | phy_cores=${4}