From cd542a7f1f2ea21d3694e70b8e6a6db0efbd3a01 Mon Sep 17 00:00:00 2001 From: Irena Berezovsky Date: Thu, 5 Dec 2013 13:03:57 +0200 Subject: [PATCH] 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 --- neutron/plugins/mlnx/common/config.py | 2 +- neutron/tests/unit/mlnx/test_defaults.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron/plugins/mlnx/common/config.py b/neutron/plugins/mlnx/common/config.py index f5115845b..2f0376d25 100644 --- 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 bfc0d268f..a53f6e3f4 100644 --- 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) -- 2.45.2