x/monasca-vagrant
Code Issues Proposed changes

Enhance smoke test

Browse Source 
Add information about whether metrics were received when an alarm
is not created

Fix some pep8 errors

Change-Id: I2220f58a3c6a75c0fe65d0ac20124073a95febf5
This commit is contained in:
Craig Bryant 2014-10-14 11:21:07 -06:00
parent fbe0e6f396
commit 572cb2ada8
5 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/alarm_crud.py
View File

@ -155,4 +155,4 @@ def main():
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main()) sys.exit(main())

14
tests/cli_wrapper.py
View File

@ -24,7 +24,8 @@ def find_alarm_definition_by_name(name):
def delete_alarm_definition_if_exists(name): def delete_alarm_definition_if_exists(name):
alarm_json = find_alarm_definition_by_name(name) alarm_json = find_alarm_definition_by_name(name)
if alarm_json: if alarm_json:
run_mon_cli(['alarm-definition-delete', alarm_json['id']], useJson=False) run_mon_cli(['alarm-definition-delete', alarm_json['id']],
useJson=False)
def delete_notification_if_exists(notification_name): def delete_notification_if_exists(notification_name):
@ -74,12 +75,13 @@ def change_alarm_state(alarm_id, new_state):
def find_alarms_for_definition(alarm_definition_id): def find_alarms_for_definition(alarm_definition_id):
result_json = run_mon_cli(['alarm-list', "--alarm-definition", alarm_definition_id]) result_json = run_mon_cli(['alarm-list', "--alarm-definition",
alarm_definition_id])
return [alarm['id'] for alarm in result_json] return [alarm['id'] for alarm in result_json]
def create_alarm_definition(name, expression, description=None, ok_notif_id=None, def create_alarm_definition(name, expression, description=None,
alarm_notif_id=None, ok_notif_id=None, alarm_notif_id=None,
undetermined_notif_id=None): undetermined_notif_id=None):
args = ['alarm-definition-create'] args = ['alarm-definition-create']
add_argument_if_given(args, '--description', description) add_argument_if_given(args, '--description', description)

3
tests/notification_crud.py
View File

@ -96,7 +96,8 @@ def main():
mon_client = utils.create_mon_client() mon_client = utils.create_mon_client()
try: try:
# Create 3 notifications with different emails, root, kafka, monasca-agent # Create 3 notifications with different emails, root, kafka,
# and monasca-agent
email1 = "root" email1 = "root"
email2 = "kafka" email2 = "kafka"
email3 = "monasca-agent" email3 = "monasca-agent"

52
tests/smoke.py
View File

@ -42,8 +42,9 @@ import utils
import datetime import datetime
import psutil import psutil
process_list = ('monasca-persister', 'monasca-notification', 'kafka', 'zookeeper.jar', process_list = ('monasca-persister', 'monasca-notification', 'kafka',
'monasca-api', 'influxdb', 'apache-storm', 'mysqld') 'zookeeper.jar', 'monasca-api', 'influxdb', 'apache-storm',
'mysqld')
def get_metrics(name, dimensions, since): def get_metrics(name, dimensions, since):
@ -83,7 +84,7 @@ def check_notifications(alarm_id, state_changes):
file=sys.stderr) file=sys.stderr)
return False return False
notifications = utils.find_notifications(alarm_id,"root") notifications = utils.find_notifications(alarm_id, "root")
if len(notifications) != len(state_changes): if len(notifications) != len(state_changes):
print('Expected %d notifications but only found %d' % print('Expected %d notifications but only found %d' %
(len(state_changes), len(notifications)), file=sys.stderr) (len(state_changes), len(notifications)), file=sys.stderr)
@ -118,11 +119,12 @@ def ensure_at_least(actual, desired):
time.sleep(desired - actual) time.sleep(desired - actual)
def wait_for_alarm_creation(alarm_definition_id): def wait_for_alarm_creation(alarm_def_id):
print('Waiting for alarm to be created for Alarm Definition %s' % alarm_definition_id) print('Waiting for alarm to be created for Alarm Definition %s' %
alarm_def_id)
for x in range(0, 30): for x in range(0, 30):
time.sleep(1) time.sleep(1)
alarms = cli_wrapper.find_alarms_for_definition(alarm_definition_id) alarms = cli_wrapper.find_alarms_for_definition(alarm_def_id)
if len(alarms) == 1: if len(alarms) == 1:
print('Alarm was created in %d seconds' % x) print('Alarm was created in %d seconds' % x)
return alarms[0] return alarms[0]
@ -130,8 +132,8 @@ def wait_for_alarm_creation(alarm_definition_id):
print('%d Alarms were created. Only expected 1' % len(alarms), print('%d Alarms were created. Only expected 1' % len(alarms),
file=sys.stderr) file=sys.stderr)
return None return None
print('Alarm was not created for Alarm Definition %s in %d seconds' % (alarm_definition_id, x), print('Alarm was not created for Alarm Definition %s in %d seconds' %
file=sys.stderr) (alarm_def_id, x), file=sys.stderr)
return None return None
@ -157,23 +159,34 @@ def smoke_test(mail_host, metric_host):
start_time = time.time() start_time = time.time()
# Create Notification through CLI # Create Notification through CLI
notification_id = cli_wrapper.create_notification(notification_name, notif_id = cli_wrapper.create_notification(notification_name,
notification_email_addr) notification_email_addr)
# Create Alarm through CLI # Create Alarm through CLI
expression = 'max(cpu.system_perc) > 0 and ' + \ expression = 'max(cpu.system_perc) > 0 and ' + \
'max(load.avg_1_min{hostname=' + metric_host + '}) > 0' 'max(load.avg_1_min{hostname=' + metric_host + '}) > 0'
description = 'System CPU Utilization exceeds 1% and ' + \ description = 'System CPU Utilization exceeds 1% and ' + \
'Load exceeds 3 per measurement period' 'Load exceeds 3 per measurement period'
alarm_definition_id = cli_wrapper.create_alarm_definition(alarm_definition_name, expression, alarm_def_id = cli_wrapper.create_alarm_definition(alarm_definition_name,
description=description, expression,
ok_notif_id=notification_id, description=description,
alarm_notif_id=notification_id, ok_notif_id=notif_id,
undetermined_notif_id=notification_id) alarm_notif_id=notif_id,
undetermined_notif_id=notif_id)
# Wait for an alarm to be created # Wait for an alarm to be created
alarm_id = wait_for_alarm_creation(alarm_definition_id) alarm_id = wait_for_alarm_creation(alarm_def_id)
if alarm_id is None: if alarm_id is None:
received_num_metrics = count_metrics(metric_name, metric_dimensions,
hour_ago_str)
if received_num_metrics == initial_num_metrics:
print('Did not receive any %s metrics while waiting' %
metric_name + str(dimensions),
file=sys.stderr)
else:
delta = received_num_metrics - initial_num_metrics
print('Received %d %s metrics while waiting' %
(delta, metric_name), file=sys.stderr)
return False return False
# Ensure it is created in the right state # Ensure it is created in the right state
@ -238,7 +251,7 @@ def find_processes():
are running before starting the smoke test """ are running before starting the smoke test """
process_missing = [] process_missing = []
for process in process_list: # process_list is a global defined at top of module for process in process_list: # global defined at top of module
process_found_flag = False process_found_flag = False
for item in psutil.process_iter(): for item in psutil.process_iter():
@ -259,7 +272,8 @@ def find_processes():
def main(): def main():
# May be able to delete this test because the find_process check should validate the notification engine present. # May be able to delete this test because the find_process check should
# validate the notification engine present.
if not utils.ensure_has_notification_engine(): if not utils.ensure_has_notification_engine():
return 1 return 1

4
tests/utils.py
View File

@ -83,9 +83,9 @@ def get_api_host():
def set_if_not_env(name, default): def set_if_not_env(name, default):
if name not in os.environ: if name not in os.environ:
os.environ[name] = default os.environ[name] = default
elif default != os.environ[name]: elif default != os.environ[name]:
print('%s already set to %s' % (name, os.environ[name])) print('%s already set to %s' % (name, os.environ[name]))
def setup_cli(): def setup_cli():