diff options
| author |   Aaron Smith <aasmith@redhat.com> | 2018-03-23 13:00:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-23 13:00:59 +0000 |
| commit | 5a4019bc766c2f56c1299a740a270d30dd675c90 (patch) | |
| tree | 938a1ddeb235e6a414fa76b0af6b92426e46e303 | |
| parent | b2aa376956bb89f0c7ad77cba7474019117ba96d (diff) | |
| parent | 716df079c93e827677d701a987e06a8177247c8c (diff) | |
Merge "[functest] Skip RDT tests if on a virtual node"
| -rw-r--r-- | baro_tests/collectd.py | 19 | ||||
| -rw-r--r-- | baro_tests/config_server.py | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py index 188afab1..3d78762c 100644 --- a/baro_tests/collectd.py +++ b/baro_tests/collectd.py @@ -468,9 +468,6 @@ def _exec_testcase( bridge for bridge in ovs_interfaces if bridge in ovs_configured_bridges] plugin_prerequisites = { - 'intel_rdt': [( - conf.is_rdt_available(compute_node), - 'RDT not avaialble on VMs')], 'mcelog': [( conf.is_mcelog_installed(compute_node, 'mcelog'), 'mcelog must be installed.')], @@ -563,6 +560,18 @@ def _exec_testcase( + 'following prerequisites failed:') for prerequisite in failed_prerequisites: logger.error(' * {}'.format(prerequisite)) + # optional plugin + elif "intel_rdt" == name and not conf.is_rdt_available(compute_node): + #TODO: print log message + logger.info("RDT is not available on virtual nodes, skipping test.") + res = True + print("Results for {}, pre-processing".format(str(test_labels[name]))) + print(results) + _process_result( + compute_node.get_id(), out_plugin, test_labels[name], + res, results, compute_node.get_name()) + print("Results for {}, post-processing".format(str(test_labels[name]))) + print(results) else: plugin_interval = conf.get_plugin_interval(compute_node, name) if out_plugin == 'Gnocchi': @@ -591,9 +600,13 @@ def _exec_testcase( 'Test works, but will be reported as failure,' + 'because of non-critical errors.') res = False + print("Results for {}, pre-processing".format(str(test_labels[name]))) + print(results) _process_result( compute_node.get_id(), out_plugin, test_labels[name], res, results, compute_node.get_name()) + print("Results for {}, post-processing".format(str(test_labels[name]))) + print(results) def get_results_for_ovs_events( diff --git a/baro_tests/config_server.py b/baro_tests/config_server.py index 4eb3ac9c..fd31c523 100644 --- a/baro_tests/config_server.py +++ b/baro_tests/config_server.py @@ -613,7 +613,7 @@ class ConfigServer(object): self, compute, plugin_interval, logger, plugin, snmp_mib_files=[], snmp_mib_strings=[], snmp_in_commands=[]): - if plugin == 'hugepages' or 'intel_rdt' or 'mcelog': + if plugin in ('hugepages', 'intel_rdt', 'mcelog'): nodes = get_apex_nodes() for node in nodes: if compute == node.get_dict()['name']: |