NVP plugin: Set default max_lp_per_bridged_ls to 5000

This patch increases the default value from 64 to 5000

Bug 1227592

Change-Id: I19baa6dc48541ee5238748d21e8c410e4cdb5c00

diff --git a/etc/neutron/plugins/nicira/nvp.ini b/etc/neutron/plugins/nicira/nvp.ini
index c810423553314a9533ad6f7fe3f59ae85f8f1bcd..418d873cbf8f3721fefd3ad36cead760f5294faf 100644 (file)
--- a/etc/neutron/plugins/nicira/nvp.ini
+++ b/etc/neutron/plugins/nicira/nvp.ini
@@ -68,7 +68,12 @@
 
 [nvp]
 # 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
 # max_lp_per_overlay_ls = 256

diff --git a/neutron/plugins/nicira/common/config.py b/neutron/plugins/nicira/common/config.py
index 05e88572383fb5d3666673a820a06061f2bbf846..7fc0dae8f8ff6d4b4b531f313024d25005275c60 100644 (file)
--- a/neutron/plugins/nicira/common/config.py
+++ b/neutron/plugins/nicira/common/config.py
@@ -30,12 +30,12 @@ class MetadataModes:
 
 
 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 "
-                      "bridged transport zone (default 64)")),
+                      "bridged transport zone (default 5000)")),
     cfg.IntOpt('max_lp_per_overlay_ls', default=256,
                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,
                help=_("Maximum concurrent connections")),
     cfg.IntOpt('nvp_gen_timeout', default=-1,

diff --git a/neutron/tests/unit/nicira/test_nvpopts.py b/neutron/tests/unit/nicira/test_nvpopts.py
index 9b66cd18fdd113558c4059a13e7f0f2a86a9af18..15de6f6745a767ef6f5b761bb436672fba6aac47 100644 (file)
--- a/neutron/tests/unit/nicira/test_nvpopts.py
+++ b/neutron/tests/unit/nicira/test_nvpopts.py
@@ -122,7 +122,7 @@ class ConfigurationTest(testtools.TestCase):
         self._assert_required_options(plugin.cluster)
 
     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(5, cfg.CONF.NVP.concurrent_connections)
         self.assertEqual('access_network', cfg.CONF.NVP.metadata_mode)