diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-29 19:35:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-29 19:35:06 +0000 |
| commit | ee496de4e8167c57c059e3f43c4d747023783c9c (patch) | |
| tree | 8f3fe1e8fde25f4c82103431b1b6698da1016447 | |
| parent | 8a94bba49f8af411d455dc89da2fe567ef603347 (diff) | |
| parent | e2d9f3c94b5d22a75eb5e05c1608795220fb9e68 (diff) | |
| download | trove-ee496de4e8167c57c059e3f43c4d747023783c9c.tar.gz | |
Merge "Fixed use of word separators in Notification"
| -rw-r--r-- | trove/extensions/mgmt/instances/models.py | 4 | ||||
| -rw-r--r-- | trove/tests/unittests/mgmt/test_models.py | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/trove/extensions/mgmt/instances/models.py b/trove/extensions/mgmt/instances/models.py index e0cf8cb3..0152c9de 100644 --- a/trove/extensions/mgmt/instances/models.py +++ b/trove/extensions/mgmt/instances/models.py @@ -179,8 +179,8 @@ class NotificationTransformer(object): return audit_start, audit_end def transform_instance(self, instance, audit_start, audit_end): - return {'audit-period-beginning': audit_start, - 'audit-period-ending': audit_end, + return {'audit_period_beginning': audit_start, + 'audit_period_ending': audit_end, 'created_at': instance.created, 'display_name': instance.name, 'instance_id': instance.id, diff --git a/trove/tests/unittests/mgmt/test_models.py b/trove/tests/unittests/mgmt/test_models.py index f0238ad7..6fcf96d3 100644 --- a/trove/tests/unittests/mgmt/test_models.py +++ b/trove/tests/unittests/mgmt/test_models.py @@ -76,8 +76,8 @@ class TestNotificationTransformer(MockMgmtInstanceTest): self.assertIsNotNone(payloads) self.assertThat(len(payloads), Equals(1)) payload = payloads[0] - self.assertThat(payload['audit-period-beginning'], Not(Is(None))) - self.assertThat(payload['audit-period-ending'], Not(Is(None))) + self.assertThat(payload['audit_period_beginning'], Not(Is(None))) + self.assertThat(payload['audit_period_ending'], Not(Is(None))) self.assertThat(payload['state'], Equals(status.lower())) @@ -132,8 +132,8 @@ class TestNovaNotificationTransformer(MockMgmtInstanceTest): self.assertIsNotNone(payloads) self.assertThat(len(payloads), Equals(1)) payload = payloads[0] - self.assertThat(payload['audit-period-beginning'], Not(Is(None))) - self.assertThat(payload['audit-period-ending'], Not(Is(None))) + self.assertThat(payload['audit_period_beginning'], Not(Is(None))) + self.assertThat(payload['audit_period_ending'], Not(Is(None))) self.assertThat(payload['state'], Equals(status.lower())) self.assertThat(payload['instance_type'], Equals('db.small')) self.assertThat(payload['instance_type_id'], Equals('flavor_1')) @@ -240,8 +240,8 @@ class TestNovaNotificationTransformer(MockMgmtInstanceTest): self.assertIsNotNone(payloads) self.assertThat(len(payloads), Equals(1)) payload = payloads[0] - self.assertThat(payload['audit-period-beginning'], Not(Is(None))) - self.assertThat(payload['audit-period-ending'], Not(Is(None))) + self.assertThat(payload['audit_period_beginning'], Not(Is(None))) + self.assertThat(payload['audit_period_ending'], Not(Is(None))) self.assertThat(payload['state'], Equals(status.lower())) self.assertThat(payload['instance_type'], Equals('db.small')) self.assertThat(payload['instance_type_id'], Equals('flavor_1')) |