Code Review
/
barometer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[ansible][fedora] Update package name
[barometer.git]
/
baro_tests
/
collectd.py
diff --git
a/baro_tests/collectd.py
b/baro_tests/collectd.py
index
2723d32
..
c1a05af
100644
(file)
--- a/
baro_tests/collectd.py
+++ b/
baro_tests/collectd.py
@@
-1,5
+1,7
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
-
+#
+# Copyright 2017 OPNFV
+#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
@@
-23,6
+25,7
@@
import time
import logging
import config_server
import tests
import logging
import config_server
import tests
+import dma
from distutils import version
from opnfv.deployment import factory
from distutils import version
from opnfv.deployment import factory
@@
-793,15
+796,15
@@
def main(bt_logger=None):
compute_node_names.append(node_name)
plugins_to_enable = []
error_plugins = []
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))
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))
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")
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")
out_plugins[node_id].append("AODH")
if snmp_running:
out_plugins[node_id].append("SNMP")
@@
-866,14
+869,19
@@
def main(bt_logger=None):
print_overall_summary(
compute_ids, plugin_labels, aodh_plugin_labels, results, out_plugins)
print_overall_summary(
compute_ids, plugin_labels, aodh_plugin_labels, results, out_plugins)
+ res_overall = 0
for res in results:
for res in results:
- if
res[3] is 'False' or 'None'
:
+ if
not res[3]
:
logger.error('Some tests have failed or have not been executed')
logger.error('Overall Result is Fail')
logger.error('Some tests have failed or have not been executed')
logger.error('Overall Result is Fail')
- re
turn
1
+ re
s_overall =
1
else:
pass
else:
pass
- return 0
+
+ _print_label('Testing DMA on compute nodes')
+ res_agent = dma.dma_main(logger, conf, computes)
+
+ return 0 if res_overall == 0 and res_agent == 0 else 1
if __name__ == '__main__':
if __name__ == '__main__':