aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--resources/libraries/python/HTTPRequest.py2
-rw-r--r--resources/libraries/python/honeycomb/HoneycombSetup.py42
-rw-r--r--resources/libraries/robot/honeycomb/honeycomb.robot1
-rw-r--r--tests/vpp/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot3
-rw-r--r--tests/vpp/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot2
5 files changed, 17 insertions, 33 deletions
diff --git a/resources/libraries/python/HTTPRequest.py b/resources/libraries/python/HTTPRequest.py
index 869078bca3..c4e73c25f2 100644
--- a/resources/libraries/python/HTTPRequest.py
+++ b/resources/libraries/python/HTTPRequest.py
@@ -73,7 +73,7 @@ class HTTPRequestError(Exception):
self._msg = "{0}: {1}".format(self.__class__.__name__, msg)
self._details = details
if enable_logging:
- logger.error(self._msg)
+ logger.info(self._msg)
logger.debug(self._details)
def __repr__(self):
diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py
index b5e964dd6c..975a36c753 100644
--- a/resources/libraries/python/honeycomb/HoneycombSetup.py
+++ b/resources/libraries/python/honeycomb/HoneycombSetup.py
@@ -155,33 +155,22 @@ class HoneycombSetup(object):
ssh = SSH()
ssh.connect(node)
- ret_code, pid, _ = ssh.exec_command("pgrep honeycomb")
- if ret_code != 0:
- raise HoneycombError("No process named 'honeycomb' found.")
- pid = int(pid)
count = 0
start = time()
while time() - start < timeout and count < retries:
count += 1
- ret_code, _, _ = ssh.exec_command(
- " | ".join([
- "sudo tail -n 1000 /var/log/syslog",
- "grep {pid}".format(pid=pid),
- "grep 'Honeycomb started successfully!'"])
- )
- if ret_code != 0:
- logger.debug(
- "Attempt #{count} failed on log check.".format(
- count=count))
+
+ try:
+ status_code_version, _ = HcUtil.get_honeycomb_data(
+ node, "oper_vpp_version")
+ status_code_if_cfg, _ = HcUtil.get_honeycomb_data(
+ node, "config_vpp_interfaces")
+ status_code_if_oper, _ = HcUtil.get_honeycomb_data(
+ node, "oper_vpp_interfaces")
+ except HTTPRequestError:
sleep(interval)
continue
- status_code_version, _ = HcUtil.get_honeycomb_data(
- node, "oper_vpp_version")
- status_code_if_cfg, _ = HcUtil.get_honeycomb_data(
- node, "config_vpp_interfaces")
- status_code_if_oper, _ = HcUtil.get_honeycomb_data(
- node, "oper_vpp_interfaces")
if status_code_if_cfg == HTTPCodes.OK\
and status_code_if_cfg == HTTPCodes.OK\
and status_code_if_oper == HTTPCodes.OK:
@@ -200,16 +189,10 @@ class HoneycombSetup(object):
sleep(interval)
continue
else:
- _, vpp_status, _ = ssh.exec_command("service vpp status")
- ret_code, hc_log, _ = ssh.exec_command(
- " | ".join([
- "sudo tail -n 1000 /var/log/syslog",
- "grep {pid}".format(pid=pid)]))
+ _, vpp_status, _ = ssh.exec_command("sudo service vpp status")
raise HoneycombError(
"Timeout or max retries exceeded. Status of VPP:\n"
- "{vpp_status}\n"
- "Syslog entries filtered by Honeycomb's pid:\n"
- "{hc_log}".format(vpp_status=vpp_status, hc_log=hc_log))
+ "{vpp_status}".format(vpp_status=vpp_status))
@staticmethod
def check_honeycomb_shutdown_state(node):
@@ -677,8 +660,7 @@ class HoneycombStartupConfig(object):
def __init__(self):
"""Initializer."""
- self.template = """
- #!/bin/sh -
+ self.template = """#!/bin/sh -
STATUS=100
while [ $STATUS -eq 100 ]
diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index a2be0c7e8d..fa5cea7978 100644
--- a/resources/libraries/robot/honeycomb/honeycomb.robot
+++ b/resources/libraries/robot/honeycomb/honeycomb.robot
@@ -188,6 +188,7 @@
| | Configure Log Level | ${node} | TRACE
| | Configure Persistence | ${node} | disable
| | Configure jVPP timeout | ${node} | ${10}
+| | Generate Honeycomb startup configuration for ODL test | ${node}
| | Clear Persisted Honeycomb Configuration | ${node}
| | Configure Honeycomb service on DUTs | ${node}
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot
index a08aecc050..2126f91a8e 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot
@@ -51,8 +51,7 @@
| ...
| Documentation | *Honeycomb access control lists test suite for ACL plugin.*
| ...
-# Failing due to HC2VPP-173: cannot clean up ACLs in test teardown
-| Force Tags | HC_FUNC | EXPECTED_FAILING
+| Force Tags | HC_FUNC
*** Test Cases ***
| TC01: ACL MAC filtering through plugin-acl node - bridged
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot
index 404ba888a3..1c96d76c1a 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot
@@ -165,6 +165,8 @@
| | ... | destination. Make sure no packet is received on the second TG\
| | ... | interface.
| | ...
+# VPP-930: ip6_fib_dump shows incorrect outgoing interface index
+| | [Tags] | EXPECTED_FAILING
| | ${table}= | Set Variable | table6
| | Given Setup interfaces and neighbors for IPv6 routing test
| | When Honeycomb configures routing table