Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1422 from godfried/fix-cloudwatch-value

Browse Source 
Change name of 'state' attribute of 'FakeAlarm' CloudWatch model to '…
This commit is contained in:
Steve Pulec 2018-03-06 22:36:50 -05:00 committed by GitHub
commit de6ded5aab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moto/cloudwatch/models.py
View File

@ -74,18 +74,18 @@ class FakeAlarm(BaseModel):
self.state_reason = '' self.state_reason = ''
self.state_reason_data = '{}' self.state_reason_data = '{}'
self.state = 'OK' self.state_value = 'OK'
self.state_updated_timestamp = datetime.utcnow() self.state_updated_timestamp = datetime.utcnow()
def update_state(self, reason, reason_data, state_value): def update_state(self, reason, reason_data, state_value):
# History type, that then decides what the rest of the items are, can be one of ConfigurationUpdate | StateUpdate | Action # History type, that then decides what the rest of the items are, can be one of ConfigurationUpdate | StateUpdate | Action
self.history.append( self.history.append(
('StateUpdate', self.state_reason, self.state_reason_data, self.state, self.state_updated_timestamp) ('StateUpdate', self.state_reason, self.state_reason_data, self.state_value, self.state_updated_timestamp)
) )
self.state_reason = reason self.state_reason = reason
self.state_reason_data = reason_data self.state_reason_data = reason_data
self.state = state_value self.state_value = state_value
self.state_updated_timestamp = datetime.utcnow() self.state_updated_timestamp = datetime.utcnow()
@ -221,7 +221,7 @@ class CloudWatchBackend(BaseBackend):
] ]
def get_alarms_by_state_value(self, target_state): def get_alarms_by_state_value(self, target_state):
return filter(lambda alarm: alarm.state == target_state, self.alarms.values()) return filter(lambda alarm: alarm.state_value == target_state, self.alarms.values())
def delete_alarms(self, alarm_names): def delete_alarms(self, alarm_names):
for alarm_name in alarm_names: for alarm_name in alarm_names:

2
tests/test_cloudwatch/test_cloudwatch_boto3.py
View File

@ -127,12 +127,14 @@ def test_alarm_state():
) )
len(resp['MetricAlarms']).should.equal(1) len(resp['MetricAlarms']).should.equal(1)
resp['MetricAlarms'][0]['AlarmName'].should.equal('testalarm1') resp['MetricAlarms'][0]['AlarmName'].should.equal('testalarm1')
resp['MetricAlarms'][0]['StateValue'].should.equal('ALARM')
resp = client.describe_alarms( resp = client.describe_alarms(
StateValue='OK' StateValue='OK'
) )
len(resp['MetricAlarms']).should.equal(1) len(resp['MetricAlarms']).should.equal(1)
resp['MetricAlarms'][0]['AlarmName'].should.equal('testalarm2') resp['MetricAlarms'][0]['AlarmName'].should.equal('testalarm2')
resp['MetricAlarms'][0]['StateValue'].should.equal('OK')
# Just for sanity # Just for sanity
resp = client.describe_alarms() resp = client.describe_alarms()