VPPD: Merge IPv4/IPv6

- Preparation for coverage.sh

Change-Id: Id299df9cd57ee69116686c8bc85eaba1cc353122
Signed-off-by: Peter Mikus <pmikus@cisco.com>

diff --git a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-tg-ingress-for-remote-host-dev.robot b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot
similarity index 81%
rename from tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-tg-ingress-for-remote-host-dev.robot
rename to tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot
index 53ba5bc..0ce0430 100644 (file)
--- a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-tg-ingress-for-remote-host-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot
@@ -44,9 +44,8 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Req between its interfaces across DUT1\
-| | ... | for remote host IPv4 addresses. Make TG verify ICMPv4 Echo Replies\
-| | ... | are correct.
+| | ... | [Ver] Make TG send ICMPv4 Echo Req routed over DUT1 interfaces.\
+| | ... | Make TG verify ICMPv4 Echo Reply is correct.
 | | ...
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer. Type: integer
@@ -64,10 +63,19 @@
 | | When Initialize IPv4 forwarding in circular topology
 | | ... | remote_host1_ip=192.168.0.1 | remote_host2_ip=192.168.0.2
 | | Then Send IPv4 ping packet and verify headers
+| | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if2}
+| | ... | 10.10.10.2 | 20.20.20.1 | ${dut1_if1_mac} | ${0}
+| | Then Send IPv4 ping packet and verify headers
+| | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if1}
+| | ... | 10.10.10.2 | 10.10.10.1 | ${dut1_if1_mac} | ${0}
+| | Then Send IPv4 ping packet and verify headers
+| | ... | ${tg} | ${tg_if1} | ${tg} | ${tg_if2}
+| | ... | 10.10.10.2 | 20.20.20.2 | ${dut1_if1_mac} | ${1}
+| | Then Send IPv4 ping packet and verify headers
 | | ... | ${tg} | ${tg_if1} | ${tg} | ${tg_if2}
 | | ... | 192.168.0.1 | 192.168.0.2 | ${dut1_if1_mac} | ${1}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-ip4base-tg-ingress-for-remote-host-dev
+| tc01-64B-ethicmpv4-ip4base-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}

diff --git a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dut-egress-dev.robot b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dut-egress-dev.robot
deleted file mode 100644 (file)
index c9a4b0b..0000000
--- a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dut-egress-dev.robot
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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:
-#
-#     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/shared/default.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP4FWD | BASE | IP4BASE
-| ...
-| Suite Setup | Setup suite single link | scapy
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *IPv4 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for IPv4 routing on \
-| ... | both links.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and \
-| ... | two static IPv4 /24 route entries.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
-| ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${overhead}= | ${0}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Req towards DUT1 egress interface.\
-| | ... | Make TG verify ICMP Echo Reply is correct.
-| | ...
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | \${frame_size}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | And Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv4 forwarding in circular topology
-| | Then Send IPv4 ping packet and verify headers
-| | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if2}
-| | ... | 10.10.10.2 | 20.20.20.1 | ${dut1_if1_mac} | ${0}
-
-*** Test Cases ***
-| tc01-64B-ethicmpv4-ip4base-dut-egress-dev
-| | [Tags] | 64B
-| | frame_size=${64} | phy_cores=${0}

diff --git a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dut-ingress-dev.robot b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dut-ingress-dev.robot
deleted file mode 100644 (file)
index e597a57..0000000
--- a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dut-ingress-dev.robot
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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:
-#
-#     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/shared/default.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP4FWD | BASE | IP4BASE
-| ...
-| Suite Setup | Setup suite single link | scapy
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *IPv4 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for IPv4 routing on \
-| ... | both links.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and \
-| ... | two static IPv4 /24 route entries.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
-| ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${overhead}= | ${0}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Req to DUT1 ingress interface.\
-| | ... | Make TG verify ICMP Echo Reply is correct.
-| | ...
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | \${frame_size}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | And Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv4 forwarding in circular topology
-| | Then Send IPv4 ping packet and verify headers
-| | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if1}
-| | ... | 10.10.10.2 | 10.10.10.1 | ${dut1_if1_mac} | ${0}
-
-*** Test Cases ***
-| tc01-64B-ethicmpv4-ip4base-dut-ingress-dev
-| | [Tags] | 64B
-| | frame_size=${64} | phy_cores=${0}

diff --git a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-tg-ingress-dev.robot b/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-tg-ingress-dev.robot
deleted file mode 100644 (file)
index 5fff822..0000000
--- a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-tg-ingress-dev.robot
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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:
-#
-#     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/shared/default.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP4FWD | BASE | IP4BASE
-| ...
-| Suite Setup | Setup suite single link | scapy
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *IPv4 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for IPv4 routing on \
-| ... | both links.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and \
-| ... | two static IPv4 /24 route entries.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
-| ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${overhead}= | ${0}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Req between its interfaces across DUT1\
-| | ... | for locally connected IPv4 addresses. Make TG verify ICMPv4 Echo\
-| | ... | Replies are correct.
-| | ...
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | \${frame_size}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | And Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv4 forwarding in circular topology
-| | Then Send IPv4 ping packet and verify headers
-| | ... | ${tg} | ${tg_if1} | ${tg} | ${tg_if2}
-| | ... | 10.10.10.2 | 20.20.20.2 | ${dut1_if1_mac} | ${1}
-
-*** Test Cases ***
-| tc01-64B-ethicmpv4-ip4base-tg-ingress-dev
-| | [Tags] | 64B
-| | frame_size=${64} | phy_cores=${0}

diff --git a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-tg-ingress-remote-host-dev.robot b/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot
similarity index 80%
rename from tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-tg-ingress-remote-host-dev.robot
rename to tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot
index bf9975b..084335f 100644 (file)
--- a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-tg-ingress-remote-host-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot
@@ -44,9 +44,8 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv6 Echo Req between its interfaces across DUT1\
-| | ... | for remote host IPv6 addresses. Make TG verify ICMPv6 Echo Replies\
-| | ... | are correct.
+| | ... | [Ver] Make TG send ICMPv6 Echo Req routed over DUT1 interfaces;\
+| | ... | Make TG verify ICMPv6 Echo Reply is correct.
 | | ...
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer. Type: integer
@@ -64,10 +63,19 @@
 | | When Initialize IPv6 forwarding in circular topology
 | | ... | remote_host1_ip=3ffe:5f::1 | remote_host2_ip=3ffe:5f::2
 | | Then Send IPv6 echo request packet and verify headers
+| | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if2}
+| | ... | 2001:1::2 | 2001:2::1 | ${dut1_if1_mac} | ${0}
+| | Then Send IPv6 echo request packet and verify headers
+| | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if1}
+| | ... | 2001:1::2 | 2001:1::1 | ${dut1_if1_mac} | ${0}
+| | Then Send IPv6 echo request packet and verify headers
+| | ... | ${tg} | ${tg_if1} | ${tg} | ${tg_if2}
+| | ... | 2001:1::2 | 2001:2::2 | ${dut1_if1_mac} | ${1} | ${dut1_if2_mac}
+| | Then Send IPv6 echo request packet and verify headers
 | | ... | ${tg} | ${tg_if1} | ${tg} | ${tg_if2}
 | | ... | 3ffe:5f::1 | 3ffe:5f::2 | ${dut1_if1_mac} | ${1} | ${dut1_if2_mac}
 
 *** Test Cases ***
-| tc01-78B-ethicmpv6-ip6base-tg-ingress-remote-host-dev
+| tc01-78B-ethicmpv6-ip6base-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}

diff --git a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dut-egress-dev.robot b/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dut-egress-dev.robot
deleted file mode 100644 (file)
index 5004813..0000000
--- a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dut-egress-dev.robot
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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:
-#
-#     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/shared/default.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP6FWD | BASE | IP6BASE
-| ...
-| Suite Setup | Setup suite single link | scapy
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *IPv6 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-ICMPv6 for IPv6 routing on \
-| ... | both links.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and \
-| ... | two static IPv6 /64 route entries.
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
-| ... | for correctness and their IPv6 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC2460, RFC4443, RFC4861
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${overhead}= | ${0}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Ver] Make TG send ICMPv6 Echo Req towards DUT1 egress interface.\
-| | ... | Make TG verify ICMPv6 Echo Reply is correct.
-| | ...
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | \${frame_size}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | And Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv6 forwarding in circular topology
-| | Then Send IPv6 echo request packet and verify headers
-| | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if2}
-| | ... | 2001:1::2 | 2001:2::1 | ${dut1_if1_mac} | ${0}
-
-*** Test Cases ***
-| tc01-78B-ethicmpv6-ip6base-dut-egress-dev
-| | [Tags] | 78B
-| | frame_size=${78} | phy_cores=${0}

diff --git a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dut-ingress-dev.robot b/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dut-ingress-dev.robot
deleted file mode 100644 (file)
index 8bb17aa..0000000
--- a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dut-ingress-dev.robot
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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:
-#
-#     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/shared/default.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP6FWD | BASE | IP6BASE
-| ...
-| Suite Setup | Setup suite single link | scapy
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *IPv6 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-ICMPv6 for IPv6 routing on \
-| ... | both links.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and \
-| ... | two static IPv6 /64 route entries.
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
-| ... | for correctness and their IPv6 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC2460, RFC4443, RFC4861
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${overhead}= | ${0}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Ver ]Make TG send ICMPv6 Echo Req to DUT1 ingress interface.\
-| | ... | Make TG verify ICMPv6 Echo Reply is correct.
-| | ...
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | \${frame_size}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | And Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv6 forwarding in circular topology
-| | Then Send IPv6 echo request packet and verify headers
-| | ... | ${tg} | ${tg_if1} | ${dut1} | ${dut1_if1}
-| | ... | 2001:1::2 | 2001:1::1 | ${dut1_if1_mac} | ${0}
-
-*** Test Cases ***
-| tc01-78B-ethicmpv6-ip6base-dut-ingress-dev
-| | [Tags] | 78B
-| | frame_size=${78} | phy_cores=${0}

diff --git a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-tg-ingress-dev.robot b/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-tg-ingress-dev.robot
deleted file mode 100644 (file)
index af8378f..0000000
--- a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-tg-ingress-dev.robot
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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:
-#
-#     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/shared/default.robot
-| ...
-| Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | IP6FWD | BASE | IP6BASE
-| ...
-| Suite Setup | Setup suite single link | scapy
-| Test Setup | Setup test
-| Test Teardown | Tear down test | packet_trace
-| ...
-| Test Template | Local Template
-| ...
-| Documentation | *IPv6 routing test cases*
-| ...
-| ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
-| ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-ICMPv6 for IPv6 routing on \
-| ... | both links.
-| ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and \
-| ... | two static IPv6 /64 route entries.
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
-| ... | for correctness and their IPv6 src-addr, dst-addr and MAC addresses.
-| ... | *[Ref] Applicable standard specifications:* RFC2460, RFC4443, RFC4861
-
-*** Variables ***
-| @{plugins_to_enable}= | dpdk_plugin.so
-| ${nic_name}= | virtual
-| ${overhead}= | ${0}
-
-*** Keywords ***
-| Local Template
-| | [Documentation]
-| | ... | [Ver] Make TG send ICMPv6 Echo Req between its interfaces across DUT1\
-| | ... | for locally connected IPv6 addresses. Make TG verify ICMPv6 Echo\
-| | ... | Replies are correct.
-| | ...
-| | ... | *Arguments:*
-| | ... | - frame_size - Framesize in Bytes in integer. Type: integer
-| | ... | - phy_cores - Number of physical cores. Type: integer
-| | ... | - rxq - Number of RX queues, default value: ${None}. Type: integer
-| | ...
-| | [Arguments] | ${frame_size} | ${phy_cores} | ${rxq}=${None}
-| | ...
-| | Set Test Variable | \${frame_size}
-| | ...
-| | Given Add worker threads and rxqueues to all DUTs | ${phy_cores} | ${rxq}
-| | And Add PCI devices to all DUTs
-| | And Set Max Rate And Jumbo And Handle Multi Seg
-| | And Apply startup configuration on all VPP DUTs | with_trace=${True}
-| | When Initialize IPv6 forwarding in circular topology
-| | Then Send IPv6 echo request packet and verify headers
-| | ... | ${tg} | ${tg_if1} | ${tg} | ${tg_if2}
-| | ... | 2001:1::2 | 2001:2::2 | ${dut1_if1_mac} | ${1} | ${dut1_if2_mac}
-
-*** Test Cases ***
-| tc01-78B-ethicmpv6-ip6base-tg-ingress-dev
-| | [Tags] | 78B
-| | frame_size=${78} | phy_cores=${0}