Code Review
/
barometer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Removing SNMP testcases from Barometer testsuite
[barometer.git]
/
baro_tests
/
config_server.py
diff --git
a/baro_tests/config_server.py
b/baro_tests/config_server.py
index
a5c8c70
..
8b597cc
100644
(file)
--- a/
baro_tests/config_server.py
+++ b/
baro_tests/config_server.py
@@
-269,8
+269,13
@@
class ConfigServer(object):
stdout = node.run_cmd(
"source overcloudrc.v3;"
+ "openstack catalog list | grep gnocchi")
stdout = node.run_cmd(
"source overcloudrc.v3;"
+ "openstack catalog list | grep gnocchi")
- if 'gnocchi' in stdout:
+ if stdout is None:
+ return False
+ elif 'gnocchi' in stdout:
gnocchi_present = True
gnocchi_present = True
+ return gnocchi_present
+ else:
+ return False
return gnocchi_present
def is_aodh_running(self, controller):
return gnocchi_present
def is_aodh_running(self, controller):
@@
-287,8
+292,13
@@
class ConfigServer(object):
stdout = node.run_cmd(
"source overcloudrc.v3;"
+ "openstack catalog list | grep aodh")
stdout = node.run_cmd(
"source overcloudrc.v3;"
+ "openstack catalog list | grep aodh")
- if 'aodh' in stdout:
+ if stdout is None:
+ return False
+ elif 'aodh' in stdout:
aodh_present = True
aodh_present = True
+ return aodh_present
+ else:
+ return False
return aodh_present
def is_mcelog_installed(self, compute, package):
return aodh_present
def is_mcelog_installed(self, compute, package):