X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Faccess_control_lists.robot;h=4a6887814424534d633a25be85d8eaf2e981dd21;hp=a62ea0f2e8baa820657ba01e92c422c2e7f9b45c;hb=9ce4ca3b24e45bc9c4ad06e09829ccba1addbd62;hpb=4f4eaa1d52f3bdbe3caecdc1d6a024c369a2834a

diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot
index a62ea0f2e8..4a68878144 100644
--- a/resources/libraries/robot/honeycomb/access_control_lists.robot
+++ b/resources/libraries/robot/honeycomb/access_control_lists.robot
@@ -18,7 +18,6 @@
 | Library | resources.libraries.python.InterfaceUtil
 | Library | resources.libraries.python.honeycomb.HcAPIKwACL.ACLKeywords
 | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords
-| ...     | WITH NAME | InterfaceAPI
 | Documentation | Keywords used to manage ACLs.
 
 *** Keywords ***
@@ -92,7 +91,7 @@
 | | ... | \| Honeycomb enables ACL on interface \| ${nodes['DUT1']} \
 | | ... | \| GigabithEthernet0/8/0 \| table0 \|
 | | [Arguments] | ${node} | ${interface} | ${table_name}
-| | InterfaceAPI.Enable ACL on interface
+| | Enable ACL on interface
 | | ... | ${node} | ${interface} | ${table_name}
 
 | Honeycomb disables ACL on interface
@@ -107,7 +106,7 @@
 | | ... | \| Honeycomb disables ACL on interface \| ${nodes['DUT1']} \
 | | ... | \| GigabithEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | InterfaceAPI.Disable ACL on interface | ${node} | ${interface}
+| | Disable ACL on interface | ${node} | ${interface}
 
 | ACL table from Honeycomb should be
 | | [Documentation] | Retrieves ACL table information from Honeycomb\
@@ -171,7 +170,7 @@
 | | ... | \| ACL table from VAT should not exist \| ${nodes['DUT1']} \
 | | ... | \| ${0} \|
 | | [Arguments] | ${node} | ${table_index}
-| | Run keyword and expect error | VAT: no JSON data.
+| | Run keyword and expect error | *
 | | ... | Get classify table data | ${node} | ${table_index}
 
 | ACL session from Honeycomb should be
@@ -225,7 +224,7 @@
 | | ... | \| ACL session from Honeycomb should not exist \| ${nodes['DUT1']} \
 | | ... | \| table0 \| 00:00:00:00:00:00:01:02:03:04:05:06:00:00:00:00 \|
 | | [Arguments] | ${node} | ${table_name} | ${session_match}
-| | Run keyword and expect error | *HoneycombError: *Status code: 404.
+| | Run keyword and expect error | *KeyError:*
 | | ... | Get classify session oper data
 | | ... | ${node} | ${table_name} | ${session_match}
 
@@ -254,7 +253,7 @@
 | | ... | Get classify session data
 | | ... | ${node} | ${table_index} | ${session_index}
 
-| Interface ACL settings from Honeycomb should be
+| Interface ACL configuration from Honeycomb should be
 | | [Documentation] | Retrieves ACL interface settings from Honeycomb\
 | | ... | and compares with expected settings.
 | | ...
@@ -265,16 +264,16 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface ACL settings from Honeycomb should be \
+| | ... | \| Interface ACL configuration from Honeycomb should be \
 | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| table0 \|
 | | [Arguments] | ${node} | ${interface} | ${table_name}
-| | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${data}= | Get interface oper data | ${node} | ${interface}
 | | Should be equal
 | | ... | ${table_name}
 | | ... | ${data['vpp-interface-acl:acl']['ingress']['l2-acl']['classify-table']}
 | | ... | ${data['vpp-interface-acl:acl']['ingress']['ip4-acl']['classify-table']}
 
-| Interface ACL settings from VAT should be
+| Interface ACL configuration from VAT should be
 | | [Documentation] | Retrieves ACL interface settings from VAT\
 | | ... | and compares with expected settings.
 | | ...
@@ -285,14 +284,15 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface ACL settings from VAT should be \| ${nodes['DUT1']} \
-| | ... | \| GigabithEthernet0/8/0 \| ${0} \|
+| | ... | \| Interface ACL configuration from VAT should be \
+| | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| ${0} \|
+| | ...
 | | [Arguments] | ${node} | ${interface} | ${table_index}
 | | ${data}= | Get interface classify table | ${node} | ${interface}
 | | Should be equal | ${table_index} | ${data['l2_table_id']}
 | | Should be equal | ${table_index} | ${data['ip4_table_id']}
 
-| Interface ACL settings from Honeycomb should be empty
+| Interface ACL configuration from Honeycomb should be empty
 | | [Documentation] | Retrieves ACL interface settings from Honeycomb\
 | | ... | and expects to fail.
 | | ...
@@ -302,15 +302,15 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface ACL settings from Honeycomb should be empty \
+| | ... | \| Interface ACL configuration from Honeycomb should be empty \
 | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface}
+| | ${data}= | Get interface oper data | ${node} | ${interface}
 | | Run keyword and expect error | *KeyError: 'vpp-interface-acl:acl'
 | | ... | Set Variable
 | | ... | ${data['vpp-interface-acl:acl']['l2-acl']['classify-table']}
 
-| Interface ACL settings from VAT should be empty
+| Interface ACL configuration from VAT should be empty
 | | [Documentation] | Retrieves ACL interface settings from VAT\
 | | ... | and expects to fail.
 | | ...
@@ -320,7 +320,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface ACL settings from Honeycomb should be empty \
+| | ... | \| Interface ACL configuration from Honeycomb should be empty \
 | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | ${data}= | Get interface classify table | ${node} | ${interface}
@@ -379,7 +379,7 @@
 | | Set ACL plugin interface
 | | ... | ${node} | ${interface} | ${acl_list_name} | ${direction} | ${macip}
 
-| Clear plugin-ACL settings
+| Clear plugin-ACL configuration
 | | [Documentation] | Removes ACl assignment from interface, then deletes\
 | | ... | IETF-ACL chain.
 | | ...
@@ -389,7 +389,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Clear plugin-ACL settings | ${nodes['DUT1']} \
+| | ... | \| Clear plugin-ACL configuration | ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | Delete interface plugin ACLs | ${node} | ${interface}
@@ -409,7 +409,7 @@
 | | VPP log plugin acl settings | ${node}
 | | VPP log plugin acl interface assignment | ${node}
 
-| Send ICMP packet with type and code
+| Send ICMP packet with type and code and verify received packet
 | | [Documentation] | Sends an ICMP packet with specified code and type.
 | | ...
 | | ... | *Arguments:*
@@ -429,7 +429,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send ICMP packet with type and code \| ${nodes['TG']} \
+| | ... | \| Send ICMP packet with type and code and verify received packet \| ${nodes['TG']} \
 | | ... | \| 16.0.0.1 \| 32.0.0.1 \| eth2 \| 08:00:27:cc:4f:54 \
 | | ... | \| eth4 \| 08:00:27:c9:6a:d5 \| ${1} \| ${1} \|
 | | ...