666ea107ac
Previously, req_timeout and http_timeout were set to the same value which is not correct. req_timeout is the total time limit for a cluster request and http_timeout is the time allowed before aborting a request on an unresponsive controller. Since the default configuration allows 2 retries req_timeout should be double that of http_timeout because of this this patch goes ahead and removes req_timeout as this should just be http_timeout * retries. Because prevouly req_timeout and http_timeout were the same this exposed a corner case that when the nsx controller returned a 307 we would issue the request against the redirected controller but in the case where the session cookie had expire when the request was issued we would get a 401 response back and never retry the request. Now that the default values are corrected this issue should no longer occur as the next time time we issue the request we'll fetch a new auth cookie for the redirected controller. This patch also bumps the timeout values to be higher. We've seen more and more timeouts occur in our CI system largely because our cloud is overloaded so increasing the default timeouts will *hopefully* help reduce test failures. DocImpact Closes-bug: 1340969 Closes-bug: 1338846 Change-Id: Id7244cd4d9316931f4f7df1c3b41b3a894f2909a
89 lines
3.6 KiB
Python
89 lines
3.6 KiB
Python
# Copyright (c) 2014 VMware, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
import mock
|
|
|
|
from neutron.plugins.vmware.api_client import client
|
|
from neutron.plugins.vmware.api_client import exception
|
|
from neutron.plugins.vmware.api_client import version
|
|
from neutron.plugins.vmware.common import config # noqa
|
|
from neutron.plugins.vmware import nsx_cluster as cluster
|
|
from neutron.tests import base
|
|
from neutron.tests.unit import test_api_v2
|
|
from neutron.tests.unit import vmware
|
|
from neutron.tests.unit.vmware.apiclient import fake
|
|
|
|
_uuid = test_api_v2._uuid
|
|
|
|
|
|
class NsxlibTestCase(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
self.fc = fake.FakeClient(vmware.STUBS_PATH)
|
|
self.mock_nsxapi = mock.patch(vmware.NSXAPI_NAME, autospec=True)
|
|
instance = self.mock_nsxapi.start()
|
|
instance.return_value.login.return_value = "the_cookie"
|
|
fake_version = getattr(self, 'fake_version', "3.0")
|
|
instance.return_value.get_version.return_value = (
|
|
version.Version(fake_version))
|
|
|
|
instance.return_value.request.side_effect = self.fc.fake_request
|
|
self.fake_cluster = cluster.NSXCluster(
|
|
name='fake-cluster', nsx_controllers=['1.1.1.1:999'],
|
|
default_tz_uuid=_uuid(), nsx_user='foo', nsx_password='bar')
|
|
self.fake_cluster.api_client = client.NsxApiClient(
|
|
('1.1.1.1', '999', True),
|
|
self.fake_cluster.nsx_user, self.fake_cluster.nsx_password,
|
|
self.fake_cluster.http_timeout,
|
|
self.fake_cluster.retries, self.fake_cluster.redirects)
|
|
|
|
super(NsxlibTestCase, self).setUp()
|
|
self.addCleanup(self.fc.reset_all)
|
|
|
|
def _build_tag_dict(self, tags):
|
|
# This syntax is needed for python 2.6 compatibility
|
|
return dict((t['scope'], t['tag']) for t in tags)
|
|
|
|
|
|
class NsxlibNegativeBaseTestCase(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
self.fc = fake.FakeClient(vmware.STUBS_PATH)
|
|
self.mock_nsxapi = mock.patch(vmware.NSXAPI_NAME, autospec=True)
|
|
instance = self.mock_nsxapi.start()
|
|
instance.return_value.login.return_value = "the_cookie"
|
|
# Choose 3.0, but the version is irrelevant for the aim of
|
|
# these tests as calls are throwing up errors anyway
|
|
fake_version = getattr(self, 'fake_version', "3.0")
|
|
instance.return_value.get_version.return_value = (
|
|
version.Version(fake_version))
|
|
|
|
def _faulty_request(*args, **kwargs):
|
|
raise exception.NsxApiException
|
|
|
|
instance.return_value.request.side_effect = _faulty_request
|
|
self.fake_cluster = cluster.NSXCluster(
|
|
name='fake-cluster', nsx_controllers=['1.1.1.1:999'],
|
|
default_tz_uuid=_uuid(), nsx_user='foo', nsx_password='bar')
|
|
self.fake_cluster.api_client = client.NsxApiClient(
|
|
('1.1.1.1', '999', True),
|
|
self.fake_cluster.nsx_user, self.fake_cluster.nsx_password,
|
|
self.fake_cluster.http_timeout,
|
|
self.fake_cluster.retries, self.fake_cluster.redirects)
|
|
|
|
super(NsxlibNegativeBaseTestCase, self).setUp()
|
|
self.addCleanup(self.fc.reset_all)
|