x/vmware-nsx
Code Issues Proposed changes

Merge "Increase number of concurrent_connections to nvp"

Browse Source
This commit is contained in:
Jenkins 2013-10-01 08:13:30 +00:00 committed by Gerrit Code Review
commit cb7fee0813
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/neutron/plugins/nicira/nvp.ini
View File

@ -78,9 +78,9 @@
# Maximum number of ports for each overlay (stt, gre) logical switch # Maximum number of ports for each overlay (stt, gre) logical switch
# max_lp_per_overlay_ls = 256 # max_lp_per_overlay_ls = 256
# Number of connects to each controller node. # Number of connections to each controller node.
# default is 5 # default is 10
# concurrent_connections = 3 # concurrent_connections = 10
# Number of seconds a generation id should be valid for (default -1 meaning do not time out) # Number of seconds a generation id should be valid for (default -1 meaning do not time out)
# nvp_gen_timeout = -1 # nvp_gen_timeout = -1

2
neutron/plugins/nicira/NvpApiClient.py
View File

@ -61,7 +61,7 @@ class NVPApiHelper(client_eventlet.NvpApiClientEventlet):
def __init__(self, api_providers, user, password, request_timeout, def __init__(self, api_providers, user, password, request_timeout,
http_timeout, retries, redirects, http_timeout, retries, redirects,
concurrent_connections=3, nvp_gen_timeout=-1): concurrent_connections=10, nvp_gen_timeout=-1):
'''Constructor. '''Constructor.
:param api_providers: a list of tuples in the form: :param api_providers: a list of tuples in the form:

5
neutron/plugins/nicira/common/config.py
View File

@ -36,8 +36,9 @@ nvp_opts = [
cfg.IntOpt('max_lp_per_overlay_ls', default=256, cfg.IntOpt('max_lp_per_overlay_ls', default=256,
help=_("Maximum number of ports of a logical switch on an " help=_("Maximum number of ports of a logical switch on an "
"overlay transport zone (default 256)")), "overlay transport zone (default 256)")),
cfg.IntOpt('concurrent_connections', default=5, cfg.IntOpt('concurrent_connections', default=10,
help=_("Maximum concurrent connections")), help=_("Maximum concurrent connections to each NVP "
"controller.")),
cfg.IntOpt('nvp_gen_timeout', default=-1, cfg.IntOpt('nvp_gen_timeout', default=-1,
help=_("Number of seconds a generation id should be valid for " help=_("Number of seconds a generation id should be valid for "
"(default -1 meaning do not time out)")), "(default -1 meaning do not time out)")),

2
neutron/tests/unit/nicira/test_nvpopts.py
View File

@ -124,7 +124,7 @@ class ConfigurationTest(testtools.TestCase):
def test_defaults(self): def test_defaults(self):
self.assertEqual(5000, cfg.CONF.NVP.max_lp_per_bridged_ls) self.assertEqual(5000, cfg.CONF.NVP.max_lp_per_bridged_ls)
self.assertEqual(256, cfg.CONF.NVP.max_lp_per_overlay_ls) self.assertEqual(256, cfg.CONF.NVP.max_lp_per_overlay_ls)
self.assertEqual(5, cfg.CONF.NVP.concurrent_connections) self.assertEqual(10, cfg.CONF.NVP.concurrent_connections)
self.assertEqual('access_network', cfg.CONF.NVP.metadata_mode) self.assertEqual('access_network', cfg.CONF.NVP.metadata_mode)
self.assertEqual('stt', cfg.CONF.NVP.default_transport_type) self.assertEqual('stt', cfg.CONF.NVP.default_transport_type)