Updating smoke test to use new metric name from the agent

Change-Id: I3a893fe5f507b09ffe225fcb25474eeae625d1dc
This commit is contained in:
gary-hessler 2014-11-03 10:15:31 -07:00
parent 6ebb773e19
commit 39f9007882

View File

@ -141,7 +141,7 @@ def smoke_test(mail_host, metric_host):
notification_name = 'Monasca Smoke Test' notification_name = 'Monasca Smoke Test'
notification_email_addr = 'root@' + mail_host notification_email_addr = 'root@' + mail_host
alarm_definition_name = 'high cpu and load' alarm_definition_name = 'high cpu and load'
metric_name = 'cpu.load_avg_1_min' metric_name = 'load.avg_1_min'
metric_dimensions = {'hostname': metric_host} metric_dimensions = {'hostname': metric_host}
cleanup(notification_name, alarm_definition_name) cleanup(notification_name, alarm_definition_name)
@ -164,7 +164,7 @@ def smoke_test(mail_host, metric_host):
# Create Alarm through CLI # Create Alarm through CLI
expression = 'max(cpu.system_perc) > 0 and ' + \ expression = 'max(cpu.system_perc) > 0 and ' + \
'max(cpu.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_def_id = cli_wrapper.create_alarm_definition(alarm_definition_name, alarm_def_id = cli_wrapper.create_alarm_definition(alarm_definition_name,