diff --git a/etc/neutron/plugins/vmware/nsx.ini b/etc/neutron/plugins/vmware/nsx.ini index e270df57d6..6ce36c04bf 100644 --- a/etc/neutron/plugins/vmware/nsx.ini +++ b/etc/neutron/plugins/vmware/nsx.ini @@ -10,7 +10,7 @@ # req_timeout = 30 # 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 # retries = 2 diff --git a/neutron/plugins/vmware/api_client/request.py b/neutron/plugins/vmware/api_client/request.py index f43dff440f..70e7dcef49 100644 --- a/neutron/plugins/vmware/api_client/request.py +++ b/neutron/plugins/vmware/api_client/request.py @@ -31,7 +31,7 @@ from neutron.plugins.vmware import api_client LOG = logging.getLogger(__name__) DEFAULT_REQUEST_TIMEOUT = 30 -DEFAULT_HTTP_TIMEOUT = 10 +DEFAULT_HTTP_TIMEOUT = 30 DEFAULT_RETRIES = 2 DEFAULT_REDIRECTS = 2 DEFAULT_API_REQUEST_POOL_SIZE = 1000 diff --git a/neutron/plugins/vmware/common/config.py b/neutron/plugins/vmware/common/config.py index 848d6bded7..c75f982a63 100644 --- a/neutron/plugins/vmware/common/config.py +++ b/neutron/plugins/vmware/common/config.py @@ -116,7 +116,7 @@ connection_opts = [ default=30, help=_('Total time limit for a cluster request')), cfg.IntOpt('http_timeout', - default=10, + default=30, help=_('Time before aborting a request')), cfg.IntOpt('retries', default=2, diff --git a/neutron/tests/unit/vmware/test_nsx_opts.py b/neutron/tests/unit/vmware/test_nsx_opts.py index a5829810c6..6bdfc34087 100644 --- a/neutron/tests/unit/vmware/test_nsx_opts.py +++ b/neutron/tests/unit/vmware/test_nsx_opts.py @@ -125,7 +125,7 @@ class ConfigurationTest(base.BaseTestCase): self.assertEqual('admin', cfg.CONF.nsx_user) self.assertEqual('admin', cfg.CONF.nsx_password) 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.redirects) self.assertIsNone(cfg.CONF.nsx_controllers)