aboutsummaryrefslogtreecommitdiffstats
path: root/baro_tests
diff options
context:
space:
mode:
authorEmma Foley <emma.l.foley@intel.com>2018-03-20 14:33:13 +0000
committerEmma Foley <emma.l.foley@intel.com>2018-03-20 14:38:42 +0000
commit884197104f9d1b420eeb85c8ea18b4538daf3418 (patch)
tree8a99a1a6bb2fed0320146037655bb0520780664d /baro_tests
parentf6e7b3b48f49a607da05663d7963945849e04002 (diff)
[functest] Update tests for Aodh
* Update the check for timestamp to use state_timestamp instead state_timestamp indicates the last change in state of the alarm, timestamp is the last update to the alarm settings. This is not what we're looking for with aodh tests, so check the state update instead. * Trigger an alarm state change before checking whether the alram was updated. Notification in collectd aren't necessarily updated at a regular interval, so we have to do some action and check whether the alarm is updated. JIRA: BAROMETER-91 Change-Id: I26d9bb1ec7e50e07053e69068d241e4c4cbc30dc Signed-off-by: Emma Foley <emma.l.foley@intel.com>
Diffstat (limited to 'baro_tests')
-rw-r--r--baro_tests/config_server.py21
1 files changed, 15 insertions, 6 deletions
diff --git a/baro_tests/config_server.py b/baro_tests/config_server.py
index 2a4bc16..4eb3ac9 100644
--- a/baro_tests/config_server.py
+++ b/baro_tests/config_server.py
@@ -479,6 +479,16 @@ class ConfigServer(object):
return False, warning
return True, warning
+ def trigger_alarm_update(self, alarm, compute_node):
+ # TODO: move these actions to main, with criteria lists so that we can reference that
+ # i.e. test_plugin_with_aodh(self, compute, plugin.., logger, criteria_list, alarm_action)
+ if alarm == 'mcelog':
+ compute_node.run_cmd('sudo modprobe mce-inject')
+ compute_node.run_cmd('sudo ./mce-inject_ea < corrected')
+ if alarm == 'ovs_events':
+ compute_node.run_cmd('sudo ifconfig -a | grep br0')
+ compute_node.run_cmd('sudo ifconfig br0 down; sudo ifconfig br0 up')
+
def test_plugins_with_aodh(
self, compute, plugin_interval, logger,
criteria_list=[]):
@@ -487,11 +497,13 @@ class ConfigServer(object):
timestamps1 = {}
timestamps2 = {}
nodes = get_apex_nodes()
+ compute_node = [node for node in nodes if node.get_dict()['name'] == compute][0]
for node in nodes:
if node.is_controller():
self.__logger.info('Getting AODH Alarm list on {}' .format(
(node.get_dict()['name'])))
node.put_file(constants.ENV_FILE, 'overcloudrc.v3')
+ self.trigger_alarm_update(criteria_list, compute_node)
stdout = node.run_cmd(
"source overcloudrc.v3;"
+ "aodh alarm list | grep {0} | grep {1}"
@@ -510,10 +522,9 @@ class ConfigServer(object):
return False
for line in stdout.splitlines()[3: -1]:
line = line.replace('|', "")
- if line.split()[0] == 'timestamp':
+ if line.split()[0] == 'state_timestamp':
timestamps1 = line.split()[1]
- else:
- pass
+ self.trigger_alarm_update(criteria_list, compute_node)
time.sleep(12)
stdout = node.run_cmd(
"source overcloudrc.v3; aodh alarm show {}" .format(
@@ -523,10 +534,8 @@ class ConfigServer(object):
return False
for line in stdout.splitlines()[3:-1]:
line = line.replace('|', "")
- if line.split()[0] == 'timestamp':
+ if line.split()[0] == 'state_timestamp':
timestamps2 = line.split()[1]
- else:
- pass
if timestamps1 == timestamps2:
self.__logger.info(
"Data not updated after interval of 12 seconds")