Upgrade autogen to NICs and search types

+ All perf suites updated, as autogen change is backward incompatible.
+ Only x710 -ndrpdr suites remain in git repository.
+ Removed retry feature of run_tests.
+ Renamed topology_type and traffic_type to traffic_profile.
+ Renamed framesize to frame_size; nic_model to nic_name.
+ Reordered Variables table to start with nic_name and overhead.
+ Fixed wrong overhead value in some cbc-sha1 suites.
+ Fixed some suite tags.
++ Introduced tags to distinguish suites, such as IPSECINT.
+ Bound crypto hardware to NIC name.
+ Implemented NIC limit hiding.
+ Also search and teardown related arguments are now hidden.
+ Main measurement keywords updated to new arg handling.
+ Max rate related keywords moved to performance_limits.robot
+ Teardowns unified.
+ Generated tests are archived.
++ Generated directory is .gitignore-d.
+ Regenerator raises an exception on seeing non-compatible suite.
++ Relatively helpful message should be seen in exception.
+ Suite and template Documentation has generated parts.
+- With short NIC names only.
+ Autogen checker also upgraded.
+ Tag expressions replaced with long files to ensure analogous tests.

Change-Id: I60e9a999187e7da1f60d0eb4fb02afa14682aa46
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

13 files changed, 157 insertions, 1156 deletions

diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot
deleted file mode 100644
index 689ff32e51..0000000000
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-mrr.robot
+++ /dev/null
@@ -1,148 +0,0 @@
-# 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | SRv6
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down mrr test with SRv6 with encapsulation
-| ...
-| Test Template | Local template
-| ...
-| Documentation | *Raw results for Segment routing over IPv6 dataplane with\
-| ... | one SID (SRH not inserted) test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-IPv6 on DUT1-DUT2, Eth-IPv6 on\
-| ... | TG-DUTn for IPv6 routing over SRv6.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static route, SR policy and steering policy for one\
-| ... | direction and one SR behaviour (function) - End - for other direction.\
-| ... | 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,IPv6 header with static payload.\
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3.
-
-*** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# SIDs
-| ${dut1_sid1}= | 2002:1::
-| ${dut1_sid2}= | 2003:2::
-| ${dut1_bsid}= | 2002:1::1
-| ${dut2_sid1}= | 2002:2::
-| ${dut2_sid2}= | 2003:1::
-| ${dut2_bsid}= | 2002:2::1
-| ${sid_prefix}= | ${64}
-# IP settings
-| ${tg_if1_ip6_subnet}= | 2001:1::
-| ${tg_if2_ip6_subnet}= | 2001:2::
-| ${dst_addr_nr}= | ${1}
-| ${dut1_if1_ip6}= | 2001:1::1
-| ${dut1_if2_ip6}= | 2001:3::1
-| ${dut2_if1_ip6}= | 2001:3::2
-| ${dut2_if2_ip6}= | 2001:2::1
-| ${prefix}= | ${64}
-# outer IPv6 header: 40B
-| ${srv6_overhead_nosrh}= | ${40}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs  IPv6 over SRv6 routing config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [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=${srv6_overhead_nosrh}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding over SRv6 with encapsulation with '1' x SID 'with' decapsulation in 3-node circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-78B-1c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
-
-| tc02-78B-2c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
-
-| tc03-78B-4c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip6ip6-ip6base-srv6enc1sid-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot
deleted file mode 100644
index a89c468f22..0000000000
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-mrr.robot
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | SRv6
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down mrr test with SRv6 with encapsulation
-| ...
-| Test Template | Local template
-| ...
-| Documentation | *Raw results for  Segment routing over IPv6 dataplane with\
-| ... | two SIDs (SRH inserted) test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-SRH-IPv6 on DUT1-DUT2, Eth-IPv6\
-| ... | on TG-DUTn for IPv6 routing over SRv6.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static route, SR policy and steering policy for one\
-| ... | direction and two SR behaviours (functions) - End and End.DX6 - for\
-| ... | other direction. 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,IPv6 header with static payload.\
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3.
-
-*** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# SIDs
-| ${dut1_sid1}= | 2002:1::
-| ${dut1_sid2_1}= | 2003:2::
-| ${dut1_sid2_2}= | 2003:3::
-| ${dut1_bsid}= | 2002:1::1
-| ${dut2_sid1_1}= | 2002:2::
-| ${dut2_sid1_2}= | 2002:3::
-| ${dut2_sid2}= | 2003:1::
-| ${dut2_bsid}= | 2002:2::1
-| ${sid_prefix}= | ${64}
-# IP settings
-| ${tg_if1_ip6_subnet}= | 2001:1::
-| ${tg_if2_ip6_subnet}= | 2001:2::
-| ${dst_addr_nr}= | ${1}
-| ${dut1_if1_ip6}= | 2001:1::1
-| ${dut1_if2_ip6}= | 2001:3::1
-| ${dut2_if1_ip6}= | 2001:3::2
-| ${dut2_if2_ip6}= | 2001:2::1
-| ${prefix}= | ${64}
-# outer IPv6 header + SRH with 2 SIDs: 40+40B
-| ${srv6_overhead_2sids}= | ${80}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [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=${srv6_overhead_2sids}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'with' decapsulation in 3-node circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
-
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
-
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot
deleted file mode 100644
index 017a317cf0..0000000000
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr.robot
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | SRv6
-| ...
-| Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Tear down mrr test with SRv6 with encapsulation
-| ...
-| Test Template | Local template
-| ...
-| Documentation | *Raw results for Segment routing over IPv6 dataplane with\
-| ... | two SIDs (SRH inserted) without decapsulation test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-SRH-IPv6 on DUT1-DUT2 and\
-| ... | DUTn->TG, Eth-IPv6 on TG->DUTn for IPv6 routing over SRv6.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static route, SR policy and steering policy for one\
-| ... | direction and one SR behaviour (function) - End - for other direction.\
-| ... | 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,IPv6 header with static payload.\
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3.
-
-*** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# SIDs
-| ${dut1_sid1}= | 2002:1::
-| ${dut1_sid2_1}= | 2003:2::
-| ${dut1_sid2_2}= | 2003:3::
-| ${dut1_bsid}= | 2002:1::1
-| ${dut2_sid1_1}= | 2002:2::
-| ${dut2_sid1_2}= | 2002:3::
-| ${dut2_sid2}= | 2003:1::
-| ${dut2_bsid}= | 2002:2::1
-| ${sid_prefix}= | ${64}
-# IP settings
-| ${tg_if1_ip6_subnet}= | 2001:1::
-| ${tg_if2_ip6_subnet}= | 2001:2::
-| ${dst_addr_nr}= | ${1}
-| ${dut1_if1_ip6}= | 2001:1::1
-| ${dut1_if2_ip6}= | 2001:3::1
-| ${dut2_if1_ip6}= | 2001:3::2
-| ${dut2_if2_ip6}= | 2001:2::1
-| ${prefix}= | ${64}
-# outer IPv6 header + SRH with 2 SIDs: 40+40B
-| ${srv6_overhead_2sids}= | ${80}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [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=${srv6_overhead_2sids}
-| | And Apply startup configuration on all VPP DUTs
-| | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'without' decapsulation in 3-node circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
-
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
-
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
deleted file mode 100644
index 4d84c9b430..0000000000
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-mrr.robot
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X520-DA2 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
-| ... | SRv6_PROXY_DYN | MEMIF | LXC
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-X520-DA2
-| ... | AND | Set up performance test suite with MEMIF
-| ... | AND | Set up performance test suite with Dynamic SRv6 proxy
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down mrr test with SRv6 with encapsulation
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local template
-| ...
-| Documentation | *Raw results for Segment routing over IPv6 dataplane with\
-| ... | Dynamic SRv6 proxy test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-SRH-IPv6 on DUT1-DUT2 and\
-| ... | DUTn->TG, Eth-IPv6 on TG->DUTn and DUTn-LXC for IPv6 routing over SRv6.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static route, SR policy and steering policy for one\
-| ... | direction and one SR behaviour (function) - End.AD - for other\
-| ... | direction. 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,IPv6 header with static payload.\
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3 and Segment Routing for Service Chaining - internet draft 01.
-
-*** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# SIDs
-| ${dut1_sid1}= | 2002:1::
-| ${dut1_sid2}= | 2003:2::
-| ${dut1_bsid}= | 2002:1::1
-| ${dut2_sid1}= | 2002:2::
-| ${dut2_sid2}= | 2003:1::
-| ${dut2_bsid}= | 2003:1::1
-| ${out_sid1_1}= | 2002:3::
-| ${out_sid1_2}= | 2002:4::
-| ${out_sid2_1}= | 2003:3::
-| ${out_sid2_2}= | 2003:4::
-| ${sid_prefix}= | ${64}
-# IP settings
-| ${tg_if1_ip6_subnet}= | 2001:1::
-| ${tg_if2_ip6_subnet}= | 2001:2::
-| ${dut1_if1_ip6}= | 2001:1::1
-| ${dut1_if2_ip6}= | 2001:3::1
-| ${dut1-memif-1-if1_ip6}= | 3001:1::1
-| ${dut1-memif-1-if2_ip6}= | 3001:1::2
-| ${dut1_nh}= | 4002::
-| ${dut2_if1_ip6}= | 2001:3::2
-| ${dut2_if2_ip6}= | 2001:2::1
-| ${dut2-memif-1-if1_ip6}= | 3002:1::1
-| ${dut2-memif-1-if2_ip6}= | 3002:1::2
-| ${dut2_nh}= | 4001::
-| ${prefix}= | ${64}
-# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
-| ${srv6_overhead_3sids}= | ${96}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-# Container
-| ${container_engine}= | LXC
-| ${container_chain_topology}= | chain
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [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=${srv6_overhead_3sids}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers | nf_chains=${1} | nf_nodes=${1}
-| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
-
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
-
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-dyn-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
deleted file mode 100644
index 3de8e50bed..0000000000
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-mrr.robot
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X520-DA2 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
-| ... | SRv6_PROXY_MASQ | MEMIF | LXC
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-X520-DA2
-| ... | AND | Set up performance test suite with MEMIF
-| ... | AND | Set up performance test suite with Masquerading SRv6 proxy
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down mrr test with SRv6 with encapsulation
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local template
-| ...
-| Documentation | *Raw results for Segment routing over IPv6 dataplane with\
-| ... | Masquerading SRv6 proxy test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-SRH-IPv6 on DUT1-DUT2, DUTn-LXC\
-| ... | and DUTn->TG, Eth-IPv6 on TG->DUTn for IPv6 routing over SRv6.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static route, SR policy and steering policy for one\
-| ... | direction and one SR behaviour (function) - End.AM - for other\
-| ... | direction. 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,IPv6 header with static payload.\
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3 and Segment Routing for Service Chaining - internet draft 01.
-
-*** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# SIDs
-| ${dut1_sid1}= | 2002:1::
-| ${dut1_sid2}= | 2003:2::
-| ${dut1_bsid}= | 2002:1::1
-| ${dut2_sid1}= | 2002:2::
-| ${dut2_sid2}= | 2003:1::
-| ${dut2_bsid}= | 2003:1::1
-| ${out_sid1_1}= | 2002:3::
-| ${out_sid1_2}= | 2002:4::
-| ${out_sid2_1}= | 2003:3::
-| ${out_sid2_2}= | 2003:4::
-| ${sid_prefix}= | ${64}
-# IP settings
-| ${tg_if1_ip6_subnet}= | 2001:1::
-| ${tg_if2_ip6_subnet}= | 2001:2::
-| ${dut1_if1_ip6}= | 2001:1::1
-| ${dut1_if2_ip6}= | 2001:3::1
-| ${dut1-memif-1-if1_ip6}= | 3001:1::1
-| ${dut1-memif-1-if2_ip6}= | 3001:1::2
-| ${dut1_nh}= | 4002::
-| ${dut2_if1_ip6}= | 2001:3::2
-| ${dut2_if2_ip6}= | 2001:2::1
-| ${dut2-memif-1-if1_ip6}= | 3002:1::1
-| ${dut2-memif-1-if2_ip6}= | 3002:1::2
-| ${dut2_nh}= | 4001::
-| ${prefix}= | ${64}
-# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
-| ${srv6_overhead_3sids}= | ${96}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-# Container
-| ${container_engine}= | LXC
-| ${container_chain_topology}= | chain
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [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=${srv6_overhead_3sids}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers | nf_chains=${1} | nf_nodes=${1}
-| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'masquerading' behaviour in 3-node circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
-
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
-
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-masq-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot b/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
deleted file mode 100644
index 41f33b0c84..0000000000
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-mrr.robot
+++ /dev/null
@@ -1,169 +0,0 @@
-# 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 | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
-| ... | NIC_Intel-X520-DA2 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
-| ... | SRv6_PROXY_STAT | MEMIF | LXC
-| ...
-| Suite Setup | Run Keywords
-| ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-X520-DA2
-| ... | AND | Set up performance test suite with MEMIF
-| ... | AND | Set up performance test suite with Static SRv6 proxy
-| ...
-| Suite Teardown | Tear down 3-node performance topology
-| ...
-| Test Setup | Set up performance test
-| ...
-| Test Teardown | Run Keywords
-| ... | Tear down mrr test with SRv6 with encapsulation
-| ... | AND | Tear down performance test with container
-| ...
-| Test Template | Local template
-| ...
-| Documentation | *Packet throughput Segment routing over IPv6 dataplane with\
-| ... | Static SRv6 proxy test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology\
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-SRH-IPv6 on DUT1-DUT2 and\
-| ... | DUTn->TG, Eth-IPv6 on TG->DUTn and DUTn-LXC for IPv6 routing over SRv6.
-| ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
-| ... | routing and static route, SR policy and steering policy for one\
-| ... | direction and one SR behaviour (function) - End.AS - for other\
-| ... | direction. 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,IPv6 header with static payload.\
-| ... | MAC addresses are matching MAC addresses of the TG node interfaces.
-| ... | *[Ref] Applicable standard specifications:* SRv6 Network Programming -\
-| ... | draft 3 and Segment Routing for Service Chaining - internet draft 01.
-
-*** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
-# SIDs
-| ${dut1_sid1}= | 2002:1::
-| ${dut1_sid2}= | 2003:2::
-| ${dut1_bsid}= | 2002:1::1
-| ${dut2_sid1}= | 2002:2::
-| ${dut2_sid2}= | 2003:1::
-| ${dut2_bsid}= | 2003:1::1
-| ${out_sid1_1}= | 2002:3::
-| ${out_sid1_2}= | 2002:4::
-| ${out_sid2_1}= | 2003:3::
-| ${out_sid2_2}= | 2003:4::
-| ${sid_prefix}= | ${64}
-# IP settings
-| ${tg_if1_ip6_subnet}= | 2001:1::
-| ${tg_if2_ip6_subnet}= | 2001:2::
-| ${dut1_if1_ip6}= | 2001:1::1
-| ${dut1_if2_ip6}= | 2001:3::1
-| ${dut1-memif-1-if1_ip6}= | 3001:1::1
-| ${dut1-memif-1-if2_ip6}= | 3001:1::2
-| ${dut1_nh}= | 4002::
-| ${dut2_if1_ip6}= | 2001:3::2
-| ${dut2_if2_ip6}= | 2001:2::1
-| ${dut2-memif-1-if1_ip6}= | 3002:1::1
-| ${dut2-memif-1-if2_ip6}= | 3002:1::2
-| ${dut2_nh}= | 4001::
-| ${prefix}= | ${64}
-# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
-| ${srv6_overhead_3sids}= | ${96}
-# Traffic profile:
-| ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
-# Container
-| ${container_engine}= | LXC
-| ${container_chain_topology}= | chain
-
-*** Keywords ***
-| Local template
-| | [Documentation]
-| | ... | [Cfg] DUT runs IPv6 over SRv6 routing config with ${phy_cores} phy
-| | ... | core(s).
-| | ... | [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=${srv6_overhead_3sids}
-| | And Apply startup configuration on all VPP DUTs
-| | And Set up performance test with containers | nf_chains=${1} | nf_nodes=${1}
-| | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'static_proxy' behaviour in 3-node circular topology
-| | Then Traffic should pass with maximum rate
-| | ... | ${max_rate}pps | ${framesize} | ${traffic_profile}
-
-*** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
-
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
-
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
-
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
-
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
-
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
-
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
-
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
-
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
-
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
-
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
-
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-stat-mrr
-| | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
index 1b1d00e9c3..cc6fd3aa7e 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -15,16 +15,14 @@
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | SRv6
+| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_1SID
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
+| ... | L3 | ${nic_name}
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| ...
 | Test Teardown | Tear down performance test with SRv6 with encapsulation
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
 | Test Template | Local Template
 | ...
@@ -38,12 +36,12 @@
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
 | ... | routing and static route, SR policy and steering policy for one\
 | ... | direction and one SR behaviour (function) - End - for other direction.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | DUT1 and DUT2 are tested with ${nic_name}.\
 | ... | *[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\
-| ... | 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, 253 flows per flow-group) with\
@@ -53,8 +51,9 @@
 | ... | draft 3.
 
 *** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${nic_name}= | Intel-X710
+# outer IPv6 header: 40B
+| ${overhead}= | ${40}
 # SIDs
 | ${dut1_sid1}= | 2002:1::
 | ${dut1_sid2}= | 2003:2::
@@ -72,8 +71,6 @@
 | ${dut2_if1_ip6}= | 2001:3::2
 | ${dut2_if2_ip6}= | 2001:2::1
 | ${prefix}= | ${64}
-# outer IPv6 header: 40B
-| ${srv6_overhead_nosrh}= | ${40}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 
@@ -84,73 +81,70 @@
 | | ... | routing and static route, SR policy and steering policy for one\
 | | ... | direction and one SR behaviour (function) - End - for other direction.
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | | ...
 | | ... | *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
 | | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
+| | Set Test Variable | \${frame_size}
 | | ...
 | | 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=${srv6_overhead_nosrh}
+| | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with encapsulation with '1' x SID 'with' decapsulation in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-78B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
+| | frame_size=${78} | phy_cores=${1}
 
 | tc02-78B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
+| | frame_size=${78} | phy_cores=${2}
 
 | tc03-78B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
+| | frame_size=${78} | phy_cores=${4}
 
 | tc04-1518B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc06-1518B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${4}
 
 | tc07-9000B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc09-9000B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
 
 | tc10-IMIX-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
index d481b7e89b..bbcd155960 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -15,16 +15,14 @@
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | SRv6
+| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_DECAP
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
+| ... | L3 | ${nic_name}
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| ...
 | Test Teardown | Tear down performance test with SRv6 with encapsulation
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
 | Test Template | Local Template
 | ...
@@ -38,13 +36,12 @@
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
 | ... | routing and static route, SR policy and steering policy for one\
 | ... | direction and two SR behaviours (functions) - End and End.DX6 - for\
-| ... | other direction. DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic\
-| ... | by Intel.
+| ... | other direction. DUT1 and DUT2 are tested with ${nic_name}.\
 | ... | *[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\
-| ... | 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, 253 flows per flow-group) with\
@@ -54,8 +51,9 @@
 | ... | draft 3.
 
 *** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${nic_name}= | Intel-X710
+# outer IPv6 header + SRH with 2 SIDs: 40+40B
+| ${overhead}= | ${80}
 # SIDs
 | ${dut1_sid1}= | 2002:1::
 | ${dut1_sid2_1}= | 2003:2::
@@ -76,8 +74,6 @@
 | ${dut2_if1_ip6}= | 2001:3::2
 | ${dut2_if2_ip6}= | 2001:2::1
 | ${prefix}= | ${64}
-# outer IPv6 header + SRH with 2 SIDs: 40+40B
-| ${srv6_overhead_2sids}= | ${80}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 
@@ -88,73 +84,70 @@
 | | ... | routing and static route, SR policy and steering policy for one\
 | | ... | direction and one SR behaviour (function) - End - for other direction.
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | | ...
 | | ... | *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
 | | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
+| | Set Test Variable | \${frame_size}
 | | ...
 | | 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=${srv6_overhead_2sids}
+| | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'with' decapsulation in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
+| | frame_size=${78} | phy_cores=${1}
 
 | tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
+| | frame_size=${78} | phy_cores=${2}
 
 | tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
+| | frame_size=${78} | phy_cores=${4}
 
 | tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${4}
 
 | tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
 
 | tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
index a2b5d049e7..8a96b69bef 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -15,16 +15,14 @@
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X520-DA2 | ETH | IP6FWD | FEATURE | SRv6
+| ... | NIC_Intel-X710 | ETH | IP6FWD | FEATURE | SRv6 | SRv6_2SID_NODECAP
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
-| ... | L3 | Intel-X520-DA2
+| ... | L3 | ${nic_name}
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| ...
 | Test Teardown | Tear down performance test with SRv6 with encapsulation
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
 | Test Template | Local Template
 | ...
@@ -38,12 +36,12 @@
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
 | ... | routing and static route, SR policy and steering policy for one\
 | ... | direction and one SR behaviour (function) - End - for other direction.\
-| ... | DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic by Intel.
+| ... | DUT1 and DUT2 are tested with ${nic_name}.\
 | ... | *[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\
-| ... | 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, 253 flows per flow-group) with\
@@ -53,8 +51,9 @@
 | ... | draft 3.
 
 *** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${nic_name}= | Intel-X710
+# outer IPv6 header + SRH with 2 SIDs: 40+40B
+| ${overhead}= | ${80}
 # SIDs
 | ${dut1_sid1}= | 2002:1::
 | ${dut1_sid2_1}= | 2003:2::
@@ -75,8 +74,6 @@
 | ${dut2_if1_ip6}= | 2001:3::2
 | ${dut2_if2_ip6}= | 2001:2::1
 | ${prefix}= | ${64}
-# outer IPv6 header + SRH with 2 SIDs: 40+40B
-| ${srv6_overhead_2sids}= | ${80}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 
@@ -87,73 +84,70 @@
 | | ... | routing and static route, SR policy and steering policy for one\
 | | ... | direction and one SR behaviour (function) - End - for other direction.
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | | ...
 | | ... | *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
 | | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
+| | Set Test Variable | \${frame_size}
 | | ...
 | | 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=${srv6_overhead_2sids}
+| | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | When Initialize IPv6 forwarding over SRv6 with encapsulation with '2' x SID 'without' decapsulation in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
+| | frame_size=${78} | phy_cores=${1}
 
 | tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
+| | frame_size=${78} | phy_cores=${2}
 
 | tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
+| | frame_size=${78} | phy_cores=${4}
 
 | tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${4}
 
 | tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
 
 | tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
index 574cf8958d..d05e271d64 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -15,22 +15,19 @@
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X520-DA2 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
+| ... | NIC_Intel-X710 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
 | ... | SRv6_PROXY_DYN | MEMIF | LXC
 | ...
 | Suite Setup | Run Keywords
 | ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-X520-DA2
+| ... | ${nic_name}
 | ... | AND | Set up performance test suite with MEMIF
 | ... | AND | Set up performance test suite with Dynamic SRv6 proxy
-| ...
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| ...
 | Test Teardown | Run Keywords
 | ... | Tear down performance test with SRv6 with encapsulation
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
@@ -45,13 +42,12 @@
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
 | ... | routing and static route, SR policy and steering policy for one\
 | ... | direction and one SR behaviour (function) - End.AD - for other\
-| ... | direction. DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic\
-| ... | by Intel.
+| ... | direction. DUT1 and DUT2 are tested with ${nic_name}.\
 | ... | *[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\
-| ... | 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, 253 flows per flow-group) with\
@@ -61,8 +57,9 @@
 | ... | draft 3 and Segment Routing for Service Chaining - internet draft 01.
 
 *** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${nic_name}= | Intel-X710
+# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
+| ${overhead}= | ${96}
 # SIDs
 | ${dut1_sid1}= | 2002:1::
 | ${dut1_sid2}= | 2003:2::
@@ -91,8 +88,6 @@
 | ${dut2-memif-1-if2_ip6}= | 3002:1::2
 | ${dut2_nh}= | 4001::
 | ${prefix}= | ${64}
-# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
-| ${srv6_overhead_3sids}= | ${96}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 # Container
@@ -106,74 +101,71 @@
 | | ... | routing and static route, SR policy and steering policy for one\
 | | ... | direction and one SR behaviour (function) - End - for other direction.
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | | ...
 | | ... | *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
 | | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
+| | Set Test Variable | \${frame_size}
 | | ...
 | | 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=${srv6_overhead_3sids}
+| | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | And Set up performance test with containers | nf_chains=${1} | nf_nodes=${1}
 | | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'dynamic_proxy' behaviour in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
+| | frame_size=${78} | phy_cores=${1}
 
 | tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
+| | frame_size=${78} | phy_cores=${2}
 
 | tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
+| | frame_size=${78} | phy_cores=${4}
 
 | tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${4}
 
 | tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
 
 | tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
index 7ad3a7a9df..43d5785a21 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -15,22 +15,19 @@
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X520-DA2 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
+| ... | NIC_Intel-X710 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
 | ... | SRv6_PROXY_MASQ | MEMIF | LXC
 | ...
 | Suite Setup | Run Keywords
 | ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-X520-DA2
+| ... | ${nic_name}
 | ... | AND | Set up performance test suite with MEMIF
 | ... | AND | Set up performance test suite with Masquerading SRv6 proxy
-| ...
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| ...
 | Test Teardown | Run Keywords
 | ... | Tear down performance test with SRv6 with encapsulation
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
@@ -45,13 +42,12 @@
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
 | ... | routing and static route, SR policy and steering policy for one\
 | ... | direction and one SR behaviour (function) - End.AM - for other\
-| ... | direction. DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic\
-| ... | by Intel.
+| ... | direction. DUT1 and DUT2 are tested with ${nic_name}.\
 | ... | *[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\
-| ... | 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, 253 flows per flow-group) with\
@@ -61,8 +57,9 @@
 | ... | draft 3 and Segment Routing for Service Chaining - internet draft 01.
 
 *** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${nic_name}= | Intel-X710
+# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
+| ${overhead}= | ${96}
 # SIDs
 | ${dut1_sid1}= | 2002:1::
 | ${dut1_sid2}= | 2003:2::
@@ -91,8 +88,6 @@
 | ${dut2-memif-1-if2_ip6}= | 3002:1::2
 | ${dut2_nh}= | 4001::
 | ${prefix}= | ${64}
-# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
-| ${srv6_overhead_3sids}= | ${96}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 # Container
@@ -106,74 +101,71 @@
 | | ... | routing and static route, SR policy and steering policy for one\
 | | ... | direction and one SR behaviour (function) - End - for other direction.
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | | ...
 | | ... | *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
 | | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
+| | Set Test Variable | \${frame_size}
 | | ...
 | | 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=${srv6_overhead_3sids}
+| | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | And Set up performance test with containers | nf_chains=${1} | nf_nodes=${1}
 | | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'masquerading' behaviour in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
+| | frame_size=${78} | phy_cores=${1}
 
 | tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
+| | frame_size=${78} | phy_cores=${2}
 
 | tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
+| | frame_size=${78} | phy_cores=${4}
 
 | tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${4}
 
 | tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
 
 | tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
index c0953e0c85..3997f7e267 100644
--- a/tests/vpp/perf/srv6/10ge2p1x520-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -15,22 +15,19 @@
 | Resource | resources/libraries/robot/performance/performance_setup.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDR
-| ... | NIC_Intel-X520-DA2 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
+| ... | NIC_Intel-X710 | SRv6 | IP6FWD | FEATURE | SRv6_PROXY
 | ... | SRv6_PROXY_STAT | MEMIF | LXC
 | ...
 | Suite Setup | Run Keywords
 | ... | Set up 3-node performance topology with DUT's NIC model | L3
-| ... | Intel-X520-DA2
+| ... | ${nic_name}
 | ... | AND | Set up performance test suite with MEMIF
 | ... | AND | Set up performance test suite with Static SRv6 proxy
-| ...
 | Suite Teardown | Tear down 3-node performance topology
 | ...
 | Test Setup | Set up performance test
-| ...
 | Test Teardown | Run Keywords
 | ... | Tear down performance test with SRv6 with encapsulation
-| ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ... | AND | Tear down performance test with container
 | ...
 | Test Template | Local Template
@@ -45,13 +42,12 @@
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with IPv6\
 | ... | routing and static route, SR policy and steering policy for one\
 | ... | direction and one SR behaviour (function) - End.AS - for other\
-| ... | direction. DUT1 and DUT2 are tested with 2p10GE NIC X520 Niantic\
-| ... | by Intel.
+| ... | direction. DUT1 and DUT2 are tested with ${nic_name}.\
 | ... | *[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\
-| ... | 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, 253 flows per flow-group) with\
@@ -61,8 +57,9 @@
 | ... | draft 3 and Segment Routing for Service Chaining - internet draft 01.
 
 *** Variables ***
-# X520-DA2 bandwidth limit
-| ${s_limit}= | ${10000000000}
+| ${nic_name}= | Intel-X710
+# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
+| ${overhead}= | ${96}
 # SIDs
 | ${dut1_sid1}= | 2002:1::
 | ${dut1_sid2}= | 2003:2::
@@ -91,8 +88,6 @@
 | ${dut2-memif-1-if2_ip6}= | 3002:1::2
 | ${dut2_nh}= | 4001::
 | ${prefix}= | ${64}
-# outer IPv6 header + SRH with 3 SIDs: 40+(8+3*16)B
-| ${srv6_overhead_3sids}= | ${96}
 # Traffic profile:
 | ${traffic_profile}= | trex-sl-3n-ethip6-ip6src253
 # Container
@@ -106,74 +101,71 @@
 | | ... | routing and static route, SR policy and steering policy for one\
 | | ... | direction and one SR behaviour (function) - End - for other direction.
 | | ... | Each DUT uses ${phy_cores} physical core(s) for worker threads.
-| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.
+| | ... | [Ver] Measure NDR and PDR values using MLRsearch algorithm.\
 | | ...
 | | ... | *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
 | | ...
-| | [Arguments] | ${framesize} | ${phy_cores} | ${rxq}=${None}
+| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
 | | ...
-| | Set Test Variable | ${framesize}
-| | Set Test Variable | ${min_rate} | ${10000}
+| | Set Test Variable | \${frame_size}
 | | ...
 | | 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=${srv6_overhead_3sids}
+| | Set Max Rate And Jumbo And Handle Multi Seg
 | | And Apply startup configuration on all VPP DUTs
 | | And Set up performance test with containers | nf_chains=${1} | nf_nodes=${1}
 | | When Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via 'static_proxy' behaviour in 3-node circular topology
 | | Then Find NDR and PDR intervals using optimized search
-| | ... | ${framesize} | ${traffic_profile} | ${min_rate} | ${max_rate}
 
 *** Test Cases ***
 | tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 78B | 1C
-| | framesize=${78} | phy_cores=${1}
+| | frame_size=${78} | phy_cores=${1}
 
 | tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 78B | 2C
-| | framesize=${78} | phy_cores=${2}
+| | frame_size=${78} | phy_cores=${2}
 
 | tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 78B | 4C
-| | framesize=${78} | phy_cores=${4}
+| | frame_size=${78} | phy_cores=${4}
 
 | tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 1518B | 1C
-| | framesize=${1518} | phy_cores=${1}
+| | frame_size=${1518} | phy_cores=${1}
 
 | tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 1518B | 2C
-| | framesize=${1518} | phy_cores=${2}
+| | frame_size=${1518} | phy_cores=${2}
 
 | tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 1518B | 4C
-| | framesize=${1518} | phy_cores=${4}
+| | frame_size=${1518} | phy_cores=${4}
 
 | tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 9000B | 1C
-| | framesize=${9000} | phy_cores=${1}
+| | frame_size=${9000} | phy_cores=${1}
 
 | tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 9000B | 2C
-| | framesize=${9000} | phy_cores=${2}
+| | frame_size=${9000} | phy_cores=${2}
 
 | tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 9000B | 4C
-| | framesize=${9000} | phy_cores=${4}
+| | frame_size=${9000} | phy_cores=${4}
 
 | tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | IMIX | 1C
-| | framesize=IMIX_v4_1 | phy_cores=${1}
+| | frame_size=IMIX_v4_1 | phy_cores=${1}
 
 | tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | IMIX | 2C
-| | framesize=IMIX_v4_1 | phy_cores=${2}
+| | frame_size=IMIX_v4_1 | phy_cores=${2}
 
 | tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | IMIX | 4C
-| | framesize=IMIX_v4_1 | phy_cores=${4}
+| | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/regenerate_testcases.py b/tests/vpp/perf/srv6/regenerate_testcases.py
index d98546b14d..5e32e97fce 100755
--- a/tests/vpp/perf/srv6/regenerate_testcases.py
+++ b/tests/vpp/perf/srv6/regenerate_testcases.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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: