Add vxlan tests using xconnect

Change-Id: I190689d5a624f1c876df90ce29b05a2b0b8a2df4
Signed-off-by: Patrik Hrnciar <phrnciar@cisco.com>

2 files changed, 44 insertions, 3 deletions

diff --git a/tests/suites/vxlan/vxlan_bd_untagged.robot b/tests/suites/vxlan/vxlan_bd_untagged.robot
new file mode 100644
index 0000000000..2e5d27a721
--- /dev/null
+++ b/tests/suites/vxlan/vxlan_bd_untagged.robot
@@ -0,0 +1,35 @@
+# 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 untagged traffic tests using bridge domain.
+| Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/vxlan.robot
+| Resource | resources/libraries/robot/l2_traffic.robot
+| 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}
+
+*** Variables ***
+| ${VNI}= | 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}
diff --git a/tests/suites/vxlan/vxlan_untagged.robot b/tests/suites/vxlan/vxlan_xconnect_untagged.robot
index 638c056e8d..c3d2a3c0a4 100644
--- a/tests/suites/vxlan/vxlan_untagged.robot
+++ b/tests/suites/vxlan/vxlan_xconnect_untagged.robot
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 *** Settings ***
-| Documentation | VXLAN tunnel untagged traffic tests
+| Documentation | VXLAN tunnel untagged traffic tests using xconnect.
 | Resource | resources/libraries/robot/default.robot
 | Resource | resources/libraries/robot/vxlan.robot
 | Resource | resources/libraries/robot/l2_traffic.robot
@@ -20,8 +20,14 @@
 | 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']} | ${23}
+|             | ...          | ${nodes['DUT1']} | ${nodes['DUT2']} | ${VNI}
+
+*** Variables ***
+| ${VNI}= | 24
 
 *** Test Cases ***
-| VPP can encapsulate L2 in VXLAN over V4
+| 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}