fix Honeycomb failing tests

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

diff --git a/resources/libraries/robot/honeycomb/tap.robot b/resources/libraries/robot/honeycomb/tap.robot
index 1a045d1..37d6a02 100644 (file)
--- a/resources/libraries/robot/honeycomb/tap.robot
+++ b/resources/libraries/robot/honeycomb/tap.robot
@@ -13,9 +13,7 @@
 
 *** Settings ***
 | Library | resources.libraries.python.InterfaceUtil
-| ...     | WITH NAME | interfaceCLI
 | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords
-| ...     | WITH NAME | InterfaceAPI
 | Documentation | Keywords used to manipulate TAP interfaces.
 
 *** Keywords ***
@@ -29,11 +27,11 @@
 | | ...
 | | ... | *Example:*
 | | ... | \| Honeycomb creates TAP interface \
-| | ... | \| ${nodes['DUT1']} \| tap_int1 \| ${{'tap-name':'tap1',\
-| | ... | 'mac':'08:00:27:60:26:ab', 'device-instance':3}} \|
+| | ... | \| ${nodes['DUT1']} \| tap_int1 \| ${{'host-interface-name':'tap1',\
+| | ... | 'mac':'08:00:27:60:26:ab', 'id':3}} \|
 | | ...
 | | [Arguments] | ${node} | ${interface} | ${settings}
-| | interfaceAPI.Create TAP interface | ${node} | ${interface}
+| | Create TAP interface | ${node} | ${interface}
 | | ... | &{settings}
 
 | Honeycomb configures TAP interface
@@ -46,11 +44,11 @@
 | | ...
 | | ... | *Example:*
 | | ... | \| Honeycomb configures TAP interface \
-| | ... | \| ${nodes['DUT1']} \| tap_int1 \| ${{'tap-name':'tap1',\
-| | ... | 'mac':'08:00:27:60:26:ab', 'device-instance':3}} \|
+| | ... | \| ${nodes['DUT1']} \| tap_int1 \| ${{'host-interface-name':'tap1',\
+| | ... | 'mac':'08:00:27:60:26:ab', 'id':3}} \|
 | | ...
 | | [Arguments] | ${node} | ${interface} | ${settings}
-| | interfaceAPI.Configure interface TAP | ${node} | ${interface}
+| | Configure interface TAP | ${node} | ${interface}
 | | ... | &{settings}
 
 | Honeycomb removes TAP interface
@@ -65,7 +63,7 @@
 | | ... | \| Honeycomb removes TAP interface \
 | | ... | \| ${nodes['DUT1']} \| tap_int1 \|
 | | [Arguments] | ${node} | ${interface}
-| | interfaceAPI.Delete interface | ${node} | ${interface}
+| | Delete interface | ${node} | ${interface}
 
 | TAP Operational Data From Honeycomb Should Be
 | | [Documentation] | Retrieves interface TAP configuration through Honeycomb\
@@ -79,13 +77,13 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| TAP Operational Data From Honeycomb Should Be \
-| | ... | \| ${nodes['DUT1']} \| tap_int1 \| ${{'tap-name':'tap1',\
-| | ... | 'mac':'08:00:27:60:26:ab', 'device-instance':3}} \|
+| | ... | \| ${nodes['DUT1']} \| tap_int1 \| ${{'host-interface-name':'tap1',\
+| | ... | 'mac':'08:00:27:60:26:ab', 'id':3}} \|
 | | ...
 | | [Arguments] | ${node} | ${interface} | ${settings}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
-| | ${api_tap}= | Set Variable | ${api_data['v3po:tap']}
-| | Should be equal | ${api_tap['tap-name']} | ${settings['tap-name']}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
+| | ${api_tap}= | Set Variable | ${api_data['v3po:tap-v2']}
+| | Should be equal | ${api_tap['device-name']} | ${settings['device-name']}
 | | ${api_mac}= | Set Variable | ${api_data['phys-address']}
 | | Should be equal | ${api_mac} | ${settings['mac']}
 
@@ -100,12 +98,14 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| TAP Operational Data From Honeycomb Should Be \
-| | ... | \| ${nodes['DUT1']} \| ${{'tap-name':'tap1',\
-| | ... | 'mac':'08:00:27:60:26:ab', 'device-instance':3}} \|
+| | ... | \| ${nodes['DUT1']} \| ${{'host-interface-name':'tap1',\
+| | ... | 'mac':'08:00:27:60:26:ab', 'id':3}} \|
 | | ...
 | | [Arguments] | ${node} | ${interface} | ${settings}
 | | ${vat_data}= | TAP Dump | ${node} | ${interface}
-| | Should be equal | ${vat_data['dev_name']} | ${settings['tap-name']}
+| | Should be equal | ${vat_data['dev_name']} | ${settings['dev_name']}
+| | Should be equal | ${vat_data['rx_ring_sz']} | ${settings['rx_ring_sz']}
+| | Should be equal | ${vat_data['tx_ring_sz']} | ${settings['tx_ring_sz']}
 # other settings not accessible through VAT commands
 
 | TAP Operational Data From Honeycomb Should Be empty
@@ -122,9 +122,9 @@
 | | ... | \| ${nodes['DUT1']} \| tap_int1 \|
 | | ...
 | | [Arguments] | ${node} | ${interface}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
-| | Run keyword and expect error | *KeyError: 'v3po:tap' | Set Variable
-| | ... | ${api_data['v3po:tap']}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
+| | Run keyword and expect error | *KeyError: 'v3po:tap-v2' | Set Variable
+| | ... | ${api_data['v3po:tap-v2']}
 
 | TAP Operational Data From VAT Should Be empty
 | | [Documentation] | Attempts to retrieve interface TAP configuration\
@@ -140,5 +140,5 @@
 | | ... | \| ${nodes['DUT1']} \| tap_int1 \|
 | | ...
 | | [Arguments] | ${node} | ${interface}
-| | Run Keyword And Expect Error | ValueError: No JSON object could be decoded
-| | ... | TAP Dump | ${node} | ${interface}
+| | ${data}= | TAP Dump | ${node} | ${interface}
+| | Should be empty | ${data}