From a277b96ed799d9252ba9ca1deed4bda1fd026e88 Mon Sep 17 00:00:00 2001
From: selias <samelias@cisco.com>
Date: Tue, 17 Jan 2017 16:59:03 +0100
Subject: CSIT-506: HC Test- Update and cleanup all suites

 - remove EXPECTED_FAILING tag from IPv4 neighbor, IPv6 address, MTU
 - fix bridge domain removal with interfaces assigned, it should fail
 - fix teardown of L2 FIB suite (bridge domain removal, see above)
 - disable vhost-user "server" test cases (VPP bug)
 - fix keyword verifying sub-interface state
 - update ACL test data (yang model changes)
 - remove EXPECTED_FAILING tag from ACL table removal test
 - update Jira IDs and comments in failing Lisp test case
 - remove EXPECTED_FAILING tag from Lisp removal test case
 - use vhost-user "client" instead of "server" in persistence tests

Change-Id: I32eafb6013b4512090c0d9365e10c61029179d49
Signed-off-by: selias <samelias@cisco.com>
---
 .../libraries/robot/honeycomb/interfaces.robot     | 27 ++++++++++------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'resources/libraries/robot/honeycomb/interfaces.robot')

diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot
index 765aaef7c0..3c91c77eb7 100644
--- a/resources/libraries/robot/honeycomb/interfaces.robot
+++ b/resources/libraries/robot/honeycomb/interfaces.robot
@@ -220,25 +220,23 @@
 
 | IPv4 neighbor from Honeycomb should be
 | | [Documentation] | Retrieves ipv4 neighbor list through Honeycomb\
-| | ... | and compares with neighbor list supplied in argument.
+| | ... | and compares the first entry with addresses supplied in arguments.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - information about a DUT node. Type: dictionary
 | | ... | - interface - name of an interface on the specified node. Type: string
-| | ... | - neighbors - list of ipv4 neighbor dictionaries. Type: list
+| | ... | - ip_address - ipv4 address of expected neighbor entry. Type: string
+| | ... | - mac_address - MAC address of expected neighbor entry. Type: string
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| IPv4 neighbor from Honeycomb should be \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.4 \| 08:00:27:60:26:ab \|
-| | [Arguments] | ${node} | ${interface} | @{neighbors}
+| | [Arguments] | ${node} | ${interface} | ${ip_address} | ${mac_address}
 | | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
-| | ${data_neighbors}= | Set Variable | ${api_data['ietf-ip:ipv4']['neighbor']}
-| | Compare data structures
-| | ... | ${data_neighbors} | ${neighbors}
-| | Should be equal | ${neighbor['fib_address']}
+| | Should be equal | ${ip_address}
 | | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['ip']}
-| | Should be equal | ${neighbor['fib_mac']}
+| | Should be equal | ${mac_address}
 | | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['link-layer-address']}
 
 | Honeycomb clears all interface ipv4 neighbors
@@ -290,11 +288,9 @@
 | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| 64 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
-| | Should be equal | ${address}
-| | ... | ${api_data['ietf-ip:ipv6']['address'][0]['ip']}
-| | Should be equal | ${prefix}
-| | ... | ${api_data['ietf-ip:ipv6']['address'][0]['prefix-length']}
-| | Should be equal | ${fib_address}
+| | ${settings}= | Create Dictionary
+| | ... | ip=${address} | prefix-length=${prefix}
+| | Should contain | ${api_data['ietf-ip:ipv6']['address']} | ${settings}
 
 | IPv6 address from VAT should be
 | | [Documentation] | Retrieves interface ipv6 address through VAT and\
@@ -313,8 +309,9 @@
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | ${vpp_data}= | interfaceCLI.VPP get interface ip addresses
 | | ... | ${node} | ${interface} | ipv6
-| | Should be equal | ${vpp_data[0]['ip']} | ${address}
-| | Should be equal | ${vpp_data[0]['prefix-length']} | ${prefix}
+| | ${settings}= | Create Dictionary
+| | ... | ip=${address} | prefix_length=${prefix}
+| | Should contain | ${vpp_data} | ${settings}
 
 | Honeycomb sets interface ethernet configuration
 | | [Documentation] | Uses Honeycomb API to change interface ethernet\
-- 
cgit 1.2.3-korg