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=d24da5bd961b5cf48bb8f6e4054ebd30615ac902;hp=0898a9339e0aac72a5cf16d0af1d5a3da10dc17a;hb=1813672eb9f6988046bc65167235ae37b088298c;hpb=233683de57527f477bf7e8d042a5f3d1f08c7744;ds=sidebyside diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot index 0898a9339e..d24da5bd96 100644 --- a/resources/libraries/robot/honeycomb/access_control_lists.robot +++ b/resources/libraries/robot/honeycomb/access_control_lists.robot @@ -12,7 +12,6 @@ # limitations under the License. *** Variables *** #TODO: update based on resolution of bug https://jira.fd.io/browse/HONEYCOMB-119 -| @{hc_table_ignore}= | memory_size *** Settings *** | Library | resources.libraries.python.Classify @@ -124,7 +123,7 @@ | | ... | \| ${settings} \| | | [Arguments] | ${node} | ${settings} | | ${data}= | Get classify table oper data | ${node} | ${settings['name']} -| | Compare data structures | ${data} | ${settings} | ignore=${hc_table_ignore} +| | Compare data structures | ${data} | ${settings} | ACL table from VAT should be | | [Documentation] | Retrieves ACL table information from VAT\ @@ -172,7 +171,7 @@ | | ... | \| ACL table from VAT should not exist \| ${nodes['DUT1']} \ | | ... | \| ${0} \| | | [Arguments] | ${node} | ${table_index} -| | Run keyword and expect error | No JSON data. +| | Run keyword and expect error | VAT: no JSON data. | | ... | Get classify table data | ${node} | ${table_index} | ACL session from Honeycomb should be @@ -271,7 +270,9 @@ | | [Arguments] | ${node} | ${interface} | ${table_name} | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface} | | Should be equal -| | ... | ${table_name} | ${data['v3po:acl']['l2-acl']['classify-table']} +| | ... | ${table_name} +| | ... | ${data['v3po:acl']['ingress']['l2-acl']['classify-table']} +| | ... | ${data['v3po:acl']['ingress']['ip4-acl']['classify-table']} | Interface ACL settings from VAT should be | | [Documentation] | Retrieves ACL interface settings from VAT\ @@ -376,10 +377,10 @@ | | ... | \| acl_test \| permit \| | | [Arguments] | | ... | ${node} | ${interface} | ${layer} | ${direction} | ${acl_list_name} -| | ... | ${default-action} +| | ... | ${default-action} | ${mode}=${None} | | Set IETF interface ACL | | ... | ${node} | ${interface} | ${layer} | ${direction} | ${acl_list_name} -| | ... | ${default-action} +| | ... | ${default-action} | ${mode} | Clear IETF-ACL settings | | [Documentation] | Removes ACl assignment from interface, then deletes\