aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSharada Shiddibhavi <sharada.shiddibhavi@intel.com>2017-09-22 12:10:33 +0000
committerSharada Shiddibhavi <sharada.shiddibhavi@intel.com>2017-09-23 02:43:31 +0000
commitaef5beb4f39240697a61b4bc5227ea6038204011 (patch)
treeaabc3ed57df5935dfb7f67ec10dd6c12e7a1d680
parenteaba18b849439e2764c384cfd22145b851a413ee (diff)
Adding improvements to Barometer testcases
This patch conatins changes to path of files mce-inject_ea and csv.conf Change-Id: Ifbe4eb6f875753b58f5ee4ecc12baa014e15b03a Signed-off-by: Sharada Shiddibhavi <sharada.shiddibhavi@intel.com>
-rw-r--r--baro_tests/collectd.py6
-rw-r--r--baro_tests/config_server.py35
2 files changed, 31 insertions, 10 deletions
diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py
index 6ddb921..1b5a923 100644
--- a/baro_tests/collectd.py
+++ b/baro_tests/collectd.py
@@ -33,7 +33,6 @@ APEX_IP = os.getenv("INSTALLER_IP").rstrip('\n')
APEX_USER = 'root'
APEX_USER_STACK = 'stack'
APEX_PKEY = '/root/.ssh/id_rsa'
-PATH = os.path.dirname(os.path.realpath(__file__))
class KeystoneException(Exception):
@@ -624,6 +623,7 @@ def mcelog_install():
APEX_USER_STACK,
APEX_PKEY)
nodes = handler.get_nodes()
+ mce_bin = os.path.dirname(os.path.realpath(__file__)) + '/mce-inject_ea'
for node in nodes:
if node.is_compute():
centos_release = node.run_cmd('uname -r')
@@ -648,9 +648,7 @@ def mcelog_install():
logger.info(
'Mcelog will be enabled on node-{}...'.format(
node.get_dict()['id']))
- node.put_file(
- 'PATH/'
- + 'mce-inject_ea', 'mce-inject_ea')
+ node.put_file(mce_bin, 'mce-inject_ea')
node.run_cmd('chmod a+x mce-inject_ea')
node.run_cmd('echo "CPU 0 BANK 0" > corrected')
node.run_cmd(
diff --git a/baro_tests/config_server.py b/baro_tests/config_server.py
index 6506091..a5c8c70 100644
--- a/baro_tests/config_server.py
+++ b/baro_tests/config_server.py
@@ -31,7 +31,6 @@ APEX_IP = os.getenv("INSTALLER_IP").rstrip('\n')
APEX_USER = 'root'
APEX_USER_STACK = 'stack'
APEX_PKEY = '/root/.ssh/id_rsa'
-PATH = os.path.dirname(os.path.realpath(__file__))
class Node(object):
@@ -184,6 +183,8 @@ class ConfigServer(object):
if compute_name == node.get_dict()['name']:
stdout = node.run_cmd(
'cat /etc/collectd/collectd.conf.d/{}.conf'.format(plugin))
+ if stdout is None:
+ return default_interval
for line in stdout.split('\n'):
if 'Interval' in line:
return 1
@@ -205,6 +206,8 @@ class ConfigServer(object):
if compute_name == node.get_dict()['name']:
stdout = node.run_cmd(
'cat /etc/collectd/collectd.conf.d/{}.conf' .format(plugin))
+ if stdout is None:
+ return default_values
for line in stdout.split('\n'):
if 'Interfaces' in line:
return line.split(' ', 1)[1]
@@ -302,7 +305,7 @@ class ConfigServer(object):
for node in nodes:
if compute_name == node.get_dict()['name']:
stdout = node.run_cmd(
- 'yum list installed | grep mcelog')
+ 'rpm -qa | grep mcelog')
if stdout is None:
return 0
elif 'mcelog' in stdout:
@@ -339,7 +342,7 @@ class ConfigServer(object):
aodh_conf = node.run_cmd('ls /etc/collectd/collectd.conf.d')
if 'aodh.conf' not in aodh_conf:
self.__logger.info(
- "AODH Plugin not included in compute node")
+ "AODH Plugin not included in {}".format(compute_name))
return False
else:
self.__logger.info(
@@ -364,7 +367,9 @@ class ConfigServer(object):
if compute_name == node.get_dict()['name']:
gnocchi_conf = node.run_cmd('ls /etc/collectd/collectd.conf.d')
if 'collectd-ceilometer-plugin.conf' not in gnocchi_conf:
- self.__logger.info("Gnocchi Plugin not included")
+ self.__logger.info(
+ "Gnocchi Plugin not included in node {}".format(
+ compute_name))
return False
else:
self.__logger.info(
@@ -401,13 +406,13 @@ class ConfigServer(object):
Return boolean value indicating whether function was successful.
"""
+ csv_file = os.path.dirname(os.path.realpath(__file__)) + '/csv.conf'
plugins = sorted(plugins)
compute_name = compute.get_name()
nodes = get_apex_nodes()
for node in nodes:
if compute_name == node.get_dict()['name']:
- node.put_file(
- 'PATH/csv.conf', 'csv.conf')
+ node.put_file(csv_file, 'csv.conf')
node.run_cmd(
'sudo cp csv.conf '
+ '/etc/collectd/collectd.conf.d/csv.conf')
@@ -473,12 +478,18 @@ class ConfigServer(object):
"source overcloudrc.v3;"
+ "aodh alarm list | grep {0} | grep {1}"
.format(criteria_list, compute))
+ if stdout is None:
+ self.__logger.info("aodh alarm list was empty")
+ return False
for line in stdout.splitlines():
line = line.replace('|', "")
metric_id = line.split()[0]
stdout = node.run_cmd(
'source overcloudrc.v3; aodh alarm show {}' .format(
metric_id))
+ if stdout is None:
+ self.__logger.info("aodh alarm list was empty")
+ return False
for line in stdout.splitlines()[3: -1]:
line = line.replace('|', "")
if line.split()[0] == 'timestamp':
@@ -489,6 +500,9 @@ class ConfigServer(object):
stdout = node.run_cmd(
"source overcloudrc.v3; aodh alarm show {}" .format(
metric_id))
+ if stdout is None:
+ self.__logger.info("aodh alarm list was empty")
+ return False
for line in stdout.splitlines()[3:-1]:
line = line.replace('|', "")
if line.split()[0] == 'timestamp':
@@ -522,12 +536,18 @@ class ConfigServer(object):
"source overcloudrc.v3;"
+ "gnocchi metric list | grep {0} | grep {1}"
.format(criteria_list, compute))
+ if stdout is None:
+ self.__logger.info("gnocchi list was empty")
+ return False
for line in stdout.splitlines():
line = line.replace('|', "")
metric_id = line.split()[0]
stdout = node.run_cmd(
'source overcloudrc.v3;gnocchi measures show {}'.format(
metric_id))
+ if stdout is None:
+ self.__logger.info("gnocchi list was empty")
+ return False
for line in stdout.splitlines()[3: -1]:
if line[0] == '+':
pass
@@ -538,6 +558,9 @@ class ConfigServer(object):
stdout = node.run_cmd(
"source overcloudrc.v3;gnocchi measures show {}".format(
metric_id))
+ if stdout is None:
+ self.__logger.info("gnocchi measures was empty")
+ return False
for line in stdout.splitlines()[3:-1]:
if line[0] == '+':
pass