openstack
/
neutron
Code Issues Proposed changes

Merge "Big Switch: Remove unnecessary initialization code"

This commit is contained in:
Jenkins 2014-06-18 16:04:06 +00:00 committed by Gerrit Code Review
parent 484a23574c 24a19bfd36
commit de8cd42897
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/plugins/bigswitch/plugin.py
View File

@ -168,13 +168,6 @@ class NeutronRestProxyV2Base(db_base_plugin_v2.NeutronDbPluginV2,
supported_extension_aliases = ["binding"]
servers = None
def __init__(self, server_timeout=None):
super(NeutronRestProxyV2Base, self).__init__()
# This base class is not intended to be instantiated directly.
# Extending class should set ServerPool.
if not self.servers:
LOG.warning(_("ServerPool not set!"))
def _get_all_data(self, get_ports=True, get_floating_ips=True,
get_routers=True):
admin_context = qcontext.get_admin_context()
@ -474,7 +467,7 @@ class NeutronRestProxyV2(NeutronRestProxyV2Base,
self._aliases = aliases
return self._aliases
def __init__(self, server_timeout=None):
def __init__(self):
super(NeutronRestProxyV2, self).__init__()
LOG.info(_('NeutronRestProxy: Starting plugin. Version=%s'),
version.version_string_with_vcs())
@ -487,7 +480,7 @@ class NeutronRestProxyV2(NeutronRestProxyV2Base,
self.add_meta_server_route = cfg.CONF.RESTPROXY.add_meta_server_route
# init network ctrl connections
self.servers = servermanager.ServerPool(server_timeout)
self.servers = servermanager.ServerPool()
self.servers.get_topo_function = self._get_all_data
self.servers.get_topo_function_args = {'get_ports': True,
'get_floating_ips': True,

4
neutron/plugins/ml2/drivers/mech_bigswitch/driver.py
View File

@ -45,7 +45,7 @@ class BigSwitchMechanismDriver(plugin.NeutronRestProxyV2Base,
operations to the Big Switch Controller.
"""
def initialize(self, server_timeout=None):
def initialize(self):
LOG.debug(_('Initializing driver'))
# register plugin config opts
@ -55,7 +55,7 @@ class BigSwitchMechanismDriver(plugin.NeutronRestProxyV2Base,
self.native_bulk_support = False
# init network ctrl connections
self.servers = servermanager.ServerPool(server_timeout)
self.servers = servermanager.ServerPool()
self.servers.get_topo_function = self._get_all_data
self.servers.get_topo_function_args = {'get_ports': True,
'get_floating_ips': False,