openstack/nova
Code Issues Proposed changes

Merge "Handle multiple samples per versioned notification"

Browse Source
This commit is contained in:
Jenkins 2016-06-23 11:53:19 +00:00 committed by Gerrit Code Review
commit 7cfe2f37ae
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/ext/versioned_notifications.py
View File

@ -51,9 +51,10 @@ class VersionedNotificationDirective(Directive):
payload_name = cls.fields['payload'].objname
payload_cls = ovos[payload_name][0]
notifications.append((full_name(cls), full_name(payload_cls),
cls.sample))
for sample in cls.samples:
notifications.append((full_name(cls),
full_name(payload_cls),
sample))
return notifications
def _build_markup(self, notifications):

5
nova/notifications/objects/base.py
View File

@ -149,6 +149,9 @@ def notification_sample(sample):
root.
"""
def wrap(cls):
cls.sample = sample
if not getattr(cls, 'samples', None):
cls.samples = [sample]
else:
cls.samples.append(sample)
return cls
return wrap

7
nova/tests/unit/notifications/objects/test_notification.py
View File

@ -64,6 +64,8 @@ class TestNotificationBase(test.NoDBTestCase):
'extra_field': fields.StringField(), # filled by ctor
}
@notification.notification_sample('test-update-1.json')
@notification.notification_sample('test-update-2.json')
@base.NovaObjectRegistry.register_if(False)
class TestNotification(notification.NotificationBase):
VERSION = '1.0'
@ -246,6 +248,11 @@ class TestNotificationBase(test.NoDBTestCase):
'nova_object.version': '1.0',
'nova_object.namespace': 'nova'})
def test_sample_decorator(self):
self.assertEqual(2, len(self.TestNotification.samples))
self.assertIn('test-update-1.json', self.TestNotification.samples)
self.assertIn('test-update-2.json', self.TestNotification.samples)
notification_object_data = {
'EventType': '1.1-8291570eed00192197c7fa02ac677cd4',