From ca517abf077092a58e6029d7eac5cbf51c4ebb96 Mon Sep 17 00:00:00 2001 From: Rob Date: Wed, 7 Oct 2015 13:54:00 +1100 Subject: [PATCH 1/2] Set default of dimensions parameter to be empty dict --- cloud/amazon/ec2_metric_alarm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud/amazon/ec2_metric_alarm.py b/cloud/amazon/ec2_metric_alarm.py index b9ac1524794..dcd71831027 100644 --- a/cloud/amazon/ec2_metric_alarm.py +++ b/cloud/amazon/ec2_metric_alarm.py @@ -184,7 +184,7 @@ def create_metric_alarm(connection, module): comparisons = {'<=' : 'LessThanOrEqualToThreshold', '<' : 'LessThanThreshold', '>=' : 'GreaterThanOrEqualToThreshold', '>' : 'GreaterThanThreshold'} alarm.comparison = comparisons[comparison] - dim1 = module.params.get('dimensions', {}) + dim1 = module.params.get('dimensions') dim2 = alarm.dimensions for keys in dim1: @@ -255,7 +255,7 @@ def main(): unit=dict(type='str', choices=['Seconds', 'Microseconds', 'Milliseconds', 'Bytes', 'Kilobytes', 'Megabytes', 'Gigabytes', 'Terabytes', 'Bits', 'Kilobits', 'Megabits', 'Gigabits', 'Terabits', 'Percent', 'Count', 'Bytes/Second', 'Kilobytes/Second', 'Megabytes/Second', 'Gigabytes/Second', 'Terabytes/Second', 'Bits/Second', 'Kilobits/Second', 'Megabits/Second', 'Gigabits/Second', 'Terabits/Second', 'Count/Second', 'None']), evaluation_periods=dict(type='int'), description=dict(type='str'), - dimensions=dict(type='dict'), + dimensions=dict(type='dict', default={}), alarm_actions=dict(type='list'), insufficient_data_actions=dict(type='list'), ok_actions=dict(type='list'), From 5a6599d70d07db17e2e21713288fab76d9e3a080 Mon Sep 17 00:00:00 2001 From: Rob Date: Thu, 8 Oct 2015 14:03:40 +1100 Subject: [PATCH 2/2] Move import statements for easier debugging (correct line numbers) --- cloud/amazon/ec2_metric_alarm.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cloud/amazon/ec2_metric_alarm.py b/cloud/amazon/ec2_metric_alarm.py index dcd71831027..44e61b84f14 100644 --- a/cloud/amazon/ec2_metric_alarm.py +++ b/cloud/amazon/ec2_metric_alarm.py @@ -115,9 +115,6 @@ EXAMPLES = ''' import sys -from ansible.module_utils.basic import * -from ansible.module_utils.ec2 import * - try: import boto.ec2.cloudwatch from boto.ec2.cloudwatch import CloudWatchConnection, MetricAlarm @@ -282,4 +279,8 @@ def main(): elif state == 'absent': delete_metric_alarm(connection, module) + +from ansible.module_utils.basic import * +from ansible.module_utils.ec2 import * + main()