Merge "Follow-up review comments"

neutron_lib/callbacks/manager.py

@@ -121,13 +121,11 @@ class CallbacksManager(object):
         the payload object is not an instance of BaseEvent. CallbackFailure
         is raise if the underlying callback has errors.
         """
-        kwargs = {}
         if payload:
             if not isinstance(payload, events.EventPayload):
                 raise exceptions.Invalid(element='event payload',
                                          value=type(payload))
-            kwargs['payload'] = payload
-        return self.notify(resource, event, trigger, **kwargs)
+        return self.notify(resource, event, trigger, payload=payload)
 
     # NOTE(boden): We plan to deprecate the usage of this method and **kwargs
     # as the payload in Queens, but no warning here to avoid log flooding

neutron_lib/tests/unit/callbacks/test_events.py

@@ -38,7 +38,7 @@ class EventPayloadTestCase(base.BaseTestCase):
         e = events.EventPayload(mock.ANY, states=['s1', 's2'])
         self.assertEqual(['s1', 's2'], e.states)
         e.states.append('state')
-        self.assertTrue('state' in e.states)
+        self.assertIn('state', e.states)
 
     def test_resource_id(self):
         e = events.EventPayload(mock.ANY, resource_id='id1')

releasenotes/notes/expose-and-enhance-callback-api-714cce65a3c44fe7.yaml

@@ -6,7 +6,7 @@ features:
     standardized way.
   - A test fixture is provided for isolating the global callback manager in
     ``neutron_lib.callbacks.registry``. For more details see the comments in
-    ``neutron_lib.tests.unti.callbacks.base``.
+    ``neutron_lib.fixture.CallbackRegistryFixture``.
 deprecations:
   - The use of ``neutron_lib.callbacks.registry.notify()`` and
     ``neutron_lib.callbacks.manager.CallbacksManager.notify()`` is deprecated in