Stephen Finucane
89ef050b8c
Now that we no longer support py27, we can use the standard library
unittest.mock module instead of the third party mock lib. Most of this
is autogenerated, as described below, but there is one manual change
necessary:
nova/tests/functional/regressions/test_bug_1781286.py
We need to avoid using 'fixtures.MockPatch' since fixtures is using
'mock' (the library) under the hood and a call to 'mock.patch.stop'
found in that test will now "stop" mocks from the wrong library. We
have discussed making this configurable but the option proposed isn't
that pretty [1] so this is better.
The remainder was auto-generated with the following (hacky) script, with
one or two manual tweaks after the fact:
import glob
for path in glob.glob('nova/tests/**/*.py', recursive=True):
with open(path) as fh:
lines = fh.readlines()
if 'import mock\n' not in lines:
continue
import_group_found = False
create_first_party_group = False
for num, line in enumerate(lines):
line = line.strip()
if line.startswith('import ') or line.startswith('from '):
tokens = line.split()
for lib in (
'ddt', 'six', 'webob', 'fixtures', 'testtools'
'neutron', 'cinder', 'ironic', 'keystone', 'oslo',
):
if lib in tokens[1]:
create_first_party_group = True
break
if create_first_party_group:
break
import_group_found = True
if not import_group_found:
continue
if line.startswith('import ') or line.startswith('from '):
tokens = line.split()
if tokens[1] > 'unittest':
break
elif tokens[1] == 'unittest' and (
len(tokens) == 2 or tokens[4] > 'mock'
):
break
elif not line:
break
if create_first_party_group:
lines.insert(num, 'from unittest import mock\n\n')
else:
lines.insert(num, 'from unittest import mock\n')
del lines[lines.index('import mock\n')]
with open(path, 'w+') as fh:
fh.writelines(lines)
Note that we cannot remove mock from our requirements files yet due to
importing pypowervm unit test code in nova unit tests. This library
still uses the mock lib, and since we are importing test code and that
lib (correctly) only declares mock in its test-requirements.txt, mock
would not otherwise be installed and would cause errors while loading
nova unit test code.
[1] https://github.com/testing-cabal/fixtures/pull/49
Change-Id: Id5b04cf2f6ca24af8e366d23f15cf0e5cac8e1cc
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
314 lines
13 KiB
Python
314 lines
13 KiB
Python
# Copyright 2014 IBM Corp.
|
|
#
|
|
# 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.
|
|
|
|
from unittest import mock
|
|
|
|
from oslo_serialization import jsonutils
|
|
|
|
from nova.api.openstack import api_version_request as api_version
|
|
from nova import test
|
|
from nova.tests.unit.api.openstack.compute import microversions
|
|
from nova.tests.unit.api.openstack import fakes
|
|
|
|
|
|
class LegacyMicroversionsTest(test.NoDBTestCase):
|
|
|
|
header_name = 'X-OpenStack-Nova-API-Version'
|
|
|
|
def setUp(self):
|
|
super(LegacyMicroversionsTest, self).setUp()
|
|
self.app = fakes.wsgi_app_v21(custom_routes=microversions.ROUTES)
|
|
|
|
def _test_microversions(self, app, req, ret_code, ret_header=None):
|
|
req.environ['CONTENT_TYPE'] = "application/json"
|
|
|
|
res = req.get_response(app)
|
|
self.assertEqual(ret_code, res.status_int)
|
|
if ret_header:
|
|
if 'nova' not in self.header_name.lower():
|
|
ret_header = 'compute %s' % ret_header
|
|
self.assertEqual(ret_header,
|
|
res.headers[self.header_name])
|
|
return res
|
|
|
|
def _make_header(self, req_header):
|
|
if 'nova' in self.header_name.lower():
|
|
headers = {self.header_name: req_header}
|
|
else:
|
|
headers = {self.header_name: 'compute %s' % req_header}
|
|
return headers
|
|
|
|
def test_microversions_no_header(self):
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions' % fakes.FAKE_PROJECT_ID,
|
|
method='GET')
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(200, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual('val', resp_json['param'])
|
|
|
|
def test_microversions_return_header(self):
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions' % fakes.FAKE_PROJECT_ID)
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(200, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual('val', resp_json['param'])
|
|
if 'nova' in self.header_name.lower():
|
|
self.assertEqual("2.1", res.headers[self.header_name])
|
|
else:
|
|
self.assertEqual("compute 2.1", res.headers[self.header_name])
|
|
self.assertIn(self.header_name, res.headers.getall('Vary'))
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def test_microversions_return_header_non_default(self,
|
|
mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("2.3")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions' % fakes.FAKE_PROJECT_ID)
|
|
req.headers = self._make_header('2.3')
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(200, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual('val2', resp_json['param'])
|
|
if 'nova' in self.header_name.lower():
|
|
self.assertEqual("2.3", res.headers[self.header_name])
|
|
else:
|
|
self.assertEqual("compute 2.3", res.headers[self.header_name])
|
|
self.assertIn(self.header_name, res.headers.getall('Vary'))
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def test_microversions_return_header_fault(self, mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("3.0")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions' % fakes.FAKE_PROJECT_ID)
|
|
req.headers = self._make_header('3.0')
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(400, res.status_int)
|
|
if 'nova' in self.header_name.lower():
|
|
self.assertEqual("3.0", res.headers[self.header_name])
|
|
else:
|
|
self.assertEqual("compute 3.0", res.headers[self.header_name])
|
|
self.assertIn(self.header_name, res.headers.getall('Vary'))
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def _check_microversion_response(self, url, req_version, resp_param,
|
|
mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest('2.3')
|
|
|
|
req = fakes.HTTPRequest.blank(url)
|
|
req.headers = self._make_header(req_version)
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(200, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual(resp_param, resp_json['param'])
|
|
|
|
def test_microversions_with_header(self):
|
|
self._check_microversion_response(
|
|
'/v2/%s/microversions' % fakes.FAKE_PROJECT_ID,
|
|
'2.3', 'val2')
|
|
|
|
def test_microversions_with_header_exact_match(self):
|
|
self._check_microversion_response(
|
|
'/v2/%s/microversions' % fakes.FAKE_PROJECT_ID,
|
|
'2.2', 'val2')
|
|
|
|
def test_microversions2_no_2_1_version(self):
|
|
self._check_microversion_response(
|
|
'/v2/%s/microversions2' % fakes.FAKE_PROJECT_ID,
|
|
'2.3', 'controller2_val1')
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def test_microversions2_later_version(self, mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("3.1")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions2' % fakes.FAKE_PROJECT_ID)
|
|
req.headers = self._make_header('3.0')
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(202, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual('controller2_val2', resp_json['param'])
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def test_microversions2_version_too_high(self, mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("3.5")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions2' % fakes.FAKE_PROJECT_ID)
|
|
req.headers = {self.header_name: '3.2'}
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(404, res.status_int)
|
|
|
|
def test_microversions2_version_too_low(self):
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions2' % fakes.FAKE_PROJECT_ID)
|
|
req.headers = {self.header_name: '2.1'}
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(404, res.status_int)
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def test_microversions_global_version_too_high(self,
|
|
mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("3.5")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions2' % fakes.FAKE_PROJECT_ID)
|
|
req.headers = self._make_header('3.7')
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(406, res.status_int)
|
|
res_json = jsonutils.loads(res.body)
|
|
self.assertEqual("Version 3.7 is not supported by the API. "
|
|
"Minimum is 2.1 and maximum is 3.5.",
|
|
res_json['computeFault']['message'])
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def test_microversions_schema(self, mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("3.3")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions3' % fakes.FAKE_PROJECT_ID)
|
|
req.method = 'POST'
|
|
req.headers = self._make_header('2.2')
|
|
req.environ['CONTENT_TYPE'] = "application/json"
|
|
req.body = jsonutils.dump_as_bytes({'dummy': {'val': 'foo'}})
|
|
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(200, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual('create_val1', resp_json['param'])
|
|
if 'nova' in self.header_name.lower():
|
|
self.assertEqual("2.2", res.headers[self.header_name])
|
|
else:
|
|
self.assertEqual("compute 2.2", res.headers[self.header_name])
|
|
self.assertIn(self.header_name, res.headers.getall('Vary'))
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def test_microversions_schema_fail(self, mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("3.3")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions3' % fakes.FAKE_PROJECT_ID)
|
|
req.method = 'POST'
|
|
req.headers = {self.header_name: '2.2'}
|
|
req.environ['CONTENT_TYPE'] = "application/json"
|
|
req.body = jsonutils.dump_as_bytes({'dummy': {'invalid_param': 'foo'}})
|
|
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(400, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertTrue(resp_json['badRequest']['message'].startswith(
|
|
"Invalid input for field/attribute dummy."))
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def test_microversions_schema_out_of_version_check(self,
|
|
mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("3.3")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions3/1' % fakes.FAKE_PROJECT_ID)
|
|
req.method = 'PUT'
|
|
req.headers = self._make_header('2.2')
|
|
req.body = jsonutils.dump_as_bytes({'dummy': {'inv_val': 'foo'}})
|
|
req.environ['CONTENT_TYPE'] = "application/json"
|
|
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(200, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual('update_val1', resp_json['param'])
|
|
if 'nova' in self.header_name.lower():
|
|
self.assertEqual("2.2", res.headers[self.header_name])
|
|
else:
|
|
self.assertEqual("compute 2.2", res.headers[self.header_name])
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def test_microversions_schema_second_version(self,
|
|
mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("3.3")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions3/1' % fakes.FAKE_PROJECT_ID)
|
|
req.headers = self._make_header('2.10')
|
|
req.environ['CONTENT_TYPE'] = "application/json"
|
|
req.method = 'PUT'
|
|
req.body = jsonutils.dump_as_bytes({'dummy': {'val2': 'foo'}})
|
|
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(200, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual('update_val1', resp_json['param'])
|
|
if 'nova' in self.header_name.lower():
|
|
self.assertEqual("2.10", res.headers[self.header_name])
|
|
else:
|
|
self.assertEqual("compute 2.10", res.headers[self.header_name])
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def _test_microversions_inner_function(self, version, expected_resp,
|
|
mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("2.2")
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions4' % fakes.FAKE_PROJECT_ID)
|
|
req.headers = self._make_header(version)
|
|
req.environ['CONTENT_TYPE'] = "application/json"
|
|
req.method = 'POST'
|
|
req.body = b''
|
|
|
|
res = req.get_response(self.app)
|
|
self.assertEqual(200, res.status_int)
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual(expected_resp, resp_json['param'])
|
|
if 'nova' not in self.header_name.lower():
|
|
version = 'compute %s' % version
|
|
self.assertEqual(version, res.headers[self.header_name])
|
|
|
|
def test_microversions_inner_function_v22(self):
|
|
self._test_microversions_inner_function('2.2', 'controller4_val2')
|
|
|
|
def test_microversions_inner_function_v21(self):
|
|
self._test_microversions_inner_function('2.1', 'controller4_val1')
|
|
|
|
@mock.patch("nova.api.openstack.api_version_request.max_api_version")
|
|
def _test_microversions_actions(self, ret_code, ret_header, req_header,
|
|
mock_maxver):
|
|
mock_maxver.return_value = api_version.APIVersionRequest("2.3")
|
|
|
|
req = fakes.HTTPRequest.blank(
|
|
'/v2/%s/microversions3/1/action' % fakes.FAKE_PROJECT_ID)
|
|
if req_header:
|
|
req.headers = self._make_header(req_header)
|
|
req.method = 'POST'
|
|
req.body = jsonutils.dump_as_bytes({'foo': None})
|
|
|
|
res = self._test_microversions(self.app, req, ret_code,
|
|
ret_header=ret_header)
|
|
if ret_code == 202:
|
|
resp_json = jsonutils.loads(res.body)
|
|
self.assertEqual({'foo': 'bar'}, resp_json)
|
|
|
|
def test_microversions_actions(self):
|
|
self._test_microversions_actions(202, "2.1", "2.1")
|
|
|
|
def test_microversions_actions_too_high(self):
|
|
self._test_microversions_actions(404, "2.3", "2.3")
|
|
|
|
def test_microversions_actions_no_header(self):
|
|
self._test_microversions_actions(202, "2.1", None)
|
|
|
|
|
|
class MicroversionsTest(LegacyMicroversionsTest):
|
|
|
|
header_name = 'OpenStack-API-Version'
|