summaryrefslogtreecommitdiffstats
path: root/baro_tests/config_server.py
diff options
context:
space:
mode:
authorSharada Shiddibhavi <sharada.shiddibhavi@intel.com>2017-10-09 08:39:04 +0000
committerSharada Shiddibhavi <sharada.shiddibhavi@intel.com>2017-10-09 20:59:02 +0000
commitb2d7223c64cedd845291b2123e1ae520709a28ac (patch)
treebb0b206f223a3d804119f20cee0b8fc25a713dfa /baro_tests/config_server.py
parent5cd59c78f1adf78014b37b59332715018e1e6219 (diff)
Removing SNMP testcases from Barometer testsuite
The SNMP testcases has been removed from the Barometer testsuite. Change-Id: Ie51df5bdc20a83f8e08aa3ccc2126cf43b0fc1d9 Signed-off-by: Sharada Shiddibhavi <sharada.shiddibhavi@intel.com>
Diffstat (limited to 'baro_tests/config_server.py')
-rw-r--r--baro_tests/config_server.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/baro_tests/config_server.py b/baro_tests/config_server.py
index a5c8c701..8b597cc5 100644
--- 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")
- if 'gnocchi' in stdout:
+ if stdout is None:
+ return False
+ elif 'gnocchi' in stdout:
gnocchi_present = True
+ return gnocchi_present
+ else:
+ return False
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")
- if 'aodh' in stdout:
+ if stdout is None:
+ return False
+ elif 'aodh' in stdout:
aodh_present = True
+ return aodh_present
+ else:
+ return False
return aodh_present
def is_mcelog_installed(self, compute, package):