x/vmware-nsx
Code Issues Proposed changes

Merge "NVP plugin: Set default max_lp_per_bridged_ls to 5000"

Browse Source
This commit is contained in:
Jenkins 2013-09-21 22:47:56 +00:00 committed by Gerrit Code Review
commit b10ceb5c77
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,12 @@
[nvp] [nvp]
# Maximum number of ports for each bridged logical switch # Maximum number of ports for each bridged logical switch
# max_lp_per_bridged_ls = 64 # The recommended value for this parameter varies with NVP version
# Please use:
# NVP 2.x -> 64
# NVP 3.0, 3.1 -> 5000
# NVP 3.2 -> 10000
# max_lp_per_bridged_ls = 5000
# 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

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

@ -30,12 +30,12 @@ class MetadataModes:
nvp_opts = [ nvp_opts = [
cfg.IntOpt('max_lp_per_bridged_ls', default=64, cfg.IntOpt('max_lp_per_bridged_ls', default=5000,
help=_("Maximum number of ports of a logical switch on a " help=_("Maximum number of ports of a logical switch on a "
"bridged transport zone (default 64)")), "bridged transport zone (default 5000)")),
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 64)")), "overlay transport zone (default 256)")),
cfg.IntOpt('concurrent_connections', default=5, cfg.IntOpt('concurrent_connections', default=5,
help=_("Maximum concurrent connections")), help=_("Maximum concurrent connections")),
cfg.IntOpt('nvp_gen_timeout', default=-1, cfg.IntOpt('nvp_gen_timeout', default=-1,

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

@ -122,7 +122,7 @@ class ConfigurationTest(testtools.TestCase):
self._assert_required_options(plugin.cluster) self._assert_required_options(plugin.cluster)
def test_defaults(self): def test_defaults(self):
self.assertEqual(64, 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(5, cfg.CONF.NVP.concurrent_connections)
self.assertEqual('access_network', cfg.CONF.NVP.metadata_mode) self.assertEqual('access_network', cfg.CONF.NVP.metadata_mode)