CSIT-124: IPv4 encapsulations - IP4-GRE-IP4

- add gre test with multiple tunnel configured
- configure tunnel source as a loopback
- route from tunnel to tunnel
- check droping unknown tunnel destination

Change-Id: Ib522d158d9de5c66f556c6734ceadc994eea02d4
Signed-off-by: Matej Klotton <mklotton@cisco.com>

3 files changed, 440 insertions, 101 deletions

diff --git a/resources/libraries/robot/gre.robot b/resources/libraries/robot/gre.robot
index 23d6ff9098..6ff0d989dd 100644
--- a/resources/libraries/robot/gre.robot
+++ b/resources/libraries/robot/gre.robot
@@ -16,18 +16,18 @@
 
 *** Keywords ***
 | GRE tunnel interface is created and up
-| | [Documentation] | Create GRE tunnel interface on defined VPP node and put
-| | ...             | the interface to UP state.
+| | [Documentation] | Create GRE tunnel interface on defined VPP node and put \
+| | ... | the interface to UP state.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node where to create GRE tunnel. Type: dictionary
-| | ... | - ${source_ip_address} - GRE tunnel source IP address. Type: string
-| | ... | - ${destination_ip_address} - GRE tunnel destination IP address.
+| | ... | - dut_node - DUT node where to create GRE tunnel. Type: dictionary
+| | ... | - source_ip_address - GRE tunnel source IP address. Type: string
+| | ... | - destination_ip_address - GRE tunnel destination IP address.
 | | ... |   Type: string
 | | ...
 | | ... | *Return:*
-| | ... | - ${name} - Name of created GRE tunnel interface. Type: string
-| | ... | - ${index} - SW interface index of created GRE tunnel interface.
+| | ... | - name - Name of created GRE tunnel interface. Type: string
+| | ... | - index - SW interface index of created GRE tunnel interface.
 | | ... |   Type: integer
 | | ...
 | | ... | *Example:*
@@ -38,27 +38,27 @@
 | | ...
 | | [Arguments] | ${dut_node} | ${source_ip_address} | ${destination_ip_address}
 | | ${name} | ${index}= | Create GRE Tunnel Interface
-| | | | ... | ${dut_node} | ${source_ip_address} | ${destination_ip_address}
+| | ... | ${dut_node} | ${source_ip_address} | ${destination_ip_address}
 | | Set Interface State | ${dut_node} | ${index} | up
 | | [Return] | ${name} | ${index}
 
 
 | Send ICMPv4 and check received GRE header
-| | [Documentation] | Send ICMPv4 packet and check if received packed contains
-| | ...             | correct GRE, IP, MAC headers.
+| | [Documentation] | Send ICMPv4 packet and check if received packed contains \
+| | ... | correct GRE, IP, MAC headers.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${tg_node} - Node where to run traffic script. Type: dictionary
-| | ... | - ${tx_if} - Interface from where send ICPMv4 packet. Type: string
-| | ... | - ${rx_if} - Interface where to receive GRE packet. Type: string
-| | ... | - ${tx_dst_mac} - Destination MAC address of ICMP packet. Type: string
-| | ... | - ${rx_dst_mac} - Expected destination MAC address of GRE packet.
+| | ... | - tg_node - Node where to run traffic script. Type: dictionary
+| | ... | - tx_if - Interface from where send ICPMv4 packet. Type: string
+| | ... | - rx_if - Interface where to receive GRE packet. Type: string
+| | ... | - tx_dst_mac - Destination MAC address of ICMP packet. Type: string
+| | ... | - rx_dst_mac - Expected destination MAC address of GRE packet.
 | | ... |   Type: string
-| | ... | - ${inner_src_ip} - Source IP address of ICMP packet. Type: string
-| | ... | - ${inner_dst_ip} - Destination IP address of ICMP packet.
+| | ... | - inner_src_ip - Source IP address of ICMP packet. Type: string
+| | ... | - inner_dst_ip - Destination IP address of ICMP packet.
 | | ... |   Type: string
-| | ... | - ${outer_src_ip} - Source IP address of GRE packet. Type: string
-| | ... | - ${outer_dst_ip} - Destination IP address of GRE packet.
+| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
+| | ... | - outer_dst_ip - Destination IP address of GRE packet.
 | | ... |   Type: string
 | | ...
 | | ... | *Return:*
@@ -72,35 +72,35 @@
 | | ... | \| ${net2_host_address} \| ${dut1_ip_address} \| ${dut2_ip_address} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
-| | ...         | ${tx_dst_mac} | ${rx_dst_mac}
-| | ...         | ${inner_src_ip} | ${inner_dst_ip}
-| | ...         | ${outer_src_ip} | ${outer_dst_ip}
+| | ... | ${tx_dst_mac} | ${rx_dst_mac}
+| | ... | ${inner_src_ip} | ${inner_dst_ip}
+| | ... | ${outer_src_ip} | ${outer_dst_ip}
 | | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
 | | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
 | | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
-| | | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
-| | | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
-| | | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
+| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
+| | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
+| | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
 | | Run Traffic Script On Node
 | | ... | send_icmp_check_gre_headers.py | ${tg_node} | ${args}
 
 
 | Send GRE and check received ICMPv4 header
-| | [Documentation] | Send ICMPv4 packet and check if received packed contains
-| | ...             | correct GRE, IP, MAC headers.
+| | [Documentation] | Send IPv4 ICMPv4 packet encapsulated into GRE and \
+| | ... | check IP, MAC headers on received packed.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${tg_node} - Node where to run traffic script. Type: dictionary
-| | ... | - ${tx_if} - Interface from where send ICPMv4 packet. Type: string
-| | ... | - ${rx_if} - Interface where receive GRE packet. Type: string
-| | ... | - ${tx_dst_mac} - Destination MAC address of GRE packet. Type: string
-| | ... | - ${rx_dst_mac} - Expected destination MAC address of ICMP packet.
+| | ... | - tg_node - Node where to run traffic script. Type: dictionary
+| | ... | - tx_if - Interface from where send ICPMv4 packet. Type: string
+| | ... | - rx_if - Interface where receive GRE packet. Type: string
+| | ... | - tx_dst_mac - Destination MAC address of GRE packet. Type: string
+| | ... | - rx_dst_mac - Expected destination MAC address of ICMP packet.
 | | ... |   Type: string
-| | ... | - ${inner_src_ip} - Source IP address of ICMP packet. Type: string
-| | ... | - ${inner_dst_ip} - Destination IP address of ICMP packet.
+| | ... | - inner_src_ip - Source IP address of ICMP packet. Type: string
+| | ... | - inner_dst_ip - Destination IP address of ICMP packet.
 | | ... |   Type: string
-| | ... | - ${outer_src_ip} - Source IP address of GRE packet. Type: string
-| | ... | - ${outer_dst_ip} - Destination IP address of  GRE packet.
+| | ... | - outer_src_ip - Source IP address of GRE packet. Type: string
+| | ... | - outer_dst_ip - Destination IP address of  GRE packet.
 | | ... |   Type: string
 | | ...
 | | ... | *Return:*
@@ -114,14 +114,69 @@
 | | ... | \| ${dut2_ip_address} \| ${dut1_ip_address} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
-| | ...         | ${tx_dst_mac} | ${rx_dst_mac}
-| | ...         | ${inner_src_ip} | ${inner_dst_ip}
-| | ...         | ${outer_src_ip} | ${outer_dst_ip}
+| | ... | ${tx_dst_mac} | ${rx_dst_mac}
+| | ... | ${inner_src_ip} | ${inner_dst_ip}
+| | ... | ${outer_src_ip} | ${outer_dst_ip}
 | | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
 | | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
 | | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
-| | | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
-| | | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
-| | | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
+| | ... | --tx_dst_mac | ${tx_dst_mac} | --rx_dst_mac | ${rx_dst_mac}
+| | ... | --inner_src_ip | ${inner_src_ip} | --inner_dst_ip | ${inner_dst_ip}
+| | ... | --outer_src_ip | ${outer_src_ip} | --outer_dst_ip | ${outer_dst_ip}
 | | Run Traffic Script On Node
 | | ... | send_gre_check_icmp_headers.py | ${tg_node} | ${args}
+
+| Send GRE and check received GRE header
+| | [Documentation] | Send IPv4 UDP packet encapsulated into GRE and \
+| | ... | check if received packed contains correct MAC GRE, IP, UDP headers.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - Node where to run traffic script. Type: dictionary
+| | ... | - tx_if - Interface from where send GRE packet. Type: string
+| | ... | - rx_if - Interface where to receive GRE packet. Type: string
+| | ... | - tx_dst_mac - Destination MAC address of transferred packet.
+| | ... |   Type: string
+| | ... | - tx_src_mac - Source MAC address of transferred packet. Type: string
+| | ... | - tx_outer_dst_ip - Destination IP address of GRE packet. Type: string
+| | ... | - tx_outer_src_ip - Source IP address of GRE packet. Type: string
+| | ... | - tx_inner_dst_ip - Destination IP address of UDP packet. Type: string
+| | ... | - tx_inner_src_ip - Source IP address of UDP packet. Type: string
+| | ... | - rx_dst_mac - Expected destination MAC address. Type: string
+| | ... | - rx_src_mac - Expected source MAC address. Type: string
+| | ... | - rx_outer_dst_ip - Expected destination IP address of received GRE
+| | ... |   packet. Type: string
+| | ... | - rx_outer_src_ip - Expected source IP address of received GRE
+| | ... |   packet. Type: string
+| | ...
+| | ... | __Note:__
+| | ... | rx_inner_dst_ip and rx_inner_src_ip should be same as transferred
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ... | \| Send GRE and check received GRE header \| ${tg_node} \
+| | ... | \| port3 \| port3 \| 08:00:27:f3:be:f0 \| 08:00:27:46:2b:4c \
+| | ... | \| 10.0.0.1 \| 10.0.0.2 \| 192.168.3.100 \| 192.168.2.100 \
+| | ... | \| 08:00:27:46:2b:4c \| 08:00:27:f3:be:f0 \| 10.0.0.3 \| 10.0.0.1 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
+| | ... | ${tx_dst_mac} | ${tx_src_mac}
+| | ... | ${tx_outer_dst_ip} | ${tx_outer_src_ip}
+| | ... | ${tx_inner_dst_ip} | ${tx_inner_src_ip}
+| | ... | ${rx_dst_mac} | ${rx_src_mac}
+| | ... | ${rx_outer_dst_ip} | ${rx_outer_src_ip}
+| | ${tx_if_name}= | Get interface name | ${tg_node} | ${tx_if}
+| | ${rx_if_name}= | Get interface name | ${tg_node} | ${rx_if}
+| | ${args}= | Catenate | --tx_if | ${tx_if_name} | --rx_if | ${rx_if_name}
+| | ... | --tx_dst_mac | ${tx_dst_mac} | --tx_src_mac | ${tx_src_mac}
+| | ... | --tx_outer_dst_ip | ${tx_outer_dst_ip}
+| | ... | --tx_outer_src_ip | ${tx_outer_src_ip}
+| | ... | --tx_inner_dst_ip | ${tx_inner_dst_ip}
+| | ... | --tx_inner_src_ip | ${tx_inner_src_ip}
+| | ... | --rx_dst_mac | ${rx_dst_mac}
+| | ... | --rx_src_mac | ${rx_src_mac}
+| | ... | --rx_outer_dst_ip | ${rx_outer_dst_ip}
+| | ... | --rx_outer_src_ip | ${rx_outer_src_ip}
+| | Run Traffic Script On Node
+| | ... | send_gre_check_gre_headers.py | ${tg_node} | ${args}
diff --git a/resources/traffic_scripts/send_gre_check_gre_headers.py b/resources/traffic_scripts/send_gre_check_gre_headers.py
new file mode 100755
index 0000000000..9e2e2abe06
--- /dev/null
+++ b/resources/traffic_scripts/send_gre_check_gre_headers.py
@@ -0,0 +1,124 @@
+#!/usr/bin/env python
+# Copyright (c) 2016 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.
+
+"""Traffic script that sends a UDP encapsulated into GRE packet from one
+interface to the other, where GRE encapsulated packet is expected.
+"""
+
+import sys
+
+from robot.api import logger
+from scapy.all import Ether
+from scapy.layers.inet import IP_PROTOS
+from scapy.layers.inet import IP
+from scapy.layers.inet import UDP
+from scapy.layers.l2 import GRE
+
+from resources.libraries.python.PacketVerifier import RxQueue, TxQueue
+from resources.libraries.python.TrafficScriptArg import TrafficScriptArg
+
+
+def main():
+    args = TrafficScriptArg(
+        ['tx_dst_mac', 'tx_src_mac', 'tx_outer_dst_ip', 'tx_outer_src_ip',
+         'tx_inner_dst_ip', 'tx_inner_src_ip', 'rx_dst_mac', 'rx_src_mac',
+         'rx_outer_dst_ip', 'rx_outer_src_ip'])
+
+    tx_if = args.get_arg('tx_if')
+    rx_if = args.get_arg('rx_if')
+    tx_dst_mac = args.get_arg('tx_dst_mac')
+    tx_src_mac = args.get_arg('tx_src_mac')
+    tx_outer_dst_ip = args.get_arg('tx_outer_dst_ip')
+    tx_outer_src_ip = args.get_arg('tx_outer_src_ip')
+    tx_inner_dst_ip = args.get_arg('tx_inner_dst_ip')
+    tx_inner_src_ip = args.get_arg('tx_inner_src_ip')
+    rx_dst_mac = args.get_arg('rx_dst_mac')
+    rx_src_mac = args.get_arg('rx_src_mac')
+    rx_outer_dst_ip = args.get_arg('rx_outer_dst_ip')
+    rx_outer_src_ip = args.get_arg('rx_outer_src_ip')
+    udp_src = 1234
+    udp_dst = 2345
+    udp_payload = 'udp_payload'
+
+    rxq = RxQueue(rx_if)
+    txq = TxQueue(tx_if)
+    sent_packets = []
+
+    tx_pkt_raw = Ether(dst=tx_dst_mac, src=tx_src_mac) / \
+        IP(src=tx_outer_src_ip, dst=tx_outer_dst_ip) / \
+        GRE() / \
+        IP(src=tx_inner_src_ip, dst=tx_inner_dst_ip) / \
+        UDP(dport=udp_dst, sport=udp_src) / \
+        udp_payload
+
+    sent_packets.append(tx_pkt_raw)
+    txq.send(tx_pkt_raw)
+    ether = rxq.recv(2, ignore=sent_packets)
+
+    if ether is None:
+        raise RuntimeError("ICMP echo Rx timeout")
+
+    # Check RX headers
+    if ether.dst != rx_dst_mac:
+        raise RuntimeError("Matching of received destination MAC unsuccessful.")
+    logger.debug("Comparison of received destination MAC: OK.")
+
+    if ether.src != rx_src_mac:
+        raise RuntimeError("Matching of received source MAC unsuccessful.")
+    logger.debug("Comparison of received source MAC: OK.")
+
+    if ether['IP'].src != rx_outer_src_ip:
+        raise RuntimeError("Matching of received outer source IP unsuccessful.")
+    logger.debug("Comparison of received outer source IP: OK.")
+
+    if ether['IP'].dst != rx_outer_dst_ip:
+        raise RuntimeError(
+            "Matching of received outer destination IP unsuccessful.")
+    logger.debug("Comparison of received outer destination IP: OK.")
+
+    if ether['IP'].proto != IP_PROTOS.gre:
+        raise RuntimeError("IP protocol is not GRE.")
+    logger.debug("Comparison of received GRE protocol: OK.")
+
+    if ether['IP']['GRE']['IP'].src != tx_inner_src_ip:
+        raise RuntimeError("Matching of received inner source IP unsuccessful.")
+    logger.debug("Comparison of received inner source IP: OK.")
+
+    if ether['IP']['GRE']['IP'].dst != tx_inner_dst_ip:
+        raise RuntimeError(
+            "Matching of received inner destination IP unsuccessful.")
+    logger.debug("Comparison of received inner destination IP: OK.")
+
+    # check udp
+    udp = ether['IP']['GRE']['IP']['UDP']
+    if udp.dport != udp_dst:
+        raise RuntimeError("UDP dport error {} != {}.".
+                           format(udp.dport, udp_dst))
+    print "UDP dport: OK."
+
+    if udp.sport != udp_src:
+        raise RuntimeError("UDP sport error {} != {}.".
+                           format(udp.sport, udp_src))
+    print "UDP sport: OK."
+
+    if str(udp.payload) != udp_payload:
+        raise RuntimeError("UDP payload check unsuccessful {} != {}.".
+                           format(udp.payload, udp_payload))
+    print "UDP payload: OK."
+
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/func/gre/gre_encapsulation.robot b/tests/func/gre/gre_encapsulation.robot
index 17b3fffff2..0296ec3af2 100644
--- a/tests/func/gre/gre_encapsulation.robot
+++ b/tests/func/gre/gre_encapsulation.robot
@@ -20,10 +20,12 @@
 | Library  | resources.libraries.python.IPUtil
 | Library  | resources.libraries.python.Trace
 | Force Tags | VM_ENV | HW_ENV
-| Test Setup | Run Keywords | Setup all DUTs before test
-| ...        | AND          | Setup all TGs before traffic script
-| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
-| ...           | AND          | Show vpp trace dump on all DUTs
+| Test Setup | Run Keywords
+| ... | Setup all DUTs before test | AND
+| ... | Setup all TGs before traffic script
+| Test Teardown | Run Keywords
+| ... | Show Packet Trace on All DUTs | ${nodes} | AND
+| ... | Show vpp trace dump on all DUTs
 | Documentation | *GREoIPv4 test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links
@@ -48,11 +50,20 @@
 | ${net1_gw_address}= | 192.168.0.1
 | ${net2_address}= | 192.168.2.0
 | ${net2_host_address}= | 192.168.2.100
+| ${net3_address}= | 192.168.3.0
+| ${net3_host_address}= | 192.168.3.100
 | ${net2_gw_address}= | 192.168.2.1
 | ${dut1_ip_address}= | 192.168.1.1
 | ${dut2_ip_address}= | 192.168.1.2
 | ${dut1_gre_ip}= | 172.16.0.1
 | ${dut2_gre_ip}= | 172.16.0.2
+| ${dut_tun0_ip1}= | 172.16.0.1
+| ${dut_tun0_ip2}= | 172.16.0.2
+| ${dut_tun1_ip1}= | 172.16.1.1
+| ${dut_tun1_ip2}= | 172.16.1.2
+| ${dut1_lo_address}= | 10.0.0.1
+| ${tun0_dst}= | 10.0.0.2
+| ${tun1_dst}= | 10.0.0.3
 | ${prefix}= | 24
 
 *** Test Cases ***
@@ -66,32 +77,32 @@
 | | ... | received packets are correct. [Ref] RFC2784.
 | | [Tags] | 3_NODE_SINGLE_LINK_TOPO | 3_NODE_DOUBLE_LINK_TOPO
 | | Given Path for 3-node testing is set | ${nodes['TG']} | ${nodes['DUT1']}
-| |       ... | ${nodes['DUT2']} | ${nodes['TG']}
-| | And   Interfaces in 3-node path are up
-| | And   IP addresses are set on interfaces
-| |       ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_ip_address} | ${prefix}
-| |       ... | ${dut1_node} | ${dut1_to_tg}   | ${net1_gw_address} | ${prefix}
-| |       ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_ip_address} | ${prefix}
-| |       ... | ${dut2_node} | ${dut2_to_tg}   | ${net2_gw_address} | ${prefix}
-| | And   VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_ip_address}
-| | And   VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_ip_address}
-| | And   Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${net2_host_address}
-| |       ... | ${tg_to_dut2_mac}
+| | ... | ${nodes['DUT2']} | ${nodes['TG']}
+| | And Interfaces in 3-node path are up
+| | And IP addresses are set on interfaces
+| | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_ip_address} | ${prefix}
+| | ... | ${dut1_node} | ${dut1_to_tg}   | ${net1_gw_address} | ${prefix}
+| | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_ip_address} | ${prefix}
+| | ... | ${dut2_node} | ${dut2_to_tg}   | ${net2_gw_address} | ${prefix}
+| | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_ip_address}
+| | And VPP IP Probe | ${dut2_node} | ${dut2_to_dut1} | ${dut1_ip_address}
+| | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg} | ${net2_host_address}
+| | ... | ${tg_to_dut2_mac}
 | | ${dut1_gre_interface} | ${dut1_gre_index}=
-| | | ... | When GRE tunnel interface is created and up
-| | |     |      ... | ${dut1_node} | ${dut1_ip_address} | ${dut2_ip_address}
+| | ... | When GRE tunnel interface is created and up
+| | ... | ${dut1_node} | ${dut1_ip_address} | ${dut2_ip_address}
 | | ${dut2_gre_interface} | ${dut2_gre_index}=
-| | | ... | And  GRE tunnel interface is created and up
-| | |     |      ... | ${dut2_node} | ${dut2_ip_address} | ${dut1_ip_address}
-| | And  IP addresses are set on interfaces
-| |      ... | ${dut1_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix}
-| |      ... | ${dut2_node} | ${dut2_gre_index} | ${dut2_gre_ip} | ${prefix}
-| | And  Vpp Route Add | ${dut1_node} | ${net2_address} | ${prefix}
-| |      ... | ${dut2_gre_ip} | ${dut1_gre_index}
+| | ... | And  GRE tunnel interface is created and up
+| | ... | ${dut2_node} | ${dut2_ip_address} | ${dut1_ip_address}
+| | And IP addresses are set on interfaces
+| | ... | ${dut1_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix}
+| | ... | ${dut2_node} | ${dut2_gre_index} | ${dut2_gre_ip} | ${prefix}
+| | And Vpp Route Add | ${dut1_node} | ${net2_address} | ${prefix}
+| | ... | ${dut2_gre_ip} | ${dut1_gre_index}
 | | Then Send Packet And Check Headers | ${tg_node}
-| |      ... | ${net1_host_address} | ${net2_host_address}
-| |      ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
-| |      ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
+| | ... | ${net1_host_address} | ${net2_host_address}
+| | ... | ${tg_to_dut1} | ${tg_to_dut1_mac} | ${dut1_to_tg_mac}
+| | ... | ${tg_to_dut2} | ${dut2_to_tg_mac} | ${tg_to_dut2_mac}
 
 | TC02: DUT encapsulates IPv4 into GREoIPv4 tunnel - GRE header verification
 | | [Documentation]
@@ -102,25 +113,25 @@
 | | ... | GREoIPv4 encapsulated packet is correct. [Ref] RFC2784.
 | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
 | | Given Path for 2-node testing is set
-| |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And   Interfaces in 2-node path are up
-| | And   IP addresses are set on interfaces
-| |       ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
-| |       ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
-| | And  Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address}
-| |      ... | ${tg_to_dut_if2_mac}
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Interfaces in 2-node path are up
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
+| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
+| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address}
+| | ... | ${tg_to_dut_if2_mac}
 | | ${dut1_gre_interface} | ${dut1_gre_index}=
-| | | ... | When GRE tunnel interface is created and up
-| | |     |      ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address}
-| | And  IP addresses are set on interfaces
-| |      ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix}
-| | And  Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix}
-| |      ... | ${dut2_gre_ip} | ${dut1_gre_index}
+| | ... | When GRE tunnel interface is created and up
+| | ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address}
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix}
+| | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix}
+| | ... | ${dut2_gre_ip} | ${dut1_gre_index}
 | | Then Send ICMPv4 and check received GRE header
-| |      ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
-| |      ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2_mac}
-| |      ... | ${net1_host_address} | ${net2_host_address}
-| |      ... | ${dut1_ip_address} | ${dut2_ip_address}
+| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
+| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2_mac}
+| | ... | ${net1_host_address} | ${net2_host_address}
+| | ... | ${dut1_ip_address} | ${dut2_ip_address}
 
 | TC03: DUT decapsulates IPv4 from GREoIPv4 tunnel - IPv4 header verification
 | | [Documentation]
@@ -131,20 +142,169 @@
 | | ... | de-encapsulated packet is correct. [Ref] RFC2784.
 | | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
 | | Given Path for 2-node testing is set
-| |       ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And   Interfaces in 2-node path are up
-| | And   IP addresses are set on interfaces
-| |       ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
-| |       ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
-| | And  Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${net1_host_address}
-| |      ... | ${tg_to_dut_if1_mac}
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Interfaces in 2-node path are up
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
+| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
+| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${net1_host_address}
+| | ... | ${tg_to_dut_if1_mac}
 | | ${dut1_gre_interface} | ${dut1_gre_index}=
-| | | ... | When GRE tunnel interface is created and up
-| | |     |      ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address}
-| | And  IP addresses are set on interfaces
-| |      ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix}
+| | ... | When GRE tunnel interface is created and up
+| | ... | ${dut_node} | ${dut1_ip_address} | ${dut2_ip_address}
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut1_gre_index} | ${dut1_gre_ip} | ${prefix}
 | | Then Send GRE and check received ICMPv4 header
-| |      ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
-| |      ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1_mac}
-| |      ... | ${net2_host_address} | ${net1_host_address}
-| |      ... | ${dut2_ip_address} | ${dut1_ip_address}
+| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
+| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1_mac}
+| | ... | ${net2_host_address} | ${net1_host_address}
+| | ... | ${dut2_ip_address} | ${dut1_ip_address}
+
+| TC04: DUT encapsulates IPv4 into GREoIPv4 different tunnels - GRE header verification
+| | [Documentation]
+| | ... | [Top] TG=DUT1. [Enc] Eth-IPv4-ICMPv4 on TG_if1-DUT, \
+| | ... | Eth-IPv4-GRE-IPv4-ICMPv4 on TG_if2_DUT. [Cfg] On DUT1 configure two
+| | ... | GRE tunnels with loopback's source address. Destination address of
+| | ... | tunnels are routed via next hop address of DUT's to TG if2, where
+| | ... | should be only GRE encapsulated packets. Each tunnel has IPv4 address
+| | ... | and configured prefix routed through the tunnel. [Ver] Make TG send
+| | ... | non-encapsulated ICMPv4 Echo Req to DUT; verify TG received GREoIPv4
+| | ... | encapsulated packet is correct for each tunnel. [Ref] RFC2784.
+| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
+| | Given Path for 2-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Interfaces in 2-node path are up
+| | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node}
+| | And Set Interface State |  ${dut_node} | ${dut1_lo_index} | up
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
+| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
+| | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32}
+| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address}
+| | ... | ${tg_to_dut_if2_mac}
+| | And Vpp Route Add | ${dut_node} | ${tun0_dst} | ${32}
+| | ... | ${dut2_ip_address} | ${dut_to_tg_if2}
+| | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32}
+| | ... | ${dut2_ip_address} | ${dut_to_tg_if2}
+| | ${dut1_gre0_interface} | ${dut1_gre0_index}=
+| | ... | When GRE tunnel interface is created and up
+| | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst}
+| | ${dut1_gre1_interface} | ${dut1_gre1_index}=
+| | ... | And GRE tunnel interface is created and up
+| | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst}
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix}
+| | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix}
+| | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix}
+| |  ... | ${dut_tun0_ip2} | ${dut1_gre0_index}
+| | And Vpp Route Add | ${dut_node} | ${net3_address} | ${prefix}
+| | ... | ${dut_tun1_ip2} | ${dut1_gre1_index}
+| | Then Send ICMPv4 and check received GRE header
+| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
+| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2_mac}
+| | ... | ${net1_host_address} | ${net2_host_address}
+| | ... | ${dut1_lo_address} | ${tun0_dst}
+| | And Send ICMPv4 and check received GRE header
+| | ... | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2}
+| | ... | ${dut_to_tg_if1_mac} | ${tg_to_dut_if2_mac}
+| | ... | ${net1_host_address} | ${net3_host_address}
+| | ... | ${dut1_lo_address} | ${tun1_dst}
+
+| TC05: DUT re-encapsulates IPv4 GRE into other GRE tunnel - GRE header verification
+| | [Documentation]
+| | ... | [Top] TG=DUT1. [Enc] Eth-IPv4-ICMPv4 on TG_if1-DUT, \
+| | ... | Eth-IPv4-GRE-IPv4-ICMPv4 on TG_if2_DUT. [Cfg] On DUT1 configure two
+| | ... | GRE tunnels with loopback's source address. Destination address of
+| | ... | tunnels are routed via next hop address of DUT's to TG if2, where
+| | ... | should be only GRE encapsulated packets. Each tunnel has IPv4 address
+| | ... | and configured prefix routed through the tunnel. [Ver] Make TG send
+| | ... | encapsulated IPv4 UDP to DUT; Encapsulated IP source is behind
+| | ... | configured tunnel same as destination; verify TG received GREoIPv4
+| | ... | encapsulated packet is correct. [Ref] RFC2784.
+| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
+| | Given Path for 2-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Interfaces in 2-node path are up
+| | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node}
+| | And Set Interface State |  ${dut_node} | ${dut1_lo_index} | up
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
+| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
+| | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32}
+| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address}
+| | ... | ${tg_to_dut_if2_mac}
+| | And Vpp Route Add | ${dut_node} | ${tun0_dst} | ${32}
+| | ... | ${dut2_ip_address} | ${dut_to_tg_if2}
+| | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32}
+| | ... | ${dut2_ip_address} | ${dut_to_tg_if2}
+| | ${dut1_gre0_interface} | ${dut1_gre0_index}=
+| | ... | When GRE tunnel interface is created and up
+| | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst}
+| | ${dut1_gre1_interface} | ${dut1_gre1_index}=
+| | ... | And GRE tunnel interface is created and up
+| | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst}
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix}
+| | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix}
+| | And Vpp Route Add | ${dut_node} | ${net2_address} | ${prefix}
+| |  ... | ${dut_tun0_ip2} | ${dut1_gre0_index}
+| | And Vpp Route Add | ${dut_node} | ${net3_address} | ${prefix}
+| | ... | ${dut_tun1_ip2} | ${dut1_gre1_index}
+| | Then Send GRE and check received GRE header
+| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if2}
+| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if2_mac}
+| | ... | ${dut1_lo_address} | ${tun0_dst}
+| | ... | ${net3_host_address} | ${net2_host_address}
+| | ... | ${tg_to_dut_if2_mac} | ${dut_to_tg_if2_mac}
+| | ... | ${tun1_dst} | ${dut1_lo_address}
+
+| TC06: DUT do not process GRE with wrong tunnel destination IP
+| | [Documentation]
+| | ... | [Top] TG=DUT1. [Enc] Eth-IPv4-ICMPv4 on TG_if1-DUT, \
+| | ... | Eth-IPv4-GRE-IPv4-ICMPv4 on TG_if2_DUT. [Cfg] On DUT1 configure two
+| | ... | GRE tunnels with loopback's source address. Destination address of
+| | ... | tunnels are routed via next hop address of DUT's to TG if2, where
+| | ... | should be only GRE encapsulated packets. On DUT's to TG if1 interface
+| | ... | is configured test destination host MAC address. [Ver] Make TG send
+| | ... | GRE encapsulated ICMPv4 Echo Req to DUT; verify TG received
+| | ... | de-capsulated packet is correct, then send packet with wrong tunnel
+| | ... | destination address. [Ref] RFC2784.
+| | ... |
+| | [Tags] | 3_NODE_DOUBLE_LINK_TOPO
+| | Given Path for 2-node testing is set
+| | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
+| | And Interfaces in 2-node path are up
+| | ${dut1_lo_index}= | And VPP Create loopback | ${dut_node}
+| | And Set Interface State |  ${dut_node} | ${dut1_lo_index} | up
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut_to_tg_if2} | ${dut1_ip_address} | ${prefix}
+| | ... | ${dut_node} | ${dut_to_tg_if1} | ${net1_gw_address} | ${prefix}
+| | ... | ${dut_node} | ${dut1_lo_index} | ${dut1_lo_address} | ${32}
+| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if1} | ${net1_host_address}
+| | ... | ${tg_to_dut_if1_mac}
+| | And Add Arp On Dut | ${dut_node} | ${dut_to_tg_if2} | ${dut2_ip_address}
+| | ... | ${tg_to_dut_if2_mac}
+| | And Vpp Route Add | ${dut_node} | ${tun0_dst} | ${32}
+| | ... | ${dut2_ip_address} | ${dut_to_tg_if2}
+| | And Vpp Route Add | ${dut_node} | ${tun1_dst} | ${32}
+| | ... | ${dut2_ip_address} | ${dut_to_tg_if2}
+| | ${dut1_gre0_interface} | ${dut1_gre0_index}=
+| | ... | When GRE tunnel interface is created and up
+| | ... | ${dut_node} | ${dut1_lo_address} | ${tun0_dst}
+| | ${dut1_gre1_interface} | ${dut1_gre1_index}=
+| | ... | And GRE tunnel interface is created and up
+| | ... | ${dut_node} | ${dut1_lo_address} | ${tun1_dst}
+| | And IP addresses are set on interfaces
+| | ... | ${dut_node} | ${dut1_gre0_index} | ${dut_tun0_ip1} | ${prefix}
+| | ... | ${dut_node} | ${dut1_gre1_index} | ${dut_tun1_ip1} | ${prefix}
+| | Then Send GRE and check received ICMPv4 header
+| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
+| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1_mac}
+| | ... | ${net2_host_address} | ${net1_host_address}
+| | ... | ${tun0_dst} | ${dut1_lo_address}
+| | And Run Keyword And Expect Error | ICMP echo Rx timeout
+| | ... | Send GRE and check received ICMPv4 header |
+| | ... | ${tg_node} | ${tg_to_dut_if2} | ${tg_to_dut_if1}
+| | ... | ${dut_to_tg_if2_mac} | ${tg_to_dut_if1_mac}
+| | ... | ${net2_host_address} | ${net1_host_address}
+| | ... | ${tun0_dst} | ${dut1_ip_address}