Merge pull request #1313 from terrycain/fix_1311

CloudWatch: Added SetAlarmState and filter

tests/test_cloudwatch/test_cloudwatch.py

@@ -118,12 +118,3 @@ def test_describe_alarms():
 
     alarms = conn.describe_alarms()
     alarms.should.have.length_of(0)
-
-
-@mock_cloudwatch_deprecated
-def test_describe_state_value_unimplemented():
-    conn = boto.connect_cloudwatch()
-
-    conn.describe_alarms()
-    conn.describe_alarms.when.called_with(
-        state_value="foo").should.throw(NotImplementedError)

tests/test_cloudwatch/test_cloudwatch_boto3.py

@@ -87,6 +87,54 @@ def test_get_dashboard_fail():
         raise RuntimeError('Should of raised error')
 
 
+@mock_cloudwatch
+def test_alarm_state():
+    client = boto3.client('cloudwatch', region_name='eu-central-1')
+
+    client.put_metric_alarm(
+        AlarmName='testalarm1',
+        MetricName='cpu',
+        Namespace='blah',
+        Period=10,
+        EvaluationPeriods=5,
+        Statistic='Average',
+        Threshold=2,
+        ComparisonOperator='GreaterThanThreshold',
+    )
+    client.put_metric_alarm(
+        AlarmName='testalarm2',
+        MetricName='cpu',
+        Namespace='blah',
+        Period=10,
+        EvaluationPeriods=5,
+        Statistic='Average',
+        Threshold=2,
+        ComparisonOperator='GreaterThanThreshold',
+    )
+
+    # This is tested implicitly as if it doesnt work the rest will die
+    client.set_alarm_state(
+        AlarmName='testalarm1',
+        StateValue='ALARM',
+        StateReason='testreason',
+        StateReasonData='{"some": "json_data"}'
+    )
+
+    resp = client.describe_alarms(
+        StateValue='ALARM'
+    )
+    len(resp['MetricAlarms']).should.equal(1)
+    resp['MetricAlarms'][0]['AlarmName'].should.equal('testalarm1')
+
+    resp = client.describe_alarms(
+        StateValue='OK'
+    )
+    len(resp['MetricAlarms']).should.equal(1)
+    resp['MetricAlarms'][0]['AlarmName'].should.equal('testalarm2')
+
+    # Just for sanity
+    resp = client.describe_alarms()
+    len(resp['MetricAlarms']).should.equal(2)