X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fvxlan.robot;h=e855f2499dd0ab5118db42a5da403782fdf80bcf;hp=e38c678d2b728144753d9486377b3b2c423ae2ee;hb=be157c8643a2c095d169e3ea78e8db60000189eb;hpb=1254d80a0b64985de2816eff5ef79e3e22cde972

diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/vxlan.robot
index e38c678d2b..e855f2499d 100644
--- a/resources/libraries/robot/vxlan.robot
+++ b/resources/libraries/robot/vxlan.robot
@@ -15,6 +15,7 @@
 | Library  | Collections
 | Resource | resources/libraries/robot/default.robot
 | Resource | resources/libraries/robot/bridge_domain.robot
+| Resource | resources/libraries/robot/l2_xconnect.robot
 | Library  | resources.libraries.python.L2Util
 | Library  | resources.libraries.python.IPUtil
 | Library  | resources.libraries.python.IPv4Util
@@ -48,21 +49,33 @@
 | | Set Suite Variable | ${duts_ip_address_prefix} | 24
 | | Set Interface State | ${TG} | ${tgs_to_dut1} | up
 | | Set Interface State | ${TG} | ${tgs_to_dut2} | up
-| | Setup DUT for VXLAN | ${DUT1} | ${VNI} | ${dut1s_ip_address} | ${dut2s_ip_address}
-| | ...                 | ${dut1s_to_tg} | ${dut1s_to_dut2} | ${dut1s_ip_address} | ${duts_ip_address_prefix}
-| | Setup DUT for VXLAN | ${DUT2} | ${VNI} | ${dut2s_ip_address} | ${dut1s_ip_address}
-| | ...                 | ${dut2s_to_tg} | ${dut2s_to_dut1} | ${dut2s_ip_address} | ${duts_ip_address_prefix}
+| | ${vxlan_dut1}= | Setup VXLAN on DUT | ${DUT1} | ${VNI} | ${dut1s_ip_address}
+| | ...                                 | ${dut2s_ip_address} | ${dut1s_to_tg}
+| | ...                                 | ${dut1s_to_dut2} | ${dut1s_ip_address}
+| | ...                                 | ${duts_ip_address_prefix}
+| | Set Suite Variable | ${vxlan_dut1}
+| | ${vxlan_dut2}= | Setup VXLAN on DUT | ${DUT2} | ${VNI} | ${dut2s_ip_address}
+| | ...                                 | ${dut1s_ip_address} | ${dut2s_to_tg}
+| | ...                                 | ${dut2s_to_dut1} | ${dut2s_ip_address}
+| | ...                                 | ${duts_ip_address_prefix}
+| | Set Suite Variable | ${vxlan_dut2}
 | | @{test_nodes}= | Create list | ${DUT1} | ${DUT2}
 | | Vpp Nodes Interfaces Ready Wait | ${test_nodes}
 # ip arp table must be filled on both nodes with neighbors address
 | | VPP IP Probe | ${DUT1} | ${dut1s_to_dut2} | ${dut2s_ip_address}
 
-| Setup DUT for VXLAN
-| | [Arguments] | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} | ${INGRESS} | ${EGRESS} | ${IP} | ${PREFIX}
-| | Set Interface State | ${DUT} | ${EGRESS} | up
-| | Set Interface State | ${DUT} | ${INGRESS} | up
-| | Node "${DUT}" interface "${EGRESS}" has IPv4 address "${IP}" with prefix length "${PREFIX}"
-| | ${vxlan_if_index}= | Create VXLAN interface on "${DUT}" with VNI "${VNI}" from "${SRC_IP}" to "${DST_IP}"
+| Setup DUT for VXLAN using BD
+| | [Arguments] | ${DUT} | ${VNI} | ${INGRESS} | ${vxlan_if_index}
 | | Create L2 BD | ${DUT} | ${VNI}
 | | Add sw if index To L2 BD | ${DUT} | ${vxlan_if_index} | ${VNI}
 | | Add Interface To L2 BD | ${DUT} | ${INGRESS} | ${VNI}
+
+| Setup VXLAN on DUT
+| | [Arguments] | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP} | ${INGRESS}
+| | ...         | ${EGRESS} | ${IP} | ${PREFIX}
+| | Set Interface State | ${DUT} | ${EGRESS} | up
+| | Set Interface State | ${DUT} | ${INGRESS} | up
+| | Set Interface Address | ${DUT} | ${EGRESS} | ${IP} | ${PREFIX}
+| | ${vxlan_if_index}= | Create VXLAN interface | ${DUT} | ${VNI} | ${SRC_IP}
+| | ...                                         | ${DST_IP}
+| | [Return] | ${vxlan_if_index}