FIX: do not use ping in vpp-device tests

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

1 files changed, 33 insertions, 46 deletions

diff --git a/resources/libraries/robot/l2/l2_traffic.robot b/resources/libraries/robot/l2/l2_traffic.robot
index bca801778e..93506d585e 100644
--- a/resources/libraries/robot/l2/l2_traffic.robot
+++ b/resources/libraries/robot/l2/l2_traffic.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 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:
@@ -18,8 +18,8 @@
 | ... | through L2 network.
 
 *** Keywords ***
-| Send ICMP packet and verify received packet
-| | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to \
+| Send IP packet and verify received packet
+| | [Documentation] | Send IPv4/IPv6 packet from source interface to \
 | | ... | destination interface. Packet can be set with Dot1q or
 | | ... | Dot1ad tag(s) when required.
 | | ...
@@ -46,47 +46,34 @@
 | | ...
 | | ... | _NOTE:_ Default IP is IPv4
 | | ...
-| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
+| | ... | \| Send IP packet and verify received packet \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
-| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
+| | ... | \| Send IP packet and verify received packet \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut1} \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=100 \|
-| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
+| | ... | \| Send IP packet and verify received packet \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut1} \| ${tg_to_dut2} \| encaps=Dot1ad \| vlan1=110 \
 | | ... | \| vlan2=220 \|
-| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
+| | ... | \| Send IP packet and verify received packet \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut1} \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=110 \
 | | ... | \| encaps_rx=Dot1q \|
-| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
+| | ... | \| Send IP packet and verify received packet \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut1} \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=110 \
 | | ... | \| encaps_rx=Dot1q \| vlan1_rx=120 \|
 | | ...
-| | [Arguments] | ${tg_node} | ${src_int} | ${dst_int}
-| | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2 | ${encaps}=${EMPTY}
-| | ... | ${vlan1}=${EMPTY} | ${vlan2}=${EMPTY} | ${encaps_rx}=${EMPTY}
-| | ... | ${vlan1_rx}=${EMPTY} | ${vlan2_rx}=${EMPTY}
-| | ...
-| | ${src_mac}= | Get Interface Mac | ${tg_node} | ${src_int}
-| | ${dst_mac}= | Get Interface Mac | ${tg_node} | ${dst_int}
-| | ${src_int_name}= | Get interface name | ${tg_node} | ${src_int}
-| | ${dst_int_name}= | Get interface name | ${tg_node} | ${dst_int}
-| | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name}
-| | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip}
-| | ${args}= | Run Keyword If | '${encaps}' == '${EMPTY}'
-| | | ... | Set Variable | ${args}
-| | ... | ELSE | Catenate | ${args} | --encaps ${encaps} | --vlan1 ${vlan1}
-| | ${args}= | Run Keyword If | '${vlan2}' == '${EMPTY}'
-| | | ... | Set Variable | ${args}
-| | ... | ELSE | Catenate | ${args} | --vlan2 ${vlan2}
-| | ${args}= | Run Keyword If | '${encaps_rx}' == '${EMPTY}'
-| | | ... | Set Variable | ${args}
-| | ... | ELSE | Catenate | ${args} | --encaps_rx ${encaps_rx}
-| | ${args}= | Run Keyword If | '${vlan1_rx}' == '${EMPTY}'
-| | | ... | Set Variable | ${args}
-| | ... | ELSE | Catenate | ${args} | --vlan1_rx ${vlan1_rx}
-| | ${args}= | Run Keyword If | '${vlan2_rx}' == '${EMPTY}'
-| | | ... | Set Variable | ${args}
-| | ... | ELSE | Catenate | ${args} | --vlan2_rx ${vlan2_rx}
-| | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
+| | [Arguments] | ${tg_node} | ${tx_src_port} | ${rx_dst_port}
+| | ... | ${src_ip}=192.168.100.1 | ${dst_ip}=192.168.100.2
+| | ... | ${encaps}=${EMPTY} | ${vlan1}=${EMPTY} | ${vlan2}=${EMPTY}
+| | ... | ${encaps_rx}=${EMPTY} | ${vlan1_rx}=${EMPTY} | ${vlan2_rx}=${EMPTY}
+| | ...
+| | ${tx_src_mac}= | Get Interface Mac | ${tg_node} | ${tx_src_port}
+| | ${rx_dst_mac}= | Get Interface Mac | ${tg_node} | ${rx_dst_port}
+| | Then Send packet and verify headers
+| | ... | ${tg} | 192.168.0.1 | 192.168.0.2
+| | ... | ${tx_src_port} | ${tx_src_mac} | ${rx_dst_mac}
+| | ... | ${rx_dst_port} | ${tx_src_mac} | ${rx_dst_mac}
+| | ... | encaps_tx=${encaps} | vlan_tx=${vlan1} | vlan_outer_tx=${vlan2}
+| | ... | encaps_rx=${encaps_rx} | vlan_rx=${vlan1_rx}
+| | ... | vlan_outer_rx=${vlan2_rx}
 
 | ICMP packet transmission should fail
 | | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to
@@ -121,11 +108,11 @@
 | | ${dst_int_name}= | Get interface name | ${tg_node} | ${dst_int}
 | | ${args}= | Traffic Script Gen Arg | ${dst_int_name} | ${src_int_name}
 | | ... | ${src_mac} | ${dst_mac} | ${src_ip} | ${dst_ip}
-| | Run Keyword And Expect Error | ICMP echo Rx timeout |
+| | Run Keyword And Expect Error | IP echo Rx timeout |
 | | ... | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
 
-| Send ICMPv4 bidirectionally and verify received packets
-| | [Documentation] | Send ICMPv4 echo request from both directions,
+| Send IPv4 bidirectionally and verify received packets
+| | [Documentation] | Send IPv4 packets from both directions,
 | | ... | from interface1 to interface2 and from interface2 to interface1.
 | | ...
 | | ... | *Arguments:*
@@ -142,19 +129,19 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send ICMPv4 bidirectionally and verify received packets \
+| | ... | \| Send IPv4 bidirectionally and verify received packets \
 | | ... | \| ${nodes['TG']} \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=192.168.100.1 |
 | | ... | ${dst_ip}=192.168.100.2
 | | ...
-| | Send ICMP packet and verify received packet
+| | Send IP packet and verify received packet
 | | ... | ${tg_node} | ${int1} | ${int2} | ${src_ip} | ${dst_ip}
-| | Send ICMP packet and verify received packet
+| | Send IP packet and verify received packet
 | | ... | ${tg_node} | ${int2} | ${int1} | ${dst_ip} | ${src_ip}
 
-| Send ICMPv6 bidirectionally and verify received packets
-| | [Documentation] | Send ICMPv6 echo request from both directions,
+| Send IPv6 bidirectionally and verify received packets
+| | [Documentation] | Send IPv6 packets from both directions,
 | | ... | from interface1 to interface2 and from interface2 to interface1.
 | | ...
 | | ... | *Arguments:*
@@ -171,13 +158,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send ICMPv6 bidirectionally and verify received packets \
+| | ... | \| Send IPv6 bidirectionally and verify received packets \
 | | ... | \| ${nodes['TG']} \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=3ffe:63::1 |
 | | ... | ${dst_ip}=3ffe:63::2
 | | ...
-| | Send ICMP packet and verify received packet
+| | Send IP packet and verify received packet
 | | ... | ${tg_node} | ${int1} | ${int2} | ${src_ip} | ${dst_ip}
-| | Send ICMP packet and verify received packet
+| | Send IP packet and verify received packet
 | | ... | ${tg_node} | ${int2} | ${int1} | ${dst_ip} | ${src_ip}