X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Finterfaces.robot;h=06428c0c964c79d7d14e3d501ccfe09c0415f57e;hp=3eef9f1b2d3f61e134d7187b9c5ad0c60b7c0e91;hb=20cc67d5f23a7f4e05b08012bf3d3a63be4bcf63;hpb=54021405af918f9b6ee2fc8c0d531903f579e930

diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot
index 3eef9f1b2d..06428c0c96 100644
--- a/resources/libraries/robot/honeycomb/interfaces.robot
+++ b/resources/libraries/robot/honeycomb/interfaces.robot
@@ -13,14 +13,12 @@
 
 *** Settings ***
 | Library | resources.libraries.python.InterfaceUtil
-| ...     | WITH NAME | interfaceCLI
 | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords
-| ...     | WITH NAME | InterfaceAPI
-| Library | resources.libraries.python.IPv4Util
+| Library | resources.libraries.python.IPUtil
 | Library | resources.libraries.python.TrafficScriptExecutor
 
 *** Keywords ***
-| Honeycomb sets interface state
+| Honeycomb configures interface state
 | | [Documentation] | Uses Honeycomb API to change the admin state\
 | | ... | of the specified interface.
 | | ...
@@ -31,10 +29,10 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface state \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb configures interface state \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| up \|
 | | [Arguments] | ${node} | ${interface} | ${state}
-| | interfaceAPI.Set interface state | ${node} | ${interface} | ${state}
+| | Honeycomb Set Interface State | ${node} | ${interface} | ${state}
 
 | Interface state from Honeycomb should be
 | | [Documentation] | Retrieves interface admin state through Honeycomb and\
@@ -50,7 +48,7 @@
 | | ... | \| Interface state from Honeycomb should be \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| up \|
 | | [Arguments] | ${node} | ${interface} | ${state}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | ${api_state}= | Set Variable | ${api_data['admin-status']}
 | | Should be equal | ${api_state} | ${state}
 
@@ -71,12 +69,12 @@
 | | ... | \| Interface state from VAT should be \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| up \|
 | | [Arguments] | ${node} | ${interface} | ${state}
-| | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
+| | ${vat_data}= | VPP get interface data | ${node} | ${interface}
 | | ${vat_state}= | Set Variable if
 | | ... | ${vat_data['admin_up_down']} == 1 | up | down
 | | Should be equal | ${vat_state} | ${state}
 
-| Honeycomb sets interface ipv4 address
+| Honeycomb sets interface IPv4 address
 | | [Documentation] | Uses Honeycomb API to change ipv4 address\
 | | ... | of the specified interface. Any existing addresses will be removed.
 | | ...
@@ -88,13 +86,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface ipv4 address \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb sets interface IPv4 address \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 255.255.255.0 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${netmask}
-| | interfaceAPI.Add first ipv4 address
+| | Add first ipv4 address
 | | ... | ${node} | ${interface} | ${address} | ${netmask}
 
-| Honeycomb sets interface ipv4 address with prefix
+| Honeycomb sets interface IPv4 address with prefix
 | | [Documentation] | Uses Honeycomb API to assign an ipv4 address to the\
 | | ... | specified interface. Any existing addresses will be removed.
 | | ...
@@ -106,13 +104,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface ipv4 address with prefix \
+| | ... | \| Honeycomb sets interface IPv4 address with prefix \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 24 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
-| | interfaceAPI.Add first ipv4 address
+| | Add first ipv4 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
-| Honeycomb adds interface ipv4 address
+| Honeycomb adds interface IPv4 address
 | | [Documentation] | Uses Honeycomb API to add an ipv4 address to the\
 | | ... | specified interface, without removing existing addresses.
 | | ...
@@ -124,13 +122,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds interface ipv4 address \
+| | ... | \| Honeycomb adds interface IPv4 address \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 24 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
-| | interfaceAPI.Add ipv4 address
+| | Add ipv4 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
-| Honeycomb fails to add interface ipv4 address
+| Honeycomb fails to add interface IPv4 address
 | | [Documentation] | Uses Honeycomb API to add an ipv4 address to the\
 | | ... | specified interface, and expects to fail with code 500.
 | | ...
@@ -142,11 +140,11 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb fails to add interface ipv4 address \
+| | ... | \| Honeycomb fails to add interface IPv4 address \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 24 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | Run Keyword and Expect Error | *not successful. Status code: 500.
-| | ... | Honeycomb adds interface ipv4 address
+| | ... | Honeycomb adds interface IPv4 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
 | IPv4 address from Honeycomb should be
@@ -164,7 +162,7 @@
 | | ... | \| IPv4 address from Honeycomb should be \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.2 \| ${24} \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | ${settings}= | Create Dictionary
 | | ... | ip=${address} | prefix-length=${prefix}
 | | Should contain | ${api_data['ietf-ip:ipv4']['address']} | ${settings}
@@ -179,19 +177,22 @@
 | | ... | - address - IP address to expect. Type: string
 | | ... | - prefix - prefix length to expect. Type: string
 | | ... | - netmask - subnet mask to expect. Type: string
+| | ... | - sw_if_index - Index of interface. Type: integer
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| IPv4 address from VAT should be \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.2 \| ${24} \| 255.255.255.0 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix} | ${netmask}
-| | ${vpp_data}= | interfaceCLI.VPP get interface ip addresses
+| | ${sw_if_index}= | Vpp Get Interface Sw Index | ${node} | ${interface}
+| | ${vpp_data}= | VPP get interface ip addresses
 | | ... | ${node} | ${interface} | ipv4
 | | ${settings}= | Create Dictionary
-| | ... | ip=${address} | netmask=${netmask} | prefix_length=${prefix}
+| | ... | ip=${address} | netmask=${netmask} | sw_if_index=${sw_if_index}
+| | ... | prefix_length=${prefix} | is_ipv6=${0}
 | | Should contain | ${vpp_data} | ${settings}
 
-| Honeycomb removes interface ipv4 addresses
+| Honeycomb removes interface IPv4 addresses
 | | [Documentation] | Removes all configured ipv4 addresses from the specified\
 | | ... | interface.
 | | ...
@@ -201,7 +202,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb removes interface ipv4 addresses \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb removes interface IPv4 addresses \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | Remove all ipv4 addresses | ${node} | ${interface}
@@ -219,7 +220,7 @@
 | | ... | \| IPv4 address from Honeycomb should be empty\| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | Run keyword and expect error | *KeyError:*
 | | ... | Set Variable | ${api_data['ietf-ip:ipv4']['address']}
 
@@ -236,11 +237,10 @@
 | | ... | \| IPv4 config from VAT should be empty \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | Run keyword and expect error | *No JSON object could be decoded*
-| | ... | InterfaceCLI.VPP get interface ip addresses
-| | ... | ${node} | ${interface} | ipv4
+| | ${data}= | VPP get interface ip addresses | ${node} | ${interface} | ipv4
+| | Should be empty | ${data}
 
-| Honeycomb adds interface ipv4 neighbor
+| Honeycomb adds interface IPv4 neighbor
 | | [Documentation] | Uses Honeycomb API to assign an ipv4 neighbor to the\
 | | ... | specified interface.
 | | ...
@@ -252,10 +252,10 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds interface ipv4 neighbor \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds interface IPv4 neighbor \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.3 \| 08:00:27:c0:5d:37 \
 | | [Arguments] | ${node} | ${interface} | ${fib_address} | ${fib_mac}
-| | interfaceAPI.Add ipv4 neighbor
+| | Add ipv4 neighbor
 | | ... | ${node} | ${interface} | ${fib_address} | ${fib_mac}
 
 | IPv4 neighbor from Honeycomb should be
@@ -273,12 +273,12 @@
 | | ... | \| IPv4 neighbor from Honeycomb should be \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.4 \| 08:00:27:60:26:ab \|
 | | [Arguments] | ${node} | ${interface} | ${ip_address} | ${mac_address}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | ${settings}= | Create Dictionary
 | | ... | ip=${ip_address} | link-layer-address=${mac_address} | origin=static
 | | Should contain | ${api_data['ietf-ip:ipv4']['neighbor']} | ${settings}
 
-| Honeycomb clears all interface ipv4 neighbors
+| Honeycomb clears all interface IPv4 neighbors
 | | [Documentation] | Uses Honeycomb API to remove all ipv4 neighbors from the\
 | | ... | specified interface.
 | | ...
@@ -288,10 +288,10 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb clears all interface ipv4 neighbors \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb clears all interface IPv4 neighbors \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | interfaceAPI.Remove all ipv4 neighbors | ${node} | ${interface}
+| | Remove all ipv4 neighbors | ${node} | ${interface}
 
 | IPv4 neighbor from Honeycomb should be empty
 | | [Documentation] | Retrieves ipv4 neighbor list through Honeycomb\
@@ -306,11 +306,11 @@
 | | ... | \| IPv4 neighbor from Honeycomb should be empty \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | Run keyword and expect error | *KeyError:*
 | | ... | Set Variable | ${api_data['ietf-ip:ipv4']['neighbor'][0]['ip']}
 
-| Honeycomb sets interface ipv6 address
+| Honeycomb sets interface IPv6 address
 | | [Documentation] | Uses Honeycomb API to change ipv6 address\
 | | ... | of the specified interface. Existing IPv6 addresses will be removed,\
 | | ... | with the exception of self-configured link-layer IPv6.
@@ -323,13 +323,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface ipv6 address \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb sets interface IPv6 address \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| 64 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
-| | interfaceAPI.Add first ipv6 address
+| | Add first ipv6 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
-| Honeycomb adds interface ipv6 address
+| Honeycomb adds interface IPv6 address
 | | [Documentation] | Uses Honeycomb API to add an ipv6 address\
 | | ... | to the specified interface.
 | | ...
@@ -341,13 +341,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds interface ipv6 address \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds interface IPv6 address \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| 64 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
-| | interfaceAPI.Add ipv6 address
+| | Add ipv6 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
-| Honeycomb fails to add interface ipv6 address
+| Honeycomb fails to add interface IPv6 address
 | | [Documentation] | Uses Honeycomb API to add an ipv6 address to the\
 | | ... | specified interface, and expects to fail with code 500.
 | | ...
@@ -359,11 +359,11 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb fails to add interface ipv6 address \
+| | ... | \| Honeycomb fails to add interface IPv6 address \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 10::10 \| 64 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | Run Keyword and Expect Error | *not successful. Status code: 500.
-| | ... | Honeycomb adds interface ipv6 address
+| | ... | Honeycomb adds interface IPv6 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
 | IPv6 address from Honeycomb should contain
@@ -381,7 +381,7 @@
 | | ... | \| IPv6 address from Honeycomb should contain \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| 64 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | ${settings}= | Create Dictionary
 | | ... | ip=${address} | prefix-length=${prefix}
 | | Should contain | ${api_data['ietf-ip:ipv6']['address']} | ${settings}
@@ -395,19 +395,22 @@
 | | ... | - interface - name of an interface on the specified node. Type: string
 | | ... | - address - IP address to expect. Type: string
 | | ... | - prefix - length of subnet prefix to expect. Type: string
+| | ... | - sw_if_index - index of interface. Type: integer
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| IPv6 address from VAT should contain \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| 64 \|
-| | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
-| | ${vpp_data}= | interfaceCLI.VPP get interface ip addresses
+| | [Arguments] | ${node} | ${interface} | ${address} | ${prefix} | ${netmask}
+| | ${sw_if_index}= | Vpp Get Interface Sw Index | ${node} | ${interface}
+| | ${vpp_data}= | VPP get interface ip addresses
 | | ... | ${node} | ${interface} | ipv6
 | | ${settings}= | Create Dictionary
-| | ... | ip=${address} | prefix_length=${prefix}
+| | ... | ip=${address} | netmask=${netmask} | sw_if_index=${sw_if_index}
+| | ... | prefix_length=${prefix} | is_ipv6=${1}
 | | Should contain | ${vpp_data} | ${settings}
 
-| Honeycomb removes interface ipv6 addresses
+| Honeycomb removes interface IPv6 addresses
 | | [Documentation] | Removes all configured ipv6 addresses from the specified\
 | | ... | interface.
 | | ...
@@ -417,7 +420,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb removes interface ipv6 addresses \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb removes interface IPv6 addresses \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | Remove all ipv6 addresses | ${node} | ${interface}
@@ -435,7 +438,7 @@
 | | ... | \| IPv6 address from Honeycomb should be empty\| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | Run keyword and expect error | *KeyError:*
 | | ... | Set Variable | ${api_data['ietf-ip:ipv6']['address']}
 
@@ -452,11 +455,10 @@
 | | ... | \| IPv6 config from VAT should be empty \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | Run keyword and expect error | *No JSON object could be decoded*
-| | ... | InterfaceCLI.VPP get interface ip addresses
-| | ... | ${node} | ${interface} | ipv6
+| | ${data}= | VPP get interface ip addresses | ${node} | ${interface} | ipv6
+| | Should be empty | ${data}
 
-| Honeycomb adds interface ipv6 neighbor
+| Honeycomb adds interface IPv6 neighbor
 | | [Documentation] | Uses Honeycomb API to assign an ipv6 neighbor to the\
 | | ... | specified interface.
 | | ...
@@ -468,10 +470,10 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds interface ipv6 neighbor \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds interface IPv6 neighbor \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.3 \| 08:00:27:c0:5d:37 \|
 | | [Arguments] | ${node} | ${interface} | ${fib_address} | ${fib_mac}
-| | InterfaceAPI.Add ipv6 neighbor
+| | Add ipv6 neighbor
 | | ... | ${node} | ${interface} | ${fib_address} | ${fib_mac}
 
 | IPv6 neighbor from Honeycomb should be
@@ -489,12 +491,12 @@
 | | ... | \| IPv6 neighbor from Honeycomb should be \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.4 \| 08:00:27:60:26:ab \|
 | | [Arguments] | ${node} | ${interface} | ${ip_address} | ${mac_address}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | ${settings}= | Create Dictionary
 | | ... | ip=${ip_address} | link-layer-address=${mac_address} | origin=static
 | | Should contain | ${api_data['ietf-ip:ipv6']['neighbor']} | ${settings}
 
-| Honeycomb clears all interface ipv6 neighbors
+| Honeycomb clears all interface IPv6 neighbors
 | | [Documentation] | Uses Honeycomb API to remove all ipv6 neighbors from the\
 | | ... | specified interface.
 | | ...
@@ -504,10 +506,10 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb clears all interface ipv6 neighbors \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb clears all interface IPv6 neighbors \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | interfaceAPI.Remove all ipv6 neighbors | ${node} | ${interface}
+| | Remove all ipv6 neighbors | ${node} | ${interface}
 
 | IPv6 neighbor from Honeycomb should be empty
 | | [Documentation] | Retrieves ipv6 neighbor list through Honeycomb\
@@ -522,7 +524,7 @@
 | | ... | \| IPv6 neighbor from Honeycomb should be empty \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | Run keyword and expect error | *KeyError:*
 | | ... | Set Variable | ${api_data['ietf-ip:ipv6']['neighbor'][0]['ip']}
 
@@ -541,7 +543,7 @@
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${{'mtu': 1500}} \
 | | [Arguments] | ${node} | ${interface} | ${ethernet}
 | | :FOR | ${key} | IN | @{ethernet.keys()}
-| | | interfaceAPI.Configure interface ethernet
+| | | Configure interface ethernet
 | | | ... | ${node} | ${interface} | ${key} | ${ethernet['${key}']}
 
 | Interface ethernet Operational Data From Honeycomb Should Be
@@ -559,7 +561,7 @@
 | | ... | should be \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \
 | | ... | \| ${{'mtu': 1500}} \|
 | | [Arguments] | ${node} | ${interface} | ${ethernet}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | :FOR | ${key} | IN | @{ethernet.keys()}
 | | | Should be equal
 | | | ... | ${api_data['v3po:ethernet']['${key}']} | ${ethernet['${key}']}
@@ -578,10 +580,10 @@
 | | ... | \| Interface ethernet Operational Data From VAT Should Be \
 | | ... | should be \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1500} \|
 | | [Arguments] | ${node} | ${interface} | ${mtu}
-| | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
+| | ${vat_data}= | VPP get interface data | ${node} | ${interface}
 | | Should be equal | ${vat_data['mtu']} | ${mtu}
 
-| Honeycomb sets interface vrf ID
+| Honeycomb sets interface VRF ID
 | | [Documentation] | Uses Honeycomb API to change interface vrf\
 | | ... | configuration.
 | | ...
@@ -592,13 +594,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface vrf ID \
+| | ... | \| Honeycomb sets interface VRF ID \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1} \| ipv4 \|
 | | [Arguments] | ${node} | ${interface} | ${vrf_id} | ${ip_version}
-| | interfaceAPI.Configure interface routing
+| | Configure interface routing
 | | ... | ${node} | ${interface} | ${ip_version}-vrf-id | ${vrf_id}
 
-| Interface vrf ID from Honeycomb should be
+| Interface VRF ID from Honeycomb should be
 | | [Documentation] | Retrieves interface ethernet configuration\
 | | ... | through Honeycomb and compares with settings supplied in arguments.
 | | ...
@@ -610,15 +612,15 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface vrf ID from Honeycomb should be \
+| | ... | \| Interface VRF ID from Honeycomb should be \
 | | ... | should be \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1} \
 | | ... | \| ipv4 \|
 | | [Arguments] | ${node} | ${interface} | ${vrf_id} | ${ip_version}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface} |
+| | ${api_data}= | Get interface oper data | ${node} | ${interface} |
 | | Should be equal
 | | ... | ${api_data['v3po:routing']['${ip_version}-vrf-id']} | ${vrf_id}
 
-| Interface vrf ID from VAT should be
+| Interface VRF ID from VAT should be
 | | [Documentation] | Retrieves interface ethernet configuration\
 | | ... | through VAT and compares with settings supplied in arguments.
 | | ...
@@ -629,10 +631,10 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface vrf ID from VAT should be \
+| | ... | \| Interface VRF ID from VAT should be \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1} \|
 | | [Arguments] | ${node} | ${interface} | ${vrf_id}
-| | ${vat_data}= | InterfaceCLI.get interface vrf table
+| | ${vat_data}= | get interface vrf table
 | | ... | ${node} | ${interface}
 | | Should be equal | ${vat_data} | ${vrf_id}
 
@@ -650,7 +652,7 @@
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \|
 | | ...
 | | [Arguments] | ${node} | ${interface}
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
 | | Should be empty | ${api_data}
 
 | Interface Operational Data From VAT Should Be empty
@@ -667,7 +669,7 @@
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \|
 | | ...
 | | [Arguments] | ${node} | ${interface} |
-| | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
+| | ${vat_data}= | VPP get interface data | ${node} | ${interface}
 | | Should be empty | ${vat_data}
 
 | Interface indices from Honeycomb and VAT should correspond
@@ -686,13 +688,13 @@
 | | ...
 | | [Arguments] | ${node} | ${interface}
 | | ...
-| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
-| | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
+| | ${api_data}= | Get interface oper data | ${node} | ${interface}
+| | ${vat_data}= | VPP get interface data | ${node} | ${interface}
 | | ${sw_if_index}= | EVALUATE | ${vat_data['sw_if_index']} + 1
 | | Should be equal as strings
 | | ... | ${api_data['if-index']} | ${sw_if_index}
 
-| Get Interface index from oper data
+| Get interface index from oper data
 | | [Documentation] | Retrieves interface operational data and returns\
 | | ... | if-index of the specified interface.
 | | ...
@@ -702,9 +704,9 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Get Interface index from oper data \| ${nodes['DUT1']} \| local0 \|
+| | ... | \| Get interface index from oper data \| ${nodes['DUT1']} \| local0 \|
 | | [Arguments] | ${node} | ${interface}
-| | ${data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${data}= | Get interface oper data | ${node} | ${interface}
 | | Return from keyword | ${data['if-index']}
 
 | Honeycomb should show disabled interface in oper data
@@ -720,7 +722,7 @@
 | | ... | \| Honeycomb should show disabled interface in oper data \
 | | ... | \| ${nodes['DUT1']} \| ${vx_interface} \|
 | | [Arguments] | ${node} | ${index}
-| | interfaceAPI.check disabled interface | ${node} | ${index}
+| | check disabled interface | ${node} | ${index}
 
 | Honeycomb should not show disabled interface in oper data
 | | [Documentation] | Retrieves list of disabled interfaces\