FIX: do not use ping in vpp-device tests

Change-Id: Ic11f863e7ffad70d45e6e8dc39c70efc62cecc96
Signed-off-by: Jan Gelety <jgelety@cisco.com>

19 files changed, 131 insertions, 149 deletions

diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethipv4-ip4base-eth-2memif-1dcr-dev.robot
index 2c43924150..152f3f6735 100644
--- a/tests/vpp/device/container_memif/eth2p-ethicmpv4-ip4base-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethipv4-ip4base-eth-2memif-1dcr-dev.robot
@@ -27,16 +27,15 @@
 | ...
 | ... | *[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.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing on both links.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and \
 | ... | two static IPv4 /24 route entries. Container is connected to VPP via \
 | ... | Memif interface. Container is running same VPP version as running on \
 | ... | DUT.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1 and via container; on receive TG \
-| ... | verifies packets for correctness and their IPv4 src-addr, dst-addr and \
-| ... | MAC addresses.
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61 are \
+| ... | sent in one direction by TG on links to DUT1 and via container; 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 ***
@@ -52,7 +51,7 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\
+| | ... | [Ver] Make TG send IPv4 packet in both directions between two\
 | | ... | of its interfaces to be routed by DUT to and from docker; verify\
 | | ... | all packets are received.
 | | ...
@@ -79,6 +78,6 @@
 | | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-ip4base-eth-2memif-1dcr-dev
+| tc01-64B-ethipv4-ip4base-eth-2memif-1dcr-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
index 643879a086..77e0b44956 100644
--- a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
@@ -27,12 +27,12 @@
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of \
-| ... | IPv4. Both apply to all links.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.\
+| ... | Both apply to all links.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-domain \
 | ... | switching. Container is connected to VPP via Memif interface. \
 | ... | Container is running same VPP version as running on DUT.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets \
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61\
 | ... | are sent in both directions by TG on links to DUT1 and via container; \
 | ... | on receive TG verifies packets for correctness and their IPv4 \
 | ... | src-addr, dst-addr and MAC addresses.
@@ -51,7 +51,7 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\
+| | ... | [Ver] Make TG send IPv4 packets in both directions between two\
 | | ... | of its interfaces to be switched by DUT to and from docker; verify\
 | | ... | all packets are received.
 | | ...
@@ -72,10 +72,10 @@
 | | And Initialize layer interface
 | | And Start containers for test | auto_scale=${False} | pinning=${False}
 | | And Initialize L2 Bridge Domain with memif pairs | auto_scale=${False}
-| | Then Send ICMPv4 bidirectionally and verify received packets
+| | Then Send IPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-l2bdbasemaclrn-eth-2memif-1dcr-dev
+| tc01-64B-ethipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethipv4-l2xcbase-eth-2memif-1dcr-dev.robot
index 83e9f8a81e..de62812de6 100644
--- a/tests/vpp/device/container_memif/eth2p-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethipv4-l2xcbase-eth-2memif-1dcr-dev.robot
@@ -27,11 +27,11 @@
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
 | ... | single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of IPv4.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect \
 | ... | (L2XC) switching. Container is connected to VPP via Memif interface. \
 | ... | Container is running same VPP version as running on DUT.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets \
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61 \
 | ... | are sent in both directions by TG on links to DUT1 and via container; \
 | ... | on receive TG verifies packets for correctness and their IPv4 \
 | ... | src-addr, dst-addr and MAC addresses.
@@ -50,7 +50,7 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\
+| | ... | [Ver] Make TG send IPv4 packets in both directions between two\
 | | ... | of its interfaces to be switched by DUT to and from docker; verify\
 | | ... | all packets are received.
 | | ...
@@ -71,10 +71,10 @@
 | | And Initialize layer interface
 | | And Start containers for test | auto_scale=${False} | pinning=${False}
 | | And Initialize L2 xconnect with memif pairs
-| | Then Send ICMPv4 bidirectionally and verify received packets
+| | Then Send IPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-l2xcbase-eth-2memif-1dcr-dev
+| tc01-64B-ethipv4-l2xcbase-eth-2memif-1dcr-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot
index 3d6836f3b2..dd74b2166b 100644
--- a/tests/vpp/device/container_memif/eth2p-ethicmpv6-ip6base-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot
@@ -27,15 +27,15 @@
 | ...
 | ... | *[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 \
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing on \
 | ... | both links.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and \
 | ... | two static IPv6 /64 route entries. Container is connected to VPP via \
 | ... | Memif interface. Container is running same VPP version as running on \
 | ... | DUT.
-| ... | *[Ver] TG verification:* Test ICMPv6 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1 and via container; on receive TG \
-| ... | verifies packets for correctness and their IPv6 src-addr, dst-addr and \
+| ... | *[Ver] TG verification:* Test IPv6 packets are sent in one direction \
+| ... | by TG on links to DUT1 and via container; on receive TG verifies \
+| ... | packets for correctness and their IPv6 src-addr, dst-addr and \
 | ... | MAC addresses.
 | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
 
@@ -52,7 +52,7 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv6 Echo Reqs in both directions between two\
+| | ... | [Ver] Make TG send IPv6 packets in both directions between two\
 | | ... | of its interfaces to be routed by DUT to and from docker; verify\
 | | ... | all packets are received.
 | | ...
@@ -108,6 +108,6 @@
 | | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
 
 *** Test Cases ***
-| tc01-78B-ethicmpv6-ip6base-eth-2memif-1dcr-dev
+| tc01-78B-ethipv6-ip6base-eth-2memif-1dcr-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
index 72ba5935ff..f8be1944ee 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -45,10 +45,11 @@
 | ${tg_spi}= | ${1000}
 | ${dut_spi}= | ${1001}
 | ${ESP_PROTO}= | ${50}
-| ${tg_if_ip4}= | 192.168.100.2
-| ${dut_if_ip4}= | 192.168.100.3
-| ${tg_lo_ip4}= | 192.168.3.3
-| ${dut_lo_ip4}= | 192.168.4.4
+| ${tg_if1_ip4}= | 192.168.100.2
+| ${tg_if2_ip4}= | 192.168.4.4
+| ${dut_if1_ip4}= | 192.168.100.3
+| ${dut_if2_ip4}= | 192.168.4.3
+| ${tg_host_ip4}= | 192.168.3.3
 | ${ip4_plen}= | ${24}
 
 *** Keywords ***
@@ -81,12 +82,12 @@
 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
 | | And Configure manual keyed connection for IPSec
 | | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg}
-| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip}
+| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${tg_dst_ip} | ${tg_src_ip}
 | | ... | ${dut_tun_ip} | ${tg_tun_ip}
 | | Then Send IPsec Packet and verify ESP encapsulation in received packet
-| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac}
+| | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${dut1_if1_mac} | ${dut1_if2_mac}
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi}
-| | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip}
+| | ... | ${dut_spi} | ${tg_src_ip} | ${tg_dst_ip} | ${tg_tun_ip}
 | | ... | ${dut_tun_ip}
 
 *** Test Cases ***
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
index 84b38364e6..26f19cb5e5 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -45,10 +45,11 @@
 | ${tg_spi}= | ${1000}
 | ${dut_spi}= | ${1001}
 | ${ESP_PROTO}= | ${50}
-| ${tg_if_ip4}= | 192.168.100.2
-| ${dut_if_ip4}= | 192.168.100.3
-| ${tg_lo_ip4}= | 192.168.3.3
-| ${dut_lo_ip4}= | 192.168.4.4
+| ${tg_if1_ip4}= | 192.168.100.2
+| ${tg_if2_ip4}= | 192.168.4.4
+| ${dut_if1_ip4}= | 192.168.100.3
+| ${dut_if2_ip4}= | 192.168.4.3
+| ${tg_host_ip4}= | 192.168.3.3
 | ${ip4_plen}= | ${24}
 
 *** Keywords ***
@@ -81,11 +82,11 @@
 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
 | | And Configure manual keyed connection for IPSec
 | | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg}
-| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip}
+| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${tg_dst_ip} | ${tg_src_ip}
 | | Then Send IPsec Packet and verify ESP encapsulation in received packet
-| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac}
+| | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${dut1_if1_mac} | ${dut1_if2_mac}
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi}
-| | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip}
+| | ... | ${dut_spi} | ${tg_src_ip} | ${tg_dst_ip}
 
 *** Test Cases ***
 | tc01-110B-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
index f3a8ba1e86..6fe272a5f4 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -45,10 +45,11 @@
 | ${tg_spi}= | ${1000}
 | ${dut_spi}= | ${1001}
 | ${ESP_PROTO}= | ${50}
-| ${tg_if_ip6}= | 3ffe:5f::1
-| ${dut_if_ip6}= | 3ffe:5f::2
-| ${tg_lo_ip6}= | 3ffe:60::3
-| ${dut_lo_ip6}= | 3ffe:60::4
+| ${tg_if1_ip6}= | 3ffe:5f::1
+| ${tg_if2_ip6}= | 3ffe:60::4
+| ${dut_if1_ip6}= | 3ffe:5f::2
+| ${dut_if2_ip6}= | 3ffe:60::3
+| ${tg_host_ip6}= | 3ffe:61::3
 | ${ip6_plen}= | ${64}
 | ${ip6_plen_rt}= | ${128}
 
@@ -82,12 +83,12 @@
 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
 | | And Configure manual keyed connection for IPSec
 | | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg}
-| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_src_ip} | ${tg_src_ip}
+| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${tg_dst_ip} | ${tg_src_ip}
 | | ... | ${dut_tun_ip} | ${tg_tun_ip} | is_ipv6=${TRUE}
 | | Then Send IPsec Packet and verify ESP encapsulation in received packet
-| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac}
+| | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${dut1_if1_mac} | ${dut1_if2_mac}
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi}
-| | ... | ${dut_spi} | ${tg_src_ip} | ${dut_src_ip} | ${tg_tun_ip}
+| | ... | ${dut_spi} | ${tg_src_ip} | ${tg_dst_ip} | ${tg_tun_ip}
 | | ... | ${dut_tun_ip}
 
 *** Test Cases ***
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
index 473cd001a9..342ce95005 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -45,10 +45,11 @@
 | ${tg_spi}= | ${1000}
 | ${dut_spi}= | ${1001}
 | ${ESP_PROTO}= | ${50}
-| ${tg_if_ip6}= | 3ffe:5f::1
-| ${dut_if_ip6}= | 3ffe:5f::2
-| ${tg_lo_ip6}= | 3ffe:60::3
-| ${dut_lo_ip6}= | 3ffe:60::4
+| ${tg_if1_ip6}= | 3ffe:5f::1
+| ${tg_if2_ip6}= | 3ffe:60::4
+| ${dut_if1_ip6}= | 3ffe:5f::2
+| ${dut_if2_ip6}= | 3ffe:60::3
+| ${tg_host_ip6}= | 3ffe:61::3
 | ${ip6_plen}= | ${64}
 | ${ip6_plen_rt}= | ${128}
 
@@ -82,12 +83,12 @@
 | | And Generate keys for IPSec | ${encr_alg} | ${auth_alg}
 | | And Configure manual keyed connection for IPSec
 | | ... | ${dut1} | ${dut1_if1} | ${encr_alg} | ${encr_key} | ${auth_alg}
-| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${dut_tun_ip} | ${tg_tun_ip}
+| | ... | ${auth_key} | ${dut_spi} | ${tg_spi} | ${tg_dst_ip} | ${tg_src_ip}
 | | ... | is_ipv6=${TRUE}
 | | Then Send IPsec Packet and verify ESP encapsulation in received packet
-| | ... | ${tg} | ${tg_if1} | ${dut1_if1_mac}
+| | ... | ${tg} | ${tg_if1} | ${tg_if2} | ${dut1_if1_mac} | ${dut1_if2_mac}
 | | ... | ${encr_alg} | ${encr_key} | ${auth_alg} | ${auth_key} | ${tg_spi}
-| | ... | ${dut_spi} | ${tg_tun_ip} | ${dut_tun_ip}
+| | ... | ${dut_spi} | ${tg_src_ip} | ${tg_dst_ip}
 
 *** Test Cases ***
 | tc01-124B-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev
diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot
index 1c3d543390..dd6b15b845 100644
--- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot
@@ -27,13 +27,13 @@
 | ...
 | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links
 | ... | between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of
 | ... | IPv4.
 | ... | *[Cfg] DUT configuration:* DUT1 and DUT2 are configured with L2
 | ... | bridge-domain (L2BD) MAC learning enabled; Split Horizon Groups (SHG)
 | ... | are set depending on test case; Namespaces (NM)
 | ... | are set on DUT1 with attached linux-TAP.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61
 | ... | are sent by TG on link to DUT1; On receipt TG verifies packets
 | ... | for correctness and their IPv4 src-addr, dst-addr, and MAC addresses.
 | ... | *[Ref] Applicable standard specifications:*
@@ -78,10 +78,10 @@
 | | And Add interface to bridge domain | ${dut1} | ${dut1_if1} | 20 | 0
 | | And Add interface to bridge domain | ${dut1} | ${int2} | 19 | 0
 | | And Add interface to bridge domain | ${dut1} | ${dut1_if2} | 19 | 0
-| | Then Send ICMP packet and verify received packet
+| | Then Send IP packet and verify received packet
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-l2bdbasemaclrn-eth-2tap-dev
+| tc01-64B-ethipv4-l2bdbasemaclrn-eth-2tap-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot
index 858f4f388e..afdd22b247 100644
--- a/tests/vpp/device/ip4/eth2p-ethicmpv4-ip4base-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot
@@ -27,12 +27,12 @@
 | ...
 | ... | *[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.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 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 \
+| ... | *[Ver] TG verification:* Test IPv4 packet with IP protocol=61 is sent \
+| ... | in one direction by TG on links to DUT1; on receive TG verifies packet \
 | ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
 | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
 
@@ -46,8 +46,8 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Req routed over DUT1 interfaces.\
-| | ... | Make TG verify ICMPv4 Echo Reply is correct.
+| | ... | [Ver] Make TG send IPv4 packet routed over DUT1 interfaces.\
+| | ... | Make TG verify IPv4 packet is correct.
 | | ...
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer. Type: integer
@@ -66,20 +66,12 @@
 | | And Initialize layer interface
 | | And 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}
+| | Then Send packet and verify headers
+| | ... | ${tg} | 192.168.0.1 | 192.168.0.2
+| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
+| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-ip4base-dev
+| tc01-64B-ethipv4-ip4base-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot b/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot
index 9a045f80cf..d1d15b0302 100644
--- a/tests/vpp/device/ip6/eth2p-ethicmpv6-ip6base-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot
@@ -27,13 +27,13 @@
 | ...
 | ... | *[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 \
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 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.
+| ... | *[Ver] TG verification:* Test IPv6 packet is sent in one direction \
+| ... | by TG on links to DUT1; on receive TG verifies packet for correctness \
+| ... | and their IPv6 src-addr, dst-addr and MAC addresses.
 | ... | *[Ref] Applicable standard specifications:* RFC2460, RFC4443, RFC4861
 
 *** Variables ***
@@ -46,8 +46,8 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv6 Echo Req routed over DUT1 interfaces;\
-| | ... | Make TG verify ICMPv6 Echo Reply is correct.
+| | ... | [Ver] Make TG send IPv6 packet routed over DUT1 interfaces;\
+| | ... | Make TG verify IPv6 packet is correct.
 | | ...
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer. Type: integer
@@ -66,20 +66,12 @@
 | | And Initialize layer interface
 | | And 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}
+| | Then Send packet and verify headers
+| | ... | ${tg} | 3ffe:5f::1 | 3ffe:5f::2
+| | ... | ${tg_if1} | ${tg_if1_mac} | ${dut1_if1_mac}
+| | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
 
 *** Test Cases ***
-| tc01-78B-ethicmpv6-ip6base-dev
+| tc01-78B-ethipv6-ip6base-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
index 6fb6da40a7..9f9da32659 100644
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
@@ -55,9 +55,9 @@
 *** Keywords ***
 | Local template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\
-| | ... | of its interfaces to be switched by DUT to and from docker; verify\
-| | ... | all packets are received.
+| | ... | [Ver] Make TG send IPv4 packet in one direction between two\
+| | ... | of its interfaces to be switched by DUT to and from docker.\
+| | ... | Make TG verify IPv4 packet is correct.
 | | ...
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer or string (IMIX_v4_1).
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
index 55e56ba932..5497412e39 100644
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
@@ -47,7 +47,7 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\
+| | ... | [Ver] Make TG send IPv4 packets in both directions between two\
 | | ... | of its interfaces to be switched by DUT to and from docker; verify\
 | | ... | all packets are received.
 | | ...
@@ -68,7 +68,7 @@
 | | And Initialize layer interface
 | | And Initialize layer dot1q
 | | And Initialize L2 bridge domain
-| | Then Send ICMPv4 bidirectionally and verify received packets
+| | Then Send IPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
 
 *** Test Cases ***
diff --git a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot
index 69430d2f85..afb33db29e 100644
--- a/tests/vpp/device/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot
@@ -15,7 +15,7 @@
 | Resource | resources/libraries/robot/shared/default.robot
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | ICMP | DRV_VFIO_PCI
+| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | DRV_VFIO_PCI
 | ...
 | Suite Setup | Setup suite single link | scapy
 | Test Setup | Setup test
@@ -27,11 +27,11 @@
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of \
-| ... | IPv4. Both apply to all links.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.\
+| ... | Both apply to all links.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 bridge-domain \
 | ... | switching.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets \
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61 \
 | ... | are sent in both directions by TG on links to DUT1; on receive TG \
 | ... | verifies packets for correctness and their IPv4 src-addr, \
 | ... | dst-addr and MAC addresses.
@@ -47,7 +47,7 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\
+| | ... | [Ver] Make TG send IPv4 packets in both directions between two\
 | | ... | of its interfaces to be switched by DUT to and from docker; verify\
 | | ... | all packets are received.
 | | ...
@@ -67,10 +67,10 @@
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize L2 bridge domain
-| | Then Send ICMPv4 bidirectionally and verify received packets
+| | Then Send IPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-l2bdbasemaclrn-dev
+| tc01-64B-ethipv4-l2bdbasemaclrn-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot b/tests/vpp/device/l2xc/eth2p-ethipv4-l2xcbase-dev.robot
index 3a6a1ecd26..bce1c50c1e 100644
--- a/tests/vpp/device/l2xc/eth2p-ethicmpv4-l2xcbase-dev.robot
+++ b/tests/vpp/device/l2xc/eth2p-ethipv4-l2xcbase-dev.robot
@@ -15,7 +15,7 @@
 | Resource | resources/libraries/robot/shared/default.robot
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | L2XCFWD | BASE | ICMP | DRV_VFIO_PCI
+| ... | NIC_Virtual | ETH | L2XCFWD | BASE | DRV_VFIO_PCI
 | ...
 | Suite Setup | Setup suite single link | scapy
 | Test Setup | Setup test
@@ -27,11 +27,11 @@
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology \
 | ... | with single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of \
-| ... | IPv4. Both apply to all links.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.\
+| ... | Both apply to all links.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect \
 | ... | switching.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets \
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61 \
 | ... | are sent in both directions by TG on links to DUT1; on receive TG \
 | ... | verifies packets for correctness and their IPv4 src-addr, \
 | ... | dst-addr and MAC addresses.
@@ -47,7 +47,7 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Ver] Make TG send ICMPv4 Echo Reqs in both directions between two\
+| | ... | [Ver] Make TG send IPv4 packets in both directions between two\
 | | ... | of its interfaces to be switched by DUT to and from docker; verify\
 | | ... | all packets are received.
 | | ...
@@ -67,10 +67,10 @@
 | | When Initialize layer driver | ${nic_driver}
 | | And Initialize layer interface
 | | And Initialize L2 xconnect in 2-node circular topology
-| | Then Send ICMPv4 bidirectionally and verify received packets
+| | Then Send IPv4 bidirectionally and verify received packets
 | | ... | ${tg} | ${tg_if1} | ${tg_if2}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-l2xcbase-dev
+| tc01-64B-ethipv4-l2xcbase-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethipv4-ip4base-eth-2vhost-1vm-dev.robot
index ecdbc19e4b..82bcb8d20b 100644
--- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethicmpv4-ip4base-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethipv4-ip4base-eth-2vhost-1vm-dev.robot
@@ -27,14 +27,13 @@
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
 | ... | VM and single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for IPv4 routing on \
-| ... | both links.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for IPv4 routing on both links.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv4 routing and \
 | ... | two static IPv4 /24 route entries. Qemu Guest is connected to VPP via \
 | ... | vhost-user interfaces. Guest is running VPP ip4 interconnecting \
 | ... | vhost-user interfaces.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
-| ... | one direction by TG on links to DUT1; on receive TG verifies packets \
+| ... | *[Ver] TG verification:* Test IPv4 packet with IP protocol=61 is sent \
+| ... | in one direction by TG on links to DUT1; on receive TG verifies packet \
 | ... | for correctness and their IPv4 src-addr, dst-addr and MAC addresses.
 | ... | *[Ref] Applicable standard specifications:* RFC791, RFC826, RFC792
 
@@ -85,6 +84,6 @@
 | | ... | ${tg_if2} | ${dut1_if2_mac} | ${tg_if2_mac}
 
 *** Test Cases ***
-| tc01-64B-ethicmp4-ip4base-eth-2vhost-1vm-dev
+| tc01-64B-ethip4-ip4base-eth-2vhost-1vm-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethipv6-ip6base-eth-2vhost-1vm-dev.robot
index 8e4cf4e6cb..bb0fb87c46 100644
--- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethicmpv6-ip6base-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethipv6-ip6base-eth-2vhost-1vm-dev.robot
@@ -27,15 +27,14 @@
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
 | ... | VM and single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv6-ICMPv6 for IPv6 routing on \
-| ... | both links.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv6 for IPv6 routing on both links.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with IPv6 routing and \
 | ... | two static IPv6 /64 route entries. Qemu Guest is connected to VPP via \
 | ... | vhost-user interfaces. Guest is running VPP ip6 interconnecting \
 | ... | vhost-user interfaces.
-| ... | *[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.
+| ... | *[Ver] TG verification:* Test IPv6 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 ***
@@ -86,6 +85,6 @@
 
 
 *** Test Cases ***
-| tc01-64B-ethicmpv6-ip6base-eth-2vhost-1vm-dev
+| tc01-64B-ethipv6-ip6base-eth-2vhost-1vm-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
index 6b0e4853e0..0dcacc3396 100644
--- a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
@@ -15,7 +15,7 @@
 | Resource | resources/libraries/robot/shared/default.robot
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | ICMP | VHOST | 1VM
+| ... | NIC_Virtual | ETH | L2BDMACLRN | BASE | VHOST | 1VM
 | ... | DRV_VFIO_PCI
 | ...
 | Suite Setup | Setup suite single link | scapy
@@ -28,17 +28,16 @@
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
 | ... | VM and single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of \
-| ... | IPv4.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with two L2 \
 | ... | bridge-domains (L2BD) switching combined with MAC learning enabled. \
 | ... | Qemu Guest is connected to VPP via vhost-user interfaces. Guest is \
 | ... | configured with VPP l2 cross-connect interconnecting vhost-user \
 | ... | interfaces.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
-| ... | both directions by TG on links to DUT1 via VM; on receive TG verifies \
-| ... | packets for correctness and their IPv4 src-addr, dst-addr and MAC \
-| ... | addresses.
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61 are \
+| ... | sent in both directions by TG on links to DUT1 via VM; on receive TG \
+| ... | verifies packets for correctness and their IPv4 src-addr, dst-addr \
+| ... | and MAC addresses.
 | ... | *[Ref] Applicable standard specifications:* RFC792
 
 *** Variables ***
@@ -55,12 +54,11 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT1 configure \
+| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv4. [Cfg] On DUT1 configure \
 | | ... | two L2BDs with MAC learning, each with vhost-user i/f to local \
 | | ... | VM and i/f to TG; configure VPP in VM to loop pkts back betwen its \
-| | ... | two virtio i/fs. [Ver] Make TG verify ICMPv4 Echo Req pkts are \
-| | ... | switched thru DUT1 and VM in both directions and are correct on \
-| | ... | receive. [Ref]
+| | ... | two virtio i/fs. [Ver] Make TG verify IPv4 packets are switched \
+| | ... | thru DUT1 and VM in both directions and are correct on receive.
 | | ...
 | | ... | *Arguments:*
 | | ... | - frame_size - Framesize in Bytes in integer. Type: integer
@@ -82,10 +80,10 @@
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | vnf=vpp_chain_l2xc
 | | ... | pinning=${False}
-| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg}
+| | Then Send IPv4 bidirectionally and verify received packets | ${tg}
 | | ... | ${tg_if1} | ${tg_if2}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-l2bdbasemaclrn-eth-2vhost-1vm-dev
+| tc01-64B-ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethipv4-l2xcbase-eth-2vhost-1vm-dev.robot
index c9b2e40d4f..c8ea1c5a7d 100644
--- a/tests/vpp/device/vm_vhost/l2xc/eth2p-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethipv4-l2xcbase-eth-2vhost-1vm-dev.robot
@@ -15,7 +15,7 @@
 | Resource | resources/libraries/robot/shared/default.robot
 | ...
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | DEVICETEST | HW_ENV | DCR_ENV | SCAPY
-| ... | NIC_Virtual | ETH | L2XCFWD | BASE | ICMP | VHOST | 1VM | DRV_VFIO_PCI
+| ... | NIC_Virtual | ETH | L2XCFWD | BASE | VHOST | 1VM | DRV_VFIO_PCI
 | ...
 | Suite Setup | Setup suite single link | scapy
 | Test Setup | Setup test
@@ -27,16 +27,15 @@
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-TG 2-node circular topology with \
 | ... | VM and single links between nodes.
-| ... | *[Enc] Packet Encapsulations:* Eth-IPv4-ICMPv4 for L2 switching of \
-| ... | IPv4.
+| ... | *[Enc] Packet Encapsulations:* Eth-IPv4 for L2 switching of IPv4.
 | ... | *[Cfg] DUT configuration:* DUT1 is configured with L2 cross-connect \
 | ... | (L2XC) switching. Qemu Guest is connected to VPP via vhost-user \
 | ... | interfaces. Guest is configured with VPP l2 cross-connect \
 | ... | interconnecting vhost-user interfaces.
-| ... | *[Ver] TG verification:* Test ICMPv4 Echo Request packets are sent in \
-| ... | both directions by TG on links to DUT1 via VM; on receive TG verifies \
-| ... | packets for correctness and their IPv4 src-addr, dst-addr and MAC \
-| ... | addresses.
+| ... | *[Ver] TG verification:* Test IPv4 packets with IP protocol=61 are \
+| ... | sent in both directions by TG on links to DUT1 via VM; on receive TG \
+| ... | verifies packets for correctness and their IPv4 src-addr, dst-addr \
+| ... | and MAC addresses.
 | ... | *[Ref] Applicable standard specifications:* RFC792
 
 *** Variables ***
@@ -53,10 +52,10 @@
 *** Keywords ***
 | Local Template
 | | [Documentation]
-| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv4-ICMPv4. [Cfg] On DUT configure \
+| | ... | [Top] TG=DUT=VM. [Enc] Eth-IPv4. [Cfg] On DUT configure \
 | | ... | two L2 cross-connects (L2XC), each with one untagged interface \
 | | ... | to TG and untagged i/f to local VM over vhost-user. [Ver] Make \
-| | ... | TG send ICMPv4 Echo Reqs in both directions between two of its \
+| | ... | TG send IPv4 packets in both directions between two of its \
 | | ... | i/fs to be switched by DUT to and from VM; verify all packets \
 | | ... | are received. [Ref]
 | | ...
@@ -79,10 +78,10 @@
 | | And Configure chains of NFs connected via vhost-user
 | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | vnf=vpp_chain_l2xc
 | | ... | pinning=${False}
-| | Then Send ICMPv4 bidirectionally and verify received packets | ${tg}
+| | Then Send IPv4 bidirectionally and verify received packets | ${tg}
 | | ... | ${tg_if1} | ${tg_if2}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-l2xcbase-eth-2vhost-1vm-dev
+| tc01-64B-ethipv4-l2xcbase-eth-2vhost-1vm-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}