CSIT-427: Honeycomb ietf-ACL tests - L2

[csit.git] / resources / libraries / robot / honeycomb / interfaces.robot

diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot
index ea1d2b0..1ffc2e4 100644 (file)
--- a/resources/libraries/robot/honeycomb/interfaces.robot
+++ b/resources/libraries/robot/honeycomb/interfaces.robot
@@ -33,6 +33,7 @@
 | | ... | \| up \|
 | | [Arguments] | ${node} | ${interface} | ${state}
 | | interfaceCLI.Set interface state | ${node} | ${interface} | ${state}
+| | ... | if_type=name
 
 | Honeycomb sets interface state
 | | [Documentation] | Uses Honeycomb API to change the admin state\
@@ -113,7 +114,6 @@
 | | :FOR | ${key} | IN | @{settings.keys()}
 | | | interfaceAPI.Configure interface ipv4
 | | | ... | ${node} | ${interface} | ${key} | ${settings['${key}']}
-| | | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
 
 | Honeycomb sets interface ipv4 address with prefix
 | | [Documentation] | Uses Honeycomb API to assign an ipv4 address to the\
@@ -184,12 +184,12 @@
 | | Should be equal | ${prefix}
 | | ... | ${api_data['ietf-ip:ipv4']['address'][0]['prefix-length']}
 | | Should be equal | ${fib_address}
-| | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['ip']
+| | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['ip']}
 | | Should be equal | ${fib_mac}
-| | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['link-layer-address']
+| | ... | ${api_data['ietf-ip:ipv4']['neighbor'][0]['link-layer-address']}
 | | :FOR | ${key} | IN | @{settings.keys()}
 | | | Should be equal
-| | | ... | ${settings['{key']} | ${api_data['ietf-ip:ipv4']['{$key}']}
+| | | ... | ${settings['${key}']} | ${api_data['ietf-ip:ipv4']['${key}']}
 
 | IPv4 config from VAT should be
 | | [Documentation] | Retrieves interface ipv4 configuration through VAT and\
@@ -208,7 +208,6 @@
 | | [Arguments] | ${node} | ${interface} | ${address} | ${netmask}
 | | ${vpp_data}= | interfaceCLI.VPP get interface ip addresses
 | | ... | ${node} | ${interface} | ipv4
-#TODO: update based on resolution of bug https://jira.fd.io/browse/VPP-132
 | | Should be equal | ${vpp_data[0]['ip']} | ${address}
 | | Should be equal | ${vpp_data[0]['netmask']} | ${netmask}
 
@@ -381,7 +380,8 @@
 | | [Arguments] | ${node} | ${interface} | ${ethernet} | ${routing}
 | | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
 | | :FOR | ${key} | IN | @{ethernet.keys()}
-| | | Should be equal | ${api_data['${key}']} | ${ethernet['${key}']}
+| | | Should be equal
+| | | ... | ${api_data['v3po:ethernet']['${key}']} | ${ethernet['${key}']}
 | | :FOR | ${key} | IN | @{routing.keys()}
 | | | Should be equal | ${api_data['${key}']} | ${routing['${key}']}