Merge "Change default eswitchd port to avoid conflict"

This commit is contained in:
Jenkins 2013-12-18 17:06:54 +00:00 committed by Gerrit Code Review
commit f03d927a81
2 changed files with 3 additions and 3 deletions

View File

@ -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 "

View File

@ -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)