diff options
| author |   Matej Klotton <mklotton@cisco.com> | 2017-01-17 12:14:23 +0100 |
|---|---|---|
| committer |   Jan Gelety <jgelety@cisco.com> | 2017-01-17 14:00:09 +0000 |
| commit | 282845448e5f43f8b77ba51053a883a20eb2dbc7 (patch) | |
| tree | e638714d79a345f5cc7fb32ba0fbd146d19aaf4c | |
| parent | 85256222da854fed5d6d1763f2969aaaf28544f1 (diff) | |
VIRL test: Replace IP probe for VXLAN test
Change-Id: Ic16f91beabdc2ac2e19ccc65c04790d36c15d477
Signed-off-by: Matej Klotton <mklotton@cisco.com>
(cherry picked from commit eb4515115a69f5a3fe9b2fe178110cc5ff78b73a)
| -rw-r--r-- | resources/libraries/python/InterfaceUtil.py | 3 | ||||
| -rw-r--r-- | resources/libraries/robot/vxlan.robot | 7 | ||||
| -rw-r--r-- | tests/func/vxlan/vxlan_bd_dot1q.robot | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 0447ba5b15..2980afa349 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -225,6 +225,9 @@ class InterfaceUtil(object): """ if_data = InterfaceUtil.vpp_get_interface_data(node, interface) + if if_data['sup_sw_if_index'] != if_data['sw_if_index']: + if_data = InterfaceUtil.vpp_get_interface_data( + node, if_data['sup_sw_if_index']) mac_data = [str(hex(item))[2:] for item in if_data['l2_address'][:6]] mac_data_nice = [] for item in mac_data: diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/vxlan.robot index f6506bb3db..0b53c85494 100644 --- a/resources/libraries/robot/vxlan.robot +++ b/resources/libraries/robot/vxlan.robot @@ -20,6 +20,7 @@ | 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.NodePath @@ -50,12 +51,14 @@ | | ${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} -| | VPP IP Probe | ${DUT1} | ${DUT1_INT_NAME} | ${dut2s_ip_address} | if_type=name -| | VPP IP Probe | ${DUT2} | ${DUT2_INT_NAME} | ${dut1s_ip_address} | if_type=name +| | 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} diff --git a/tests/func/vxlan/vxlan_bd_dot1q.robot b/tests/func/vxlan/vxlan_bd_dot1q.robot index 9da1e3c38f..a5303e6ba9 100644 --- a/tests/func/vxlan/vxlan_bd_dot1q.robot +++ b/tests/func/vxlan/vxlan_bd_dot1q.robot @@ -61,10 +61,14 @@ | | ... | ${dut2_node} | ${dut2s_vlan_name} | ${dut2s_vlan_index} | | ${dut1s_vxlan}= | When Create VXLAN interface | ${dut1_node} | ${VNI} | | | ... | ${dut1s_ip_address} | ${dut2s_ip_address} +| | And Set Interface State | ${dut1_node} | ${dut1s_vxlan} +| | ... | up | | And Interfaces are added to BD | ${dut1_node} | ${BID} | | ... | ${dut1_to_tg} | ${dut1s_vxlan} | | ${dut2s_vxlan}= | And Create VXLAN interface | ${dut2_node} | ${VNI} | | | ... | ${dut2s_ip_address} | ${dut1s_ip_address} +| | And Set Interface State | ${dut2_node} | ${dut2s_vxlan} +| | ... | up | | And Interfaces are added to BD | ${dut2_node} | ${BID} | | ... | ${dut2_to_tg} | ${dut2s_vxlan} | | Then Send and receive ICMPv4 bidirectionally |