x/vmware-nsx
Code Issues Proposed changes

Merge "NSX: bump http_timeout to 30 seconds"

Browse Source
This commit is contained in:
Jenkins 2014-06-08 15:10:47 +00:00 committed by Gerrit Code Review
commit dcde45be32
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/neutron/plugins/vmware/nsx.ini
View File

@ -10,7 +10,7 @@
# req_timeout = 30 # req_timeout = 30
# Time before aborting a request on an unresponsive controller # Time before aborting a request on an unresponsive controller
# http_timeout = 10 # http_timeout = 30
# Maximum number of times a particular request should be retried # Maximum number of times a particular request should be retried
# retries = 2 # retries = 2

2
neutron/plugins/vmware/api_client/request.py
View File

@ -31,7 +31,7 @@ from neutron.plugins.vmware import api_client
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
DEFAULT_REQUEST_TIMEOUT = 30 DEFAULT_REQUEST_TIMEOUT = 30
DEFAULT_HTTP_TIMEOUT = 10 DEFAULT_HTTP_TIMEOUT = 30
DEFAULT_RETRIES = 2 DEFAULT_RETRIES = 2
DEFAULT_REDIRECTS = 2 DEFAULT_REDIRECTS = 2
DEFAULT_API_REQUEST_POOL_SIZE = 1000 DEFAULT_API_REQUEST_POOL_SIZE = 1000

2
neutron/plugins/vmware/common/config.py
View File

@ -116,7 +116,7 @@ connection_opts = [
default=30, default=30,
help=_('Total time limit for a cluster request')), help=_('Total time limit for a cluster request')),
cfg.IntOpt('http_timeout', cfg.IntOpt('http_timeout',
default=10, default=30,
help=_('Time before aborting a request')), help=_('Time before aborting a request')),
cfg.IntOpt('retries', cfg.IntOpt('retries',
default=2, default=2,

2
neutron/tests/unit/vmware/test_nsx_opts.py
View File

@ -125,7 +125,7 @@ class ConfigurationTest(base.BaseTestCase):
self.assertEqual('admin', cfg.CONF.nsx_user) self.assertEqual('admin', cfg.CONF.nsx_user)
self.assertEqual('admin', cfg.CONF.nsx_password) self.assertEqual('admin', cfg.CONF.nsx_password)
self.assertEqual(30, cfg.CONF.req_timeout) self.assertEqual(30, cfg.CONF.req_timeout)
self.assertEqual(10, cfg.CONF.http_timeout) self.assertEqual(30, cfg.CONF.http_timeout)
self.assertEqual(2, cfg.CONF.retries) self.assertEqual(2, cfg.CONF.retries)
self.assertEqual(2, cfg.CONF.redirects) self.assertEqual(2, cfg.CONF.redirects)
self.assertIsNone(cfg.CONF.nsx_controllers) self.assertIsNone(cfg.CONF.nsx_controllers)