openstack
/
neutron
Code Issues Proposed changes

Use registry decorator in ML2 plugin 

Use the new registry decorator for subscribing to callbacks in ML2 so
its easy to see when each function will be called.

TrivialFix

Change-Id: I75e41b5801ff9dc7ea7edebfa7affa92fdcc9bd4
This commit is contained in:
Kevin Benton 2017-02-27 05:17:06 -08:00
parent 92116a0cc9
commit bb3931a992
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
neutron/plugins/ml2/plugin.py
View File

@ -97,6 +97,7 @@ SERVICE_PLUGINS_REQUIRED_DRIVERS = {
}
@registry.has_registry_receivers
class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
dvr_mac_db.DVRDbMixin,
external_net_db.External_net_db_mixin,
@ -163,16 +164,6 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
self.type_manager.initialize()
self.extension_manager.initialize()
self.mechanism_manager.initialize()
registry.subscribe(self._port_provisioned, resources.PORT,
provisioning_blocks.PROVISIONING_COMPLETE)
registry.subscribe(self._handle_segment_change, resources.SEGMENT,
events.PRECOMMIT_CREATE)
registry.subscribe(self._handle_segment_change, resources.SEGMENT,
events.PRECOMMIT_DELETE)
registry.subscribe(self._handle_segment_change, resources.SEGMENT,
events.AFTER_CREATE)
registry.subscribe(self._handle_segment_change, resources.SEGMENT,
events.AFTER_DELETE)
self._setup_dhcp()
self._start_rpc_notifiers()
self.add_agent_status_check_worker(self.agent_health_check)
@ -210,6 +201,8 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
driver=extension_driver, service_plugin=service_plugin
)
@registry.receives(resources.PORT,
[provisioning_blocks.PROVISIONING_COMPLETE])
def _port_provisioned(self, rtype, event, trigger, context, object_id,
**kwargs):
port_id = object_id
@ -1859,6 +1852,10 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
return True
return False
@registry.receives(resources.SEGMENT, (events.PRECOMMIT_CREATE,
events.PRECOMMIT_DELETE,
events.AFTER_CREATE,
events.AFTER_DELETE))
def _handle_segment_change(self, rtype, event, trigger, context, segment):
if (event == events.PRECOMMIT_CREATE and
not isinstance(trigger, segments_plugin.Plugin)):