From: Toshiaki Takahashi <takahashi.tsc@ncos.nec.co.jp>
Date: Wed, 22 Aug 2018 08:47:30 +0000 (+0000)
Subject: Fix that required tests are skipped
X-Git-Tag: opnfv-7.1.0~18^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f3207cb719217231e5e212d2e84b0e7db97e97bf;p=barometer.git

Fix that required tests are skipped

Because the service running flags of Gnocchi and Aodh
are overwritten in the loop of the compute node, once the flag
become false, the tests on all subsequent nodes are skipped.
This change makes to use new flags for each compute node.

Change-Id: Idc807419151b34b29f0117c9a7708a16a20d70dd
Signed-off-by: Toshiaki Takahashi <takahashi.tsc@ncos.nec.co.jp>
---

diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py
index 922403f1..a476e483 100644
--- a/baro_tests/collectd.py
+++ b/baro_tests/collectd.py
@@ -793,15 +793,15 @@ def main(bt_logger=None):
         compute_node_names.append(node_name)
         plugins_to_enable = []
         error_plugins = []
-        gnocchi_running = (
+        gnocchi_running_com = (
             gnocchi_running and conf.check_gnocchi_plugin_included(
                 compute_node))
-        aodh_running = (
+        aodh_running_com = (
             aodh_running and conf.check_aodh_plugin_included(compute_node))
         # logger.info("SNMP enabled on {}" .format(node_name))
-        if gnocchi_running:
+        if gnocchi_running_com:
             out_plugins[node_id].append("Gnocchi")
-        if aodh_running:
+        if aodh_running_com:
             out_plugins[node_id].append("AODH")
         if snmp_running:
             out_plugins[node_id].append("SNMP")