VXLAN test with dot1q tagging.

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

5 files changed, 97 insertions, 30 deletions

diff --git a/tests/suites/bridge_domain/test.robot b/tests/suites/bridge_domain/test.robot
index c6a4cd1197..0f5b6977e9 100644
--- a/tests/suites/bridge_domain/test.robot
+++ b/tests/suites/bridge_domain/test.robot
@@ -34,8 +34,7 @@
 | | ${bd_if1} | ${tmp}= | First Ingress Interface
 | | ${bd_if2} | ${tmp}= | Last Egress Interface
 | | Vpp l2bd forwarding setup | ${nodes['DUT1']} | ${bd_if1} | ${bd_if2}
-| | Send and receive ICMPv4 | ${nodes['TG']} | ${tg_if1} | ${tg_if2}
-| | Send and receive ICMPv4 | ${nodes['TG']} | ${tg_if2} | ${tg_if1}
+| | Send and receive ICMPv4 bidirectionally | ${nodes['TG']} | ${tg_if1} | ${tg_if2}
 
 | Vpp forwards packets via L2 bridge domain in circular topology
 | | [Tags] | 3_NODE_SINGLE_LINK_TOPO
@@ -50,8 +49,7 @@
 | | ${tg_if2} | ${tg}= | Next Interface
 | | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
-| | Send and receive ICMPv4 | ${tg} | ${tg_if1} | ${tg_if2}
-| | Send and receive ICMPv4 | ${tg} | ${tg_if2} | ${tg_if1}
+| | Send and receive ICMPv4 bidirectionally | ${tg} | ${tg_if1} | ${tg_if2}
 
 | Vpp forwards packets via L2 bridge domain in circular topology with static L2FIB entries
 | | [Tags] | 3_NODE_SINGLE_LINK_TOPO
@@ -69,5 +67,4 @@
 | | ...                       | ${mac}
 | | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2} | ${FALSE}
 | | ...                       | ${mac}
-| | Send and receive ICMPv4 | ${tg} | ${tg_if1} | ${tg_if2}
-| | Send and receive ICMPv4 | ${tg} | ${tg_if2} | ${tg_if1}
+| | Send and receive ICMPv4 bidirectionally | ${tg} | ${tg_if1} | ${tg_if2}
diff --git a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
index 3370cabaa4..a1682d1062 100644
--- a/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
+++ b/tests/suites/l2_xconnect/l2_xconnect_untagged.robot
@@ -35,5 +35,4 @@
 | | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
-| | Send and receive ICMPv4 | ${tg} | ${tg_if1} | ${tg_if2}
-| | Send and receive ICMPv4 | ${tg} | ${tg_if2} | ${tg_if1}
+| | Send and receive ICMPv4 bidirectionally | ${tg} | ${tg_if1} | ${tg_if2}
diff --git a/tests/suites/vxlan/vxlan_bd_dot1q.robot b/tests/suites/vxlan/vxlan_bd_dot1q.robot
new file mode 100644
index 0000000000..8497d7851b
--- /dev/null
+++ b/tests/suites/vxlan/vxlan_bd_dot1q.robot
@@ -0,0 +1,50 @@
+# 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.
+
+*** Settings ***
+| Documentation | VXLAN tunnel over Dot1Q tagged IPv4 traffic tests using bridge domain.
+| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/vxlan.robot
+| Resource | resources/libraries/robot/l2_traffic.robot
+| Library  | resources.libraries.python.Trace
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
+| Test Setup | Run Keywords | Setup all DUTs before test
+| ...        | AND          | Setup all TGs before traffic script
+| Test Teardown | Show Packet Trace on All DUTs | ${nodes}
+
+*** Variables ***
+| ${VNI}= | 23
+| ${BID}= | 23
+| ${VLAN}= | 10
+
+*** Test Cases ***
+| VPP can encapsulate L2 in VXLAN over IPv4 over Dot1Q
+| | Given Path for VXLAN testing is set
+| | ...   | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
+| | And   Interfaces in path are up
+| | And   Vlan interfaces for VXLAN are created | ${VLAN}
+| |       ...                                   | ${dut1} | ${dut1s_to_dut2}
+| |       ...                                   | ${dut2} | ${dut2s_to_dut1}
+| | And   IP addresses are set on interfaces
+| |       ...         | ${dut1} | ${dut1s_vlan_name} | ${dut1s_vlan_index}
+| |       ...         | ${dut2} | ${dut2s_vlan_name} | ${dut2s_vlan_index}
+| | ${dut1s_vxlan}= | When Create VXLAN interface     | ${dut1} | ${VNI}
+| |                 | ...  | ${dut1s_ip_address} | ${dut2s_ip_address}
+| |                   And  Interfaces are added to BD | ${dut1} | ${BID}
+| |                   ...  | ${dut1s_to_tg} | ${dut1s_vxlan}
+| | ${dut2s_vxlan}= | And  Create VXLAN interface     | ${dut2} | ${VNI}
+| |                 | ...  | ${dut2s_ip_address} | ${dut1s_ip_address}
+| |                   And  Interfaces are added to BD | ${dut2} | ${BID}
+| |                   ...  | ${dut2s_to_tg} | ${dut2s_vxlan}
+| | Then Send and receive ICMPv4 bidirectionally
+| | ... | ${tg} | ${tgs_to_dut1} | ${tgs_to_dut2}
diff --git a/tests/suites/vxlan/vxlan_bd_untagged.robot b/tests/suites/vxlan/vxlan_bd_untagged.robot
index 2e5d27a721..1eea3e90fa 100644
--- a/tests/suites/vxlan/vxlan_bd_untagged.robot
+++ b/tests/suites/vxlan/vxlan_bd_untagged.robot
@@ -12,24 +12,34 @@
 # limitations under the License.
 
 *** Settings ***
-| Documentation | VXLAN tunnel untagged traffic tests using bridge domain.
+| Documentation | VXLAN tunnel over untagged IPv4 traffic tests using bridge domain.
 | Resource | resources/libraries/robot/default.robot
 | Resource | resources/libraries/robot/vxlan.robot
 | Resource | resources/libraries/robot/l2_traffic.robot
+| Library  | resources.libraries.python.Trace
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Suite Setup | Run Keywords | Setup all DUTs before test
-| ...         | AND          | Setup all TGs before traffic script
-| ...         | AND          | Setup VXLAN tunnel on nodes | ${nodes['TG']}
-|             | ...          | ${nodes['DUT1']} | ${nodes['DUT2']} | ${VNI}
+| Test Setup | Run Keywords | Setup all DUTs before test
+| ...        | AND          | Setup all TGs before traffic script
+| Test Teardown | Show Packet Trace on All DUTs | ${nodes}
 
 *** Variables ***
 | ${VNI}= | 23
+| ${BID}= | 23
 
 *** Test Cases ***
-| VPP can encapsulate L2 in VXLAN over V4
-| | Setup DUT for VXLAN using BD | ${nodes['DUT1']} | ${23} | ${dut1s_to_tg}
-| | ...                          | ${vxlan_dut1}
-| | Setup DUT for VXLAN using BD | ${nodes['DUT2']} | ${23} | ${dut2s_to_tg}
-| | ...                          | ${vxlan_dut2}
-| | Send and receive ICMPv4 | ${nodes['TG']} | ${tgs_to_dut1} | ${tgs_to_dut2}
-| | Send and receive ICMPv4 | ${nodes['TG']} | ${tgs_to_dut2} | ${tgs_to_dut1}
+| VPP can pass IPv4 bidirectionally through VXLAN
+| | Given Path for VXLAN testing is set
+| | ...   | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
+| | And   Interfaces in path are up
+| | And   IP addresses are set on interfaces | ${dut1} | ${dut1s_to_dut2} | ${NONE}
+| |       ...                                | ${dut2} | ${dut2s_to_dut1} | ${NONE}
+| | ${dut1s_vxlan}= | When Create VXLAN interface     | ${dut1} | ${VNI}
+| |                 | ...  | ${dut1s_ip_address} | ${dut2s_ip_address}
+| |                   And  Interfaces are added to BD | ${dut1} | ${BID}
+| |                   ...  | ${dut1s_to_tg} | ${dut1s_vxlan}
+| | ${dut2s_vxlan}= | And  Create VXLAN interface     | ${dut2} | ${VNI}
+| |                 | ...  | ${dut2s_ip_address} | ${dut1s_ip_address}
+| |                   And  Interfaces are added to BD | ${dut2} | ${BID}
+| |                   ...  | ${dut2s_to_tg} | ${dut2s_vxlan}
+| | Then Send and receive ICMPv4 bidirectionally
+| | ... | ${tg} | ${tgs_to_dut1} | ${tgs_to_dut2}
diff --git a/tests/suites/vxlan/vxlan_xconnect_untagged.robot b/tests/suites/vxlan/vxlan_xconnect_untagged.robot
index c3d2a3c0a4..2a57468b70 100644
--- a/tests/suites/vxlan/vxlan_xconnect_untagged.robot
+++ b/tests/suites/vxlan/vxlan_xconnect_untagged.robot
@@ -12,22 +12,33 @@
 # limitations under the License.
 
 *** Settings ***
-| Documentation | VXLAN tunnel untagged traffic tests using xconnect.
+| Documentation | VXLAN tunnel over untagged IPv4 traffic tests using xconnect.
 | Resource | resources/libraries/robot/default.robot
 | Resource | resources/libraries/robot/vxlan.robot
 | Resource | resources/libraries/robot/l2_traffic.robot
+| Library  | resources.libraries.python.Trace
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | VM_ENV | HW_ENV
-| Suite Setup | Run Keywords | Setup all DUTs before test
-| ...         | AND          | Setup all TGs before traffic script
-| ...         | AND          | Setup VXLAN tunnel on nodes | ${nodes['TG']}
-|             | ...          | ${nodes['DUT1']} | ${nodes['DUT2']} | ${VNI}
+| Test Setup | Run Keywords | Setup all DUTs before test
+| ...        | AND          | Setup all TGs before traffic script
+| Test Teardown | Show Packet Trace on All DUTs | ${nodes}
 
 *** Variables ***
 | ${VNI}= | 24
 
 *** Test Cases ***
-| VPP can pass IPv4 bidirectionally through VXLAN tunnel using l2-xconnect
-| | L2 setup xconnect on DUT | ${nodes['DUT1']} | ${dut1s_to_tg} | ${vxlan_dut1}
-| | L2 setup xconnect on DUT | ${nodes['DUT2']} | ${dut2s_to_tg} | ${vxlan_dut2}
-| | Send and receive ICMPv4 | ${nodes['TG']} | ${tgs_to_dut1} | ${tgs_to_dut2}
-| | Send and receive ICMPv4 | ${nodes['TG']} | ${tgs_to_dut2} | ${tgs_to_dut1}
+| VPP can pass IPv4 bidirectionally through VXLAN
+| | Given Path for VXLAN testing is set
+| | ...   | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']}
+| | And   Interfaces in path are up
+| | And   IP addresses are set on interfaces | ${dut1} | ${dut1s_to_dut2} | ${NONE}
+| |       ...                                | ${dut2} | ${dut2s_to_dut1} | ${NONE}
+| | ${dut1s_vxlan}= | When Create VXLAN interface     | ${dut1} | ${VNI}
+| |                 | ...  | ${dut1s_ip_address} | ${dut2s_ip_address}
+| |                   And  Interfaces are added to xconnect | ${dut1}
+| |                   ...  | ${dut1s_to_tg} | ${dut1s_vxlan}
+| | ${dut2s_vxlan}= | And  Create VXLAN interface     | ${dut2} | ${VNI}
+| |                 | ...  | ${dut2s_ip_address} | ${dut1s_ip_address}
+| |                   And  Interfaces are added to xconnect | ${dut2}
+| |                   ...  | ${dut2s_to_tg} | ${dut2s_vxlan}
+| | Then Send and receive ICMPv4 bidirectionally
+| | ... | ${tg} | ${tgs_to_dut1} | ${tgs_to_dut2}