x/vmware-nsx
Code Issues Proposed changes

Merge "Support a timeout argument when instantiating a bigswitch plugin"

Browse Source
This commit is contained in:
Jenkins 2013-06-29 06:06:44 +00:00 committed by Gerrit Code Review
commit d3fefbbcb3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quantum/plugins/bigswitch/plugin.py
View File

@ -333,7 +333,7 @@ class QuantumRestProxyV2(db_base_plugin_v2.QuantumDbPluginV2,
supported_extension_aliases = ["router", "binding", "router_rules"] supported_extension_aliases = ["router", "binding", "router_rules"]
def __init__(self): def __init__(self, server_timeout=None):
LOG.info(_('QuantumRestProxy: Starting plugin. Version=%s'), LOG.info(_('QuantumRestProxy: Starting plugin. Version=%s'),
version_string_with_vcs()) version_string_with_vcs())
@ -347,9 +347,11 @@ class QuantumRestProxyV2(db_base_plugin_v2.QuantumDbPluginV2,
server_auth = cfg.CONF.RESTPROXY.server_auth server_auth = cfg.CONF.RESTPROXY.server_auth
server_ssl = cfg.CONF.RESTPROXY.server_ssl server_ssl = cfg.CONF.RESTPROXY.server_ssl
sync_data = cfg.CONF.RESTPROXY.sync_data sync_data = cfg.CONF.RESTPROXY.sync_data
timeout = cfg.CONF.RESTPROXY.server_timeout
quantum_id = cfg.CONF.RESTPROXY.quantum_id quantum_id = cfg.CONF.RESTPROXY.quantum_id
self.add_meta_server_route = cfg.CONF.RESTPROXY.add_meta_server_route self.add_meta_server_route = cfg.CONF.RESTPROXY.add_meta_server_route
timeout = cfg.CONF.RESTPROXY.server_timeout
if server_timeout is not None:
timeout = server_timeout
# validate config # validate config
assert servers is not None, 'Servers not defined. Aborting plugin' assert servers is not None, 'Servers not defined. Aborting plugin'