Change default eswitchd port to avoid conflict

Previous default for eswitch/daemon_endpoint would set a TCP port (5001)
which is in the range of the well known ports.
Change to unreserved port (60001) will avoid that conflict.

Change-Id: I711c4659f497e44a6041ec9958835c1f2f4174a7
Closes-Bug: #1245885

diff --git a/neutron/plugins/mlnx/common/config.py b/neutron/plugins/mlnx/common/config.py
index f5115845bf7dcd90a3eb8490e9f9d846a5739b01..2f0376d257e7465318c297009f0bf1ceec1dd23d 100644 (file)
--- a/neutron/plugins/mlnx/common/config.py
+++ b/neutron/plugins/mlnx/common/config.py
@@ -43,7 +43,7 @@ eswitch_opts = [
                help=_("Type of VM network interface: mlnx_direct or "
                       "hostdev")),
     cfg.StrOpt('daemon_endpoint',
-               default='tcp://127.0.0.1:5001',
+               default='tcp://127.0.0.1:60001',
                help=_('eswitch daemon end point')),
     cfg.IntOpt('request_timeout', default=3000,
                help=_("The number of milliseconds the agent will wait for "

diff --git a/neutron/tests/unit/mlnx/test_defaults.py b/neutron/tests/unit/mlnx/test_defaults.py
index bfc0d268fc21941ed956b68713b330d75b38b1a8..a53f6e3f4635f8d40d0c3b2609c12ae46e283a71 100644 (file)
--- a/neutron/tests/unit/mlnx/test_defaults.py
+++ b/neutron/tests/unit/mlnx/test_defaults.py
@@ -25,8 +25,6 @@ class ConfigurationTest(base.BaseTestCase):
     def test_defaults(self):
         self.assertEqual(2,
                          cfg.CONF.AGENT.polling_interval)
-        self.assertEqual('sudo',
-                         cfg.CONF.AGENT.root_helper)
         self.assertEqual('vlan',
                          cfg.CONF.MLNX.tenant_network_type)
         self.assertEqual(1,
@@ -34,3 +32,5 @@ class ConfigurationTest(base.BaseTestCase):
         self.assertEqual(0,
                          len(cfg.CONF.ESWITCH.
                              physical_interface_mappings))
+        self.assertEqual('tcp://127.0.0.1:60001',
+                         cfg.CONF.ESWITCH.daemon_endpoint)