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

diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/vxlan.robot
index e38c678d2b..ebf5d351ca 100644
--- a/resources/libraries/robot/vxlan.robot
+++ b/resources/libraries/robot/vxlan.robot
@@ -14,20 +14,31 @@
 *** Settings ***
 | Library  | Collections
 | Resource | resources/libraries/robot/default.robot
+| Resource | resources/libraries/robot/interfaces.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
 | Library  | resources.libraries.python.IPv4Setup
-| Library  | resources.libraries.python.InterfaceSetup
-| Library  | resources.libraries.python.InterfaceUtil
-| Library  | resources.libraries.python.topology.Topology
 | Library  | resources.libraries.python.NodePath
 
-
 *** Keywords ***
-| Setup VXLAN tunnel on nodes
-| | [Arguments] | ${TG} | ${DUT1} | ${DUT2} | ${VNI}
+| Path for VXLAN testing is set
+| | [Documentation] | *Compute path for VXLAN testing on nodes.*
+| | ...
+| | ... | _Set testcase variables with interfaces and nodes:_
+| | ... | - ${tgs_to_dut1}
+| | ... | - ${dut1s_to_tg}
+| | ... | - ${tgs_to_dut2}
+| | ... | - ${dut2s_to_tg}
+| | ... | - ${dut1s_to_dut2}
+| | ... | - ${dut2s_to_dut1}
+| | ... | - ${tg}
+| | ... | - ${dut1}
+| | ... | - ${dut2}
+| | ...
+| | [Arguments] | ${TG} | ${DUT1} | ${DUT2}
 | | Append Nodes | ${TG} | ${DUT1} | ${DUT2} | ${TG}
 | | Compute Path
 | | ${tgs_to_dut1} | ${tg}= | Next Interface
@@ -36,33 +47,85 @@
 | | ${dut2s_to_dut1} | ${dut2}= | Next Interface
 | | ${dut2s_to_tg} | ${dut2}= | Next Interface
 | | ${tgs_to_dut2} | ${tg}= | Next Interface
-| | Set Suite Variable | ${tgs_to_dut1}
-| | Set Suite Variable | ${dut1s_to_tg}
-| | Set Suite Variable | ${tgs_to_dut2}
-| | Set Suite Variable | ${dut2s_to_tg}
-| | Set Suite Variable | ${dut1s_to_dut2}
-| | Set Suite Variable | ${dut2s_to_dut1}
-# TODO: replace with address generator
-| | Set Suite Variable | ${dut1s_ip_address} | 172.16.0.1
-| | Set Suite Variable | ${dut2s_ip_address} | 172.16.0.2
-| | 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}
-| | @{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}
+| | Set Test Variable | ${tgs_to_dut1}
+| | Set Test Variable | ${dut1s_to_tg}
+| | Set Test Variable | ${tgs_to_dut2}
+| | Set Test Variable | ${dut2s_to_tg}
+| | Set Test Variable | ${dut1s_to_dut2}
+| | Set Test Variable | ${dut2s_to_dut1}
+| | Set Test Variable | ${tg}
+| | Set Test Variable | ${dut1}
+| | Set Test Variable | ${dut2}
+
+| Interfaces in path are up
+| | [Documentation] | *Set UP state on interfaces in path on nodes.*
+| | ...
+| | Set Interface State | ${tg} | ${tgs_to_dut1} | up
+| | Set Interface State | ${tg} | ${tgs_to_dut2} | up
+| | Set Interface State | ${dut1} | ${dut1s_to_tg} | up
+| | Set Interface State | ${dut1} | ${dut1s_to_dut2} | up
+| | Set Interface State | ${dut2} | ${dut2s_to_tg} | up
+| | Set Interface State | ${dut2} | ${dut2s_to_dut1} | up
+| | Vpp Node Interfaces Ready Wait | ${dut1}
+| | Vpp Node Interfaces Ready Wait | ${dut2}
+
+| IP addresses are set on interfaces
+| | [Documentation] | *Set IPv4 addresses on interfaces on DUTs.*
+| | ... | If interface index is None then is determines with Get Interface Sw Index
+| | ... | It also executes VPP IP Probe to determine MACs to IPs on DUTs
+| | ...
+| | ... | _Set testcase variables with IP addresses and prefix length:_
+| | ... | - ${dut1s_ip_address}
+| | ... | - ${dut2s_ip_address}
+| | ... | - ${duts_ip_address_prefix}
+| | ...
+| | [Arguments] | ${DUT1} | ${DUT1_INT_NAME} | ${DUT1_INT_INDEX}
+| | ...         | ${DUT2} | ${DUT2_INT_NAME} | ${DUT2_INT_INDEX}
+| | Set Test Variable | ${dut1s_ip_address} | 172.16.0.1
+| | Set Test Variable | ${dut2s_ip_address} | 172.16.0.2
+| | Set Test Variable | ${duts_ip_address_prefix} | 24
+| | ${DUT1_INT_INDEX}= | Run Keyword If | ${DUT1_INT_INDEX} is None
+| |                    | ... | Get Interface Sw Index | ${DUT1} | ${DUT1_INT_NAME}
+| |                    | ... | ELSE | Set Variable | ${DUT1_INT_INDEX}
+| | ${DUT2_INT_INDEX}= | Run Keyword If | ${DUT2_INT_INDEX} is None
+| |                    | ... | Get Interface Sw Index | ${DUT2} | ${DUT2_INT_NAME}
+| |                    | ... | ELSE | Set Variable | ${DUT2_INT_INDEX}
+| | Set Interface Address | ${DUT1} | ${DUT1_INT_INDEX}
+| | ... | ${dut1s_ip_address} | ${duts_ip_address_prefix}
+| | Set Interface Address | ${DUT2} | ${DUT2_INT_INDEX}
+| | ... | ${dut2s_ip_address} | ${duts_ip_address_prefix}
+| | VPP IP Probe | ${DUT1} | ${DUT1_INT_NAME} | ${dut2s_ip_address}
+| | VPP IP Probe | ${DUT2} | ${DUT2_INT_NAME} | ${dut1s_ip_address}
+
+| VXLAN interface is created
+| | [Arguments] | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP}
+| | Create VXLAN interface | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP}
+
+| Interfaces are added to BD
+| | [Arguments] | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2}
+| | Vpp Add L2 Bridge Domain | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2}
+
+| Interfaces are added to xconnect
+| | [Arguments] | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2}
+| |  L2 setup xconnect on DUT | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2}
 
-| 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}"
-| | 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}
+| Vlan interfaces for VXLAN are created
+| | [Documentation] | *Create VLAN subinterface on interfaces on DUTs with given VLAN ID.*
+| | ...
+| | ... | _Set testcase variables with name and index of created interfaces:_
+| | ... | - ${dut1s_vlan_name}
+| | ... | - ${dut1s_vlan_index}
+| | ... | - ${dut2s_vlan_name}
+| | ... | - ${dut2s_vlan_index}
+| | ...
+| | [Arguments] | ${VLAN} | ${DUT1} | ${INT1} | ${DUT2} | ${INT2}
+| | ${dut1s_vlan_name} | ${dut1s_vlan_index}= | Create Vlan Subinterface
+| |                    | ...                  | ${DUT1} | ${INT1} | ${VLAN}
+| | ${dut2s_vlan_name} | ${dut2s_vlan_index}= | Create Vlan Subinterface
+| |                    | ...                  | ${DUT2} | ${INT2} | ${VLAN}
+| | Set Interface State | ${DUT1} | ${dut1s_vlan_index} | up
+| | Set Interface State | ${DUT2} | ${dut2s_vlan_index} | up
+| | Set Test Variable | ${dut1s_vlan_name}
+| | Set Test Variable | ${dut1s_vlan_index}
+| | Set Test Variable | ${dut2s_vlan_name}
+| | Set Test Variable | ${dut2s_vlan_index}