summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baro_tests/collectd.py7
-rw-r--r--baro_tests/config_server.py7
2 files changed, 9 insertions, 5 deletions
diff --git a/baro_tests/collectd.py b/baro_tests/collectd.py
index 5c43bdf7..a002314e 100644
--- a/baro_tests/collectd.py
+++ b/baro_tests/collectd.py
@@ -503,7 +503,7 @@ def _exec_testcase(
'hugepages-mm-2048Kb', 'hugepages-node0-2048Kb',
'hugepages-node1-2048Kb', 'hugepages-mm-1048576Kb',
'hugepages-node0-1048576Kb', 'hugepages-node1-1048576Kb'],
- 'ipmi': ['ipmi'],
+ # 'ipmi': ['ipmi'],
'mcelog': [
'mcelog-SOCKET_0_CHANNEL_0_DIMM_any',
'mcelog-SOCKET_0_CHANNEL_any_DIMM_any'],
@@ -511,13 +511,14 @@ def _exec_testcase(
'ovs_stats-br0.br0'],
'ovs_events': [
'ovs_events-br0']}
- csv_meter_categories_ipmi = get_csv_categories_for_ipmi(conf, compute_node)
+ # csv_meter_categories_ipmi = get_csv_categories_for_ipmi(conf,
+ # compute_node)
csv_meter_categories = {
'intel_rdt': [
'bytes-llc', 'ipc', 'memory_bandwidth-local',
'memory_bandwidth-remote'],
'hugepages': ['vmpage_number-free', 'vmpage_number-used'],
- 'ipmi': csv_meter_categories_ipmi,
+ # 'ipmi': csv_meter_categories_ipmi,
'mcelog': [
'errors-corrected_memory_errors',
'errors-uncorrected_memory_errors',
diff --git a/baro_tests/config_server.py b/baro_tests/config_server.py
index d9c83ce8..f156fcf7 100644
--- a/baro_tests/config_server.py
+++ b/baro_tests/config_server.py
@@ -292,8 +292,11 @@ class ConfigServer(object):
for node in nodes:
if compute_name == node.get_dict()['name']:
stdout = node.run_cmd(
- 'yum list installed | grep {}'.format(package))
- return len(stdout) > 0
+ 'yum list installed | grep mcelog')
+ if 'mcelog' in stdout:
+ return 1
+ else:
+ return 0
def is_libpqos_on_node(self, compute):
"""Check whether libpqos is present on compute node"""