x/vmware-nsx
Code Issues Proposed changes

Big Switch: Remove unnecessary initialization code

Browse Source 
Removes a server_timeout parameter that was never set by anything
in the Big Switch plugin and the ML2 driver.

Also eliminates an __init__ method that didn't do anything except
incorrectly log an unset server pool warning before the inheriting
class setup the server pool.

Closes-Bug: #1331249
Change-Id: I77dd22295305b96d4702f1ea0e319dc5f82c71a8
This commit is contained in:
Kevin Benton
2014-06-12 02:15:27 -07:00
parent 5c3b67a025
commit 24a19bfd36
2 changed files with 4 additions and 11 deletions
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,