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=e35cc929521b1483b2137446fe82f588b4648845;hp=7072f597c4b8a7b5d363780d32ddafe1cc6066b6;hb=8c1bb6ac0c8253ee203d120c1a8f035c47293d9e;hpb=4a16abbba4ffac705b3ac389421dd21e78457cc0

diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot
index 7072f597c4..e35cc92952 100644
--- a/resources/libraries/robot/honeycomb/access_control_lists.robot
+++ b/resources/libraries/robot/honeycomb/access_control_lists.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2017 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -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\
@@ -156,7 +155,7 @@
 | | ... | \| ACL table from Honeycomb should not exist \| ${nodes['DUT1']} \
 | | ... | \| table0 \|
 | | [Arguments] | ${node} | ${table_name}
-| | Run keyword and expect error | ValueError: No JSON object could be decoded
+| | Run keyword and expect error | *
 | | ... | Get classify table oper data | ${node} | ${table_name}
 
 | ACL table from VAT should not exist
@@ -226,7 +225,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}
 
@@ -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['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
 | | [Documentation] | Retrieves ACL interface settings from VAT\
@@ -305,8 +306,9 @@
 | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface}
-| | Run keyword and expect error | *KeyError: 'v3po:acl'
-| | ... | Set Variable | ${data['v3po:acl']['l2-acl']['classify-table']}
+| | 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
 | | [Documentation] | Retrieves ACL interface settings from VAT\
@@ -338,50 +340,46 @@
 | | [Arguments] | ${node}
 | | Remove all classify tables | ${node}
 
-| Honeycomb creates ACL chain through IETF node
-| | [Documentation] | Creates classify chain through the high-level\
-| | ... | IETF-ACL node.
+| Honeycomb creates ACL chain through ACL plugin
+| | [Documentation] | Creates classify chain using the ACL plugin.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
 | | ... | - acl_list_name - Name for the classify chain. Type: string
-| | ... | - layer - Classification layer (L2, L3, L4, mixed). Type: string
 | | ... | - acl_list_settings - classify rules. Type: dictionary
+| | ... | - macip - Use MAC+IP classifier. Optional. Type: boolean
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb creates ACL chain through IETF node \
+| | ... | \| Honeycomb creates ACL chain through ACL plugin \
 | | ... | \| ${nodes['DUT1']} \| acl_test \| ${settings} \|
-| | [Arguments] | ${node} | ${acl_list_name} | ${layer} | ${acl_list_settings}
-| | Create IETF classify chain
-| | ... | ${node} | ${acl_list_name} | ${layer} | ${acl_list_settings}
+| | [Arguments] | ${node} | ${acl_list_name} | ${acl_list_settings}
+| | ... | ${macip}=${False}
+| | Create ACL plugin classify chain
+| | ... | ${node} | ${acl_list_name} | ${acl_list_settings} | ${macip}
 
-| Honeycomb assigns IETF-ACL chain to interface
+| Honeycomb assigns plugin-ACL chain to interface
 | | [Documentation] | Applies classification through the high-level\
 | | ... | IETF-ACL node to an interface.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
-| | ... | - interface - Interface to apply classifier to. | Type: string
-| | ... | - layer - Classification layer (L2, L3, L4, mixed). Type: string
-| | ... | - direction - Ingress or Egress ACL. Type: string
-| | ... | - acl_list_name - Name of the classify chain to apply. Type: string
-| | ... | - default_action - Default classify action: permit or deny.\
-| | ... | Type: string
+| | ... | - interface - Interface to assign classifier to. Type: string
+| | ... | - acl_list_name - Name of the clasify chain. Type: string
+| | ... | - direction - Classifier direction, ingress or egress. Type: string
+| | ... | - macip - Use MAC+IP classifier. Optional. Type: boolean
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb assigns IETF-ACL chain to interface \
-| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| L2 \| ingress \
-| | ... | \| acl_test \| permit \|
+| | ... | \| Honeycomb assigns plugin-ACL chain to interface \
+| | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| acl_test \| ingress \|
 | | [Arguments]
-| | ... | ${node} | ${interface} | ${layer} | ${direction} | ${acl_list_name}
-| | ... | ${default-action} | ${mode}=${None}
-| | Set IETF interface ACL
-| | ... | ${node} | ${interface} | ${layer} | ${direction} | ${acl_list_name}
-| | ... | ${default-action} | ${mode}
+| | ... | ${node} | ${interface} | ${acl_list_name} | ${direction}
+| | ... | ${macip}=${False}
+| | Set ACL plugin interface
+| | ... | ${node} | ${interface} | ${acl_list_name} | ${direction} | ${macip}
 
-| Clear IETF-ACL settings
+| Clear plugin-ACL settings
 | | [Documentation] | Removes ACl assignment from interface, then deletes\
 | | ... | IETF-ACL chain.
 | | ...
@@ -391,7 +389,61 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | Clear IETF-ACL settings | ${nodes['DUT1']} \| GigabitEthernet0/8/0 \|
+| | ... | \| Clear plugin-ACL settings | ${nodes['DUT1']} \
+| | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
-| | Delete IETF interface ACLs | ${node} | ${interface}
-| | Delete IETF classify chains | ${node}
\ No newline at end of file
+| | Delete interface plugin ACLs | ${node} | ${interface}
+| | Delete ACL plugin classify chains | ${node}
+
+| Read plugin-ACL configuration from VAT
+| | [Documentation] | Obtains ACL-plugin configuration through VAT and logs\
+| | ... | the reply.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Read plugin-ACL configuration from VAT \| ${nodes['DUT1']} \|
+| | [Arguments] | ${node}
+| | VPP log plugin acl settings | ${node}
+| | VPP log plugin acl interface assignment | ${node}
+
+| Send ICMP packet with type and code
+| | [Documentation] | Sends an ICMP packet with specified code and type.
+| | ...
+| | ... | *Arguments:*
+| | ...
+| | ... | _NOTE:_ Arguments are based on topology:
+| | ... | TG(if1)->(if1)DUT(if2)->TG(if2)
+| | ...
+| | ... | - tg_node - Node to execute scripts on (TG). Type: dictionary
+| | ... | - src_ip - IP of source interface (TG-if1). Type: integer
+| | ... | - dst_ip - IP of destination interface (TG-if2). Type: integer
+| | ... | - tx_port - Source interface (TG-if1). Type: string
+| | ... | - tx_mac - MAC address of source interface (TG-if1). Type: string
+| | ... | - rx_port - Destionation interface (TG-if1). Type: string
+| | ... | - rx_mac - MAC address of destination interface (TG-if1). Type: string
+| | ... | - icmp_type - ICMP type to use. Type: int
+| | ... | - icmp_code - ICMP code to use. Type: int
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send ICMP packet with type and code \| ${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} \|
+| | ...
+| | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_port} |
+| | ... | ${tx_mac} | ${rx_port} | ${rx_mac} | ${icmp_type} | ${icmp_code}
+| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_port}
+| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port}
+| | ${args}= | Catenate | --src_mac | ${tx_mac}
+| | ...                 | --dst_mac | ${rx_mac}
+| | ...                 | --src_ip | ${src_ip}
+| | ...                 | --dst_ip | ${dst_ip}
+| | ...                 | --tx_if | ${tx_port_name}
+| | ...                 | --rx_if | ${rx_port_name}
+| | ...                 | --icmp_type | ${icmp_type}
+| | ...                 | --icmp_code | ${icmp_code}
+| | Run Traffic Script On Node | send_icmp_type_code.py
+| | ... | ${tg_node} | ${args}