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

diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/vxlan.robot
index e855f2499d..36a31584d0 100644
--- a/resources/libraries/robot/vxlan.robot
+++ b/resources/libraries/robot/vxlan.robot
@@ -14,68 +14,130 @@
 *** 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.IPv6Util
 | 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}
-| | Append Nodes | ${TG} | ${DUT1} | ${DUT2} | ${TG}
-| | Compute Path
-| | ${tgs_to_dut1} | ${tg}= | Next Interface
-| | ${dut1s_to_tg} | ${dut1}= | Next Interface
-| | ${dut1s_to_dut2} | ${dut1}= | Next Interface
-| | ${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
-| | ${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}
+| 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
+| | ... | in this case it is required the interface to be present in topology dict.
+| | ... | 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_KEY}= | Run Keyword If | ${DUT1_INT_INDEX} is None
+| |                  | ... | Get Interface by name | ${DUT1} | ${DUT1_INT_NAME}
+| | ${DUT2_INT_KEY}= | Run Keyword If | ${DUT2_INT_INDEX} is None
+| |                  | ... | Get Interface by name | ${DUT2} | ${DUT2_INT_NAME}
+| | ${DUT1_INT_INDEX}= | Run Keyword If | ${DUT1_INT_INDEX} is None
+| |                    | ... | Get Interface Sw Index | ${DUT1} | ${DUT1_INT_KEY}
+| |                    | ... | ELSE | Set Variable | ${DUT1_INT_INDEX}
+| | ${DUT2_INT_INDEX}= | Run Keyword If | ${DUT2_INT_INDEX} is None
+| |                    | ... | Get Interface Sw Index | ${DUT2} | ${DUT2_INT_KEY}
+| |                    | ... | ELSE | Set Variable | ${DUT2_INT_INDEX}
+| | ${DUT1_INT_MAC}= | Vpp Get Interface Mac | ${DUT1} | ${DUT1_INT_INDEX}
+| | ${DUT2_INT_MAC}= | Vpp Get Interface Mac | ${DUT2} | ${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}
+| | Add IP Neighbor | ${DUT1} | ${DUT1_INT_INDEX} | ${dut2s_ip_address} | ${DUT2_INT_MAC}
+| | Add IP Neighbor | ${DUT2} | ${DUT2_INT_INDEX} | ${dut1s_ip_address} | ${DUT1_INT_MAC}
+
+| 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 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}
+| 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}
+| | ${INT1_NAME}= | Get interface name | ${DUT1} | ${INT1}
+| | ${INT2_NAME}= | Get interface name | ${DUT2} | ${INT2}
+| | ${dut1s_vlan_name} | ${dut1s_vlan_index}= | Create Vlan Subinterface
+| |                    | ...                  | ${DUT1} | ${INT1_NAME} | ${VLAN}
+| | ${dut2s_vlan_name} | ${dut2s_vlan_index}= | Create Vlan Subinterface
+| |                    | ...                  | ${DUT2} | ${INT2_NAME} | ${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}
 
-| 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}
+| Send VXLAN receive VXLAN Packet
+| | [Documentation] | Send VXLAN encapsulated Ethernet frame and check \
+| | ... | received one.
+| | ...
+| | ... | *Arguments:*
+| | ... | - tg_node - Node where to run traffic script. Type: dictionary
+| | ... | - tx_if - Interface from where send VXLAN packet. Type: string
+| | ... | - rx_if - Interface where receive VXLAN packet. Type: string
+| | ... | - tx_src_mac - Source MAC address of sent packet. Type: string
+| | ... | - tx_dst_mac - Destination MAC address of sent packet. Type: string
+| | ... | - tx_src_ip - Source IP address of sent VXLAN packet. Type: string
+| | ... | - tx_dst_ip - Destination IP address of sent VXLAN packet.
+| | ... |   Type: string
+| | ... | - tx_vni - VNI of sent VXLAN packet. Type: string
+| | ... | - rx_src_ip - Source IP address of received VXLAN packet. Type: string
+| | ... | - rx_dst_ip - Destination IP address of received VXLAN packet.
+| | ... |   Type: string
+| | ... | - rx_vni - VNI of received VXLAN packet. Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send VXLAN receive VXLAN Packet \| ${tg_node} \| port4 \| port4  \
+| | ... | \| fa:16:3e:6d:f9:c5 \| fa:16:3e:e6:6d:9a \| 192.168.0.1  \
+| | ... | \| 192.168.0.2 \| ${101} \| 192.168.0.2 \| 192.168.0.1 \| ${102} \|
+| | ...
+| | [Arguments] | ${tg_node} | ${tx_if} | ${rx_if}
+| | ... | ${tx_src_mac} | ${tx_dst_mac}
+| | ... | ${tx_src_ip} | ${tx_dst_ip} | ${tx_vni}
+| | ... | ${rx_src_ip} | ${rx_dst_ip} | ${rx_vni}
+| | ${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_src_mac ${tx_src_mac}
+| | ... | --tx_dst_mac ${tx_dst_mac}
+| | ... | --tx_src_ip ${tx_src_ip}
+| | ... | --tx_dst_ip ${tx_dst_ip}
+| | ... | --tx_vni ${tx_vni}
+| | ... | --rx_src_ip ${rx_src_ip}
+| | ... | --rx_dst_ip ${rx_dst_ip}
+| | ... | --rx_vni ${rx_vni}
+| | Run Traffic Script On Node | send_vxlan_check_vxlan.py | ${tg_node} | ${args}