diff options
Diffstat (limited to 'resources/libraries/python/honeycomb')
| -rw-r--r-- | resources/libraries/python/honeycomb/HcAPIKwACL.py | 15 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/Netconf.py | 6 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/Notifications.py | 6 |
3 files changed, 10 insertions, 17 deletions
diff --git a/resources/libraries/python/honeycomb/HcAPIKwACL.py b/resources/libraries/python/honeycomb/HcAPIKwACL.py index 19cdb37c47..b2848411a1 100644 --- a/resources/libraries/python/honeycomb/HcAPIKwACL.py +++ b/resources/libraries/python/honeycomb/HcAPIKwACL.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -13,6 +13,8 @@ """This module implements keywords to manipulate ACL data structures using Honeycomb REST API.""" + + from robot.api import logger from resources.libraries.python.topology import Topology @@ -255,17 +257,15 @@ class ACLKeywords(object): " under ACL table {1}.".format(session_match, table_name)) @staticmethod - def create_acl_plugin_classify_chain(node, list_name, data, macip=False): + def create_acl_plugin_classify_chain(node, list_name, data): """Create classify chain using the ietf-acl node. :param node: Honeycomb node. :param list_name: Name for the classify list. :param data: Dictionary of settings to send to Honeycomb. - :param macip: Use simple MAC+IP classifier. Optional. :type node: dict :type list_name: str :type data: dict - :type macip: bool :returns: Content of response. :rtype: bytearray :raises HoneycombError: If the operation fails. @@ -284,21 +284,18 @@ class ACLKeywords(object): return resp @staticmethod - def set_acl_plugin_interface(node, interface, acl_name, - direction, macip=False): + def set_acl_plugin_interface(node, interface, acl_name, direction): """Assign an interface to an ietf-acl classify chain. :param node: Honeycomb node. :param interface: Name of an interface on the node. :param acl_name: Name of an ACL chain configured through ACL-plugin. - :param direction: Classify incoming or outgiong packets. + :param direction: Classify incoming or outgoing packets. Valid options are: ingress, egress - :param macip: Use simple MAC+IP classifier. Optional. :type node: dict :type interface: str or int :type acl_name: str :type direction: str - :type macip: bool :returns: Content of response. :rtype: bytearray :raises ValueError: If the direction argument is incorrect. diff --git a/resources/libraries/python/honeycomb/Netconf.py b/resources/libraries/python/honeycomb/Netconf.py index 303361034e..caca14ed1a 100644 --- a/resources/libraries/python/honeycomb/Netconf.py +++ b/resources/libraries/python/honeycomb/Netconf.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -126,14 +126,12 @@ class Netconf(object): logger.trace(reply) return reply.replace(self.delimiter, "") - def get_all_responses(self, size=4096, time_out=3): + def get_all_responses(self, size=4096): """Read responses from the receive buffer and catenate together until a read operation times out. :param size: Maximum number of bytes to read in one iteration. - :param time_out: Timeout value for getting the complete response. :type size: int - :type time_out: int :returns: Content of response. :rtype: str """ diff --git a/resources/libraries/python/honeycomb/Notifications.py b/resources/libraries/python/honeycomb/Notifications.py index 7bba00a2d2..38f1fd3093 100644 --- a/resources/libraries/python/honeycomb/Notifications.py +++ b/resources/libraries/python/honeycomb/Notifications.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Cisco and/or its affiliates. +# Copyright (c) 2019 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: @@ -27,14 +27,12 @@ class Notifications(Netconf): - read received notifications """ - def add_notification_listener(self, subscription, time_out=10): + def add_notification_listener(self, subscription): """Open a new channel on the SSH session, connect to Netconf subsystem and subscribe to receive Honeycomb notifications. :param subscription: RPC for subscription to notifications. - :param time_out: Timeout value for each read operation in seconds. :type subscription: str - :type time_out: int :raises HoneycombError: If subscription to notifications fails. """ |