diff --git a/etc/neutron/plugins/nicira/nvp.ini b/etc/neutron/plugins/nicira/nvp.ini index 6178c57e4a..d2c8460c3a 100644 --- a/etc/neutron/plugins/nicira/nvp.ini +++ b/etc/neutron/plugins/nicira/nvp.ini @@ -78,9 +78,9 @@ # Maximum number of ports for each overlay (stt, gre) logical switch # max_lp_per_overlay_ls = 256 -# Number of connects to each controller node. -# default is 5 -# concurrent_connections = 3 +# Number of connections to each controller node. +# default is 10 +# concurrent_connections = 10 # Number of seconds a generation id should be valid for (default -1 meaning do not time out) # nvp_gen_timeout = -1 diff --git a/neutron/plugins/nicira/NvpApiClient.py b/neutron/plugins/nicira/NvpApiClient.py index 3dcbc13b02..f61f96b919 100644 --- a/neutron/plugins/nicira/NvpApiClient.py +++ b/neutron/plugins/nicira/NvpApiClient.py @@ -61,7 +61,7 @@ class NVPApiHelper(client_eventlet.NvpApiClientEventlet): def __init__(self, api_providers, user, password, request_timeout, http_timeout, retries, redirects, - concurrent_connections=3, nvp_gen_timeout=-1): + concurrent_connections=10, nvp_gen_timeout=-1): '''Constructor. :param api_providers: a list of tuples in the form: diff --git a/neutron/plugins/nicira/common/config.py b/neutron/plugins/nicira/common/config.py index 6193efe200..f805bdbc32 100644 --- a/neutron/plugins/nicira/common/config.py +++ b/neutron/plugins/nicira/common/config.py @@ -36,8 +36,9 @@ nvp_opts = [ cfg.IntOpt('max_lp_per_overlay_ls', default=256, help=_("Maximum number of ports of a logical switch on an " "overlay transport zone (default 256)")), - cfg.IntOpt('concurrent_connections', default=5, - help=_("Maximum concurrent connections")), + cfg.IntOpt('concurrent_connections', default=10, + help=_("Maximum concurrent connections to each NVP " + "controller.")), cfg.IntOpt('nvp_gen_timeout', default=-1, help=_("Number of seconds a generation id should be valid for " "(default -1 meaning do not time out)")), diff --git a/neutron/tests/unit/nicira/test_nvpopts.py b/neutron/tests/unit/nicira/test_nvpopts.py index 15de6f6745..e92f1132e0 100644 --- a/neutron/tests/unit/nicira/test_nvpopts.py +++ b/neutron/tests/unit/nicira/test_nvpopts.py @@ -124,7 +124,7 @@ class ConfigurationTest(testtools.TestCase): def test_defaults(self): self.assertEqual(5000, cfg.CONF.NVP.max_lp_per_bridged_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('stt', cfg.CONF.NVP.default_transport_type)