Merge "Fix that required tests are skipped"

diff --combined baro_tests/collectd.py
index 5135049,a476e48..4148c27
--- 1/baro_tests/collectd.py
--- 2/baro_tests/collectd.py
+++ b/baro_tests/collectd.py
@@@ -23,7 -23,6 +23,7 @@@ import tim
  import logging
  import config_server
  import tests
 +import local_agent
  from distutils import version
  from opnfv.deployment import factory
  
@@@ -794,15 -793,15 +794,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")
@@@ -867,19 -866,14 +867,19 @@@
      print_overall_summary(
          compute_ids, plugin_labels, aodh_plugin_labels, results, out_plugins)
  
 +    res_overall = 0
      for res in results:
          if not res[3]:
              logger.error('Some tests have failed or have not been executed')
              logger.error('Overall Result is Fail')
 -            return 1
 +            res_overall = 1
          else:
              pass
 -    return 0
 +
 +    _print_label('Testing LocalAgent on compute nodes')
 +    res_agent = local_agent.local_agent_main(logger, conf, computes)
 +
 +    return 0 if res_overall == 0 and res_agent == 0 else 1
  
  
  if __name__ == '__main__':