aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python
diff options
context:
space:
mode:
authorselias <samelias@cisco.com>2016-10-04 14:41:16 +0200
committerPeter Mikus <pmikus@cisco.com>2016-11-08 09:19:27 +0000
commit839c9c1a64524fe236ff435e6fbd3fe29eb97603 (patch)
tree8437e2ff63ba710f688587e8c8afa1a3226757a3 /resources/libraries/python
parent440370de3fc66d5bb9754a55fa78ccce8c598f5d (diff)
CSIT-423: HC Test: delete VxLAN interface
Modify VxLAN test cases to account for changes in Honeycomb. Change-Id: If2db55548b5472350d128bdfbb5bdd5289e1deef Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'resources/libraries/python')
-rw-r--r--resources/libraries/python/honeycomb/HcAPIKwInterfaces.py51
-rw-r--r--resources/libraries/python/honeycomb/HoneycombSetup.py2
2 files changed, 52 insertions, 1 deletions
diff --git a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
index 559f64e304..035016c276 100644
--- a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
+++ b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
@@ -165,6 +165,33 @@ class InterfaceKeywords(object):
return []
@staticmethod
+ def get_disabled_interfaces_oper_data(node):
+ """Get operational data about all disabled interfaces from Honeycomb.
+
+ :param node: Honeycomb node.
+ :type node: dict
+ :return: Operational data about disabled interfaces.
+ :rtype: list
+ :raises HoneycombError: If it is not possible to get operational data.
+ """
+
+ status_code, resp = HcUtil. \
+ get_honeycomb_data(node, "oper_disabled_interfaces")
+ if status_code == HTTPCodes.NOT_FOUND:
+ raise HoneycombError(
+ "No disabled interfaces present on node."
+ )
+ if status_code != HTTPCodes.OK:
+ raise HoneycombError(
+ "Not possible to get operational information about the "
+ "interfaces. Status code: {0}.".format(status_code))
+ try:
+ return resp["disabled-interfaces"]["disabled-interface-index"]
+
+ except (KeyError, TypeError):
+ return []
+
+ @staticmethod
def get_interface_oper_data(node, interface):
"""Get operational data about the given interface from Honeycomb.
@@ -1532,3 +1559,27 @@ class InterfaceKeywords(object):
interface = "{0}.{1}".format(intf, sub_if_id)
return InterfaceKeywords.get_interface_oper_data(node, interface)
+
+ @staticmethod
+ def check_disabled_interface(node, interface):
+ """Retrieves list of disabled interface indices from Honeycomb,
+ and matches with the provided interface by index.
+
+ :param node: Honeycomb node.
+ :param interface: Index number of an interface on the node.
+ :type node: dict
+ :type interface: int
+ :return: True if the interface exists in disabled interfaces.
+ :rtype: bool
+ :raises HoneycombError: If the interface is not present
+ in retrieved list of disabled interfaces.
+ """
+ data = InterfaceKeywords.get_disabled_interfaces_oper_data(node)
+ # decrement by one = conversion from HC if-index to VPP sw_if_index
+ interface -= 1
+
+ for item in data:
+ if item["index"] == interface:
+ return True
+ raise HoneycombError("Interface index {0} not present in list"
+ " of disabled interfaces.".format(interface))
diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py
index b8c47fac03..8a05ad7583 100644
--- a/resources/libraries/python/honeycomb/HoneycombSetup.py
+++ b/resources/libraries/python/honeycomb/HoneycombSetup.py
@@ -265,7 +265,7 @@ class HoneycombSetup(object):
"""
cmds = ("netstat -anp | grep java",
- "ps -ef | grep karaf")
+ "ps -ef | grep [h]oneycomb")
logger.info("Checking node {} ...".format(node['host']))
for cmd in cmds: