
Add unit tests for microversions. This also changes the default microversion to 1.1, which tells Barbican to return secret consumers. Because of that, this patch adds consumers to the Secret object in barbicanclient/v1/secrets.py , so that the API response is correctly interpreted. Co-Authored-By: Ade Lee <alee@redhat.com> Co-Authored-By: Andre Aranha <afariasa@redhat.com> Co-Authored-By: Grzegorz Grasza <xek@redhat.com> Change-Id: Ibfaea3fe9e394f6b1286d92437629d0400305968
483 lines
18 KiB
Python
483 lines
18 KiB
Python
# Copyright (c) 2013 Rackspace, 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.
|
|
|
|
from unittest import mock
|
|
|
|
from keystoneauth1 import session
|
|
from requests_mock.contrib import fixture
|
|
import testtools
|
|
|
|
from barbicanclient import client
|
|
from barbicanclient import exceptions
|
|
from barbicanclient.exceptions import UnsupportedVersion
|
|
from barbicanclient.tests.utils import get_server_supported_versions
|
|
from barbicanclient.tests.utils import get_version_endpoint
|
|
from barbicanclient.tests.utils import mock_session
|
|
from barbicanclient.tests.utils import mock_session_get
|
|
from barbicanclient.tests.utils import mock_session_get_endpoint
|
|
|
|
|
|
_DEFAULT_MICROVERSION = (1, 1)
|
|
|
|
|
|
class TestClient(testtools.TestCase):
|
|
|
|
def setUp(self):
|
|
super(TestClient, self).setUp()
|
|
self.endpoint = 'http://localhost:9311'
|
|
self.responses = self.useFixture(fixture.Fixture())
|
|
self.responses.get(
|
|
'http://localhost:9311/v1/',
|
|
json={
|
|
'version': {
|
|
'id': 'v1',
|
|
'status': 'CURRENT',
|
|
'min_version': '1.0',
|
|
'max_version': '1.1',
|
|
'links': [{
|
|
'rel': 'self',
|
|
'href': 'http://192.168.122.110/key-manager/v1/'
|
|
}, {
|
|
'rel': 'describedby',
|
|
'type': 'text/html',
|
|
'href': 'https://docs.openstack.org/'}]}})
|
|
self.responses.get(
|
|
'http://localhost:9311/',
|
|
json={
|
|
"versions": [{
|
|
"id": "v1",
|
|
"status": "CURRENT",
|
|
"min_version": "1.0",
|
|
"max_version": "1.1",
|
|
"links": [{
|
|
"rel": "self",
|
|
"href": "http://localhost:9311/v1/"
|
|
}, {
|
|
"rel": "describedby",
|
|
"type": "text/html",
|
|
"href": "https://docs.openstack.org/"}]}]})
|
|
|
|
self.project_id = 'project_id'
|
|
self.session = session.Session()
|
|
self.httpclient = client._HTTPClient(
|
|
session=self.session,
|
|
microversion=_DEFAULT_MICROVERSION,
|
|
endpoint=self.endpoint,
|
|
project_id=self.project_id)
|
|
|
|
|
|
class WhenTestingClientInit(TestClient):
|
|
|
|
def test_api_version_is_appended_to_endpoint(self):
|
|
c = client.Client(session=self.session,
|
|
endpoint=self.endpoint,
|
|
project_id=self.project_id)
|
|
self.assertEqual('http://localhost:9311/v1/',
|
|
c.client.endpoint_override)
|
|
|
|
def test_default_headers_are_empty(self):
|
|
c = client._HTTPClient(
|
|
session=self.session, microversion='1.1', endpoint=self.endpoint)
|
|
self.assertIsInstance(c._default_headers, dict)
|
|
self.assertFalse(bool(c._default_headers))
|
|
|
|
def test_project_id_is_added_to_default_headers(self):
|
|
c = client._HTTPClient(session=self.session,
|
|
microversion=_DEFAULT_MICROVERSION,
|
|
endpoint=self.endpoint,
|
|
project_id=self.project_id)
|
|
self.assertIn('X-Project-Id', c._default_headers.keys())
|
|
self.assertEqual(self.project_id, c._default_headers['X-Project-Id'])
|
|
|
|
def test_error_thrown_when_no_session_and_no_endpoint(self):
|
|
self.assertRaises(ValueError, client.Client,
|
|
**{"project_id": self.project_id})
|
|
|
|
def test_error_thrown_when_no_session_and_no_project_id(self):
|
|
self.assertRaises(ValueError, client.Client,
|
|
**{"endpoint": self.endpoint})
|
|
|
|
def test_endpoint_override_starts_with_endpoint_url(self):
|
|
c = client.Client(session=self.session,
|
|
endpoint=self.endpoint,
|
|
project_id=self.project_id)
|
|
self.assertTrue(c.client.endpoint_override.startswith(self.endpoint))
|
|
|
|
def test_endpoint_override_ends_with_default_api_version(self):
|
|
c = client.Client(session=self.session,
|
|
endpoint=self.endpoint,
|
|
project_id=self.project_id)
|
|
self.assertTrue(c.client.endpoint_override.rstrip('/').endswith(
|
|
client._DEFAULT_API_VERSION
|
|
))
|
|
|
|
|
|
class WhenTestingClientPost(TestClient):
|
|
|
|
def setUp(self):
|
|
super(WhenTestingClientPost, self).setUp()
|
|
self.httpclient = client._HTTPClient(
|
|
session=self.session,
|
|
microversion=_DEFAULT_MICROVERSION,
|
|
endpoint=self.endpoint,
|
|
version='v1')
|
|
self.href = self.endpoint + '/v1/secrets/'
|
|
self.post_mock = self.responses.post(self.href, json={})
|
|
|
|
def test_post_normalizes_url_with_traling_slash(self):
|
|
self.httpclient.post(path='secrets', json={'test_data': 'test'})
|
|
self.assertTrue(self.post_mock.last_request.url.endswith('/'))
|
|
|
|
def test_post_includes_content_type_header_of_application_json(self):
|
|
self.httpclient.post(path='secrets', json={'test_data': 'test'})
|
|
self.assertEqual('application/json',
|
|
self.post_mock.last_request.headers['Content-Type'])
|
|
|
|
def test_post_includes_default_headers(self):
|
|
self.httpclient._default_headers = {'Test-Default-Header': 'test'}
|
|
self.httpclient.post(path='secrets', json={'test_data': 'test'})
|
|
self.assertEqual(
|
|
'test',
|
|
self.post_mock.last_request.headers['Test-Default-Header'])
|
|
|
|
def test_post_checks_status_code(self):
|
|
self.httpclient._check_status_code = mock.MagicMock()
|
|
self.httpclient.post(path='secrets', json={'test_data': 'test'})
|
|
self.httpclient._check_status_code.assert_has_calls([])
|
|
|
|
|
|
class WhenTestingClientPut(TestClient):
|
|
|
|
def setUp(self):
|
|
super(WhenTestingClientPut, self).setUp()
|
|
self.httpclient = client._HTTPClient(
|
|
session=self.session,
|
|
microversion=_DEFAULT_MICROVERSION,
|
|
endpoint=self.endpoint)
|
|
self.href = 'http://test_href/'
|
|
self.put_mock = self.responses.put(self.href, status_code=204)
|
|
|
|
def test_put_uses_href_as_is(self):
|
|
self.httpclient.put(self.href)
|
|
self.assertTrue(self.put_mock.called)
|
|
|
|
def test_put_passes_data(self):
|
|
data = "test"
|
|
self.httpclient.put(self.href, data=data)
|
|
self.assertEqual("test", self.put_mock.last_request.text)
|
|
|
|
def test_put_includes_default_headers(self):
|
|
self.httpclient._default_headers = {'Test-Default-Header': 'test'}
|
|
self.httpclient.put(self.href)
|
|
self.assertEqual(
|
|
'test',
|
|
self.put_mock.last_request.headers['Test-Default-Header'])
|
|
|
|
def test_put_checks_status_code(self):
|
|
self.httpclient._check_status_code = mock.MagicMock()
|
|
self.httpclient.put(self.href, data='test')
|
|
self.httpclient._check_status_code.assert_has_calls([])
|
|
|
|
|
|
class WhenTestingClientGet(TestClient):
|
|
|
|
def setUp(self):
|
|
super(WhenTestingClientGet, self).setUp()
|
|
self.httpclient = client._HTTPClient(
|
|
session=self.session,
|
|
microversion=_DEFAULT_MICROVERSION,
|
|
endpoint=self.endpoint)
|
|
self.headers = dict()
|
|
self.href = 'http://test_href/'
|
|
self.get_mock = self.responses.get(self.href, json={})
|
|
|
|
def test_get_uses_href_as_is(self):
|
|
self.httpclient.get(self.href)
|
|
self.assertEqual(self.href, self.get_mock.last_request.url)
|
|
|
|
def test_get_passes_params(self):
|
|
params = {'test': 'test1'}
|
|
self.httpclient.get(self.href, params=params)
|
|
self.assertEqual(self.href,
|
|
self.get_mock.last_request.url.split('?')[0])
|
|
self.assertEqual(['test1'], self.get_mock.last_request.qs['test'])
|
|
|
|
def test_get_includes_accept_header_of_application_json(self):
|
|
self.httpclient.get(self.href)
|
|
self.assertEqual('application/json',
|
|
self.get_mock.last_request.headers['Accept'])
|
|
|
|
def test_get_includes_default_headers(self):
|
|
self.httpclient._default_headers = {'Test-Default-Header': 'test'}
|
|
self.httpclient.get(self.href)
|
|
self.assertEqual(
|
|
'test',
|
|
self.get_mock.last_request.headers['Test-Default-Header'])
|
|
|
|
def test_get_checks_status_code(self):
|
|
self.httpclient._check_status_code = mock.MagicMock()
|
|
self.httpclient.get(self.href)
|
|
self.httpclient._check_status_code.assert_has_calls([])
|
|
|
|
def test_get_raw_uses_href_as_is(self):
|
|
self.httpclient._get_raw(self.href, headers=self.headers)
|
|
self.assertEqual(self.href, self.get_mock.last_request.url)
|
|
|
|
def test_get_raw_passes_headers(self):
|
|
self.httpclient._get_raw(self.href, headers={'test': 'test'})
|
|
self.assertEqual('test', self.get_mock.last_request.headers['test'])
|
|
|
|
def test_get_raw_includes_default_headers(self):
|
|
self.httpclient._default_headers = {'Test-Default-Header': 'test'}
|
|
self.httpclient._get_raw(self.href, headers=self.headers)
|
|
self.assertIn('Test-Default-Header',
|
|
self.get_mock.last_request.headers)
|
|
|
|
def test_get_raw_checks_status_code(self):
|
|
self.httpclient._check_status_code = mock.MagicMock()
|
|
self.httpclient._get_raw(self.href, headers=self.headers)
|
|
self.httpclient._check_status_code.assert_has_calls([])
|
|
|
|
|
|
class WhenTestingClientDelete(TestClient):
|
|
|
|
def setUp(self):
|
|
super(WhenTestingClientDelete, self).setUp()
|
|
self.httpclient = client._HTTPClient(
|
|
session=self.session,
|
|
microversion=_DEFAULT_MICROVERSION,
|
|
endpoint=self.endpoint)
|
|
self.href = 'http://test_href/'
|
|
self.del_mock = self.responses.delete(self.href, status_code=204)
|
|
|
|
def test_delete_uses_href_as_is(self):
|
|
self.httpclient.delete(self.href)
|
|
self.assertTrue(self.del_mock.called)
|
|
|
|
def test_delete_passes_json(self):
|
|
json = {"test": "test"}
|
|
self.httpclient.delete(self.href, json=json)
|
|
self.assertEqual('{"test": "test"}', self.del_mock.last_request.text)
|
|
|
|
def test_delete_includes_default_headers(self):
|
|
self.httpclient._default_headers = {'Test-Default-Header': 'test'}
|
|
self.httpclient.delete(self.href)
|
|
self.assertEqual(
|
|
'test',
|
|
self.del_mock.last_request.headers['Test-Default-Header'])
|
|
|
|
def test_delete_checks_status_code(self):
|
|
self.httpclient._check_status_code = mock.MagicMock()
|
|
self.httpclient.delete(self.href)
|
|
self.httpclient._check_status_code.assert_has_calls([])
|
|
|
|
|
|
class WhenTestingCheckStatusCodes(TestClient):
|
|
|
|
def test_raises_http_auth_error_for_401_response(self):
|
|
resp = mock.MagicMock()
|
|
resp.status_code = 401
|
|
self.assertRaises(exceptions.HTTPAuthError,
|
|
self.httpclient._check_status_code,
|
|
resp)
|
|
|
|
def test_raises_http_server_error_for_500_response(self):
|
|
resp = mock.MagicMock()
|
|
resp.status_code = 500
|
|
self.assertRaises(exceptions.HTTPServerError,
|
|
self.httpclient._check_status_code, resp)
|
|
|
|
def test_raises_http_client_error_for_400_response(self):
|
|
resp = mock.MagicMock()
|
|
resp.status_code = 400
|
|
self.assertRaises(exceptions.HTTPClientError,
|
|
self.httpclient._check_status_code, resp)
|
|
|
|
|
|
class WhenTestingGetErrorMessage(TestClient):
|
|
|
|
def test_gets_error_message_from_title_in_json(self):
|
|
resp = mock.MagicMock()
|
|
resp.json.return_value = {'title': 'test_text'}
|
|
msg = self.httpclient._get_error_message(resp)
|
|
self.assertEqual('test_text', msg)
|
|
|
|
def test_gets_error_message_from_content_when_no_json(self):
|
|
resp = mock.MagicMock()
|
|
resp.json.side_effect = ValueError()
|
|
resp.content = content = 'content'
|
|
msg = self.httpclient._get_error_message(resp)
|
|
self.assertEqual(content, msg)
|
|
|
|
def test_gets_error_message_from_description_in_json(self):
|
|
resp = mock.MagicMock()
|
|
resp.json.return_value = {'title': 'test_text',
|
|
'description': 'oopsie'}
|
|
msg = self.httpclient._get_error_message(resp)
|
|
self.assertEqual('test_text: oopsie', msg)
|
|
|
|
|
|
class BaseEntityResource(TestClient):
|
|
|
|
def _setUp(self, entity, entity_id='abcd1234-eabc-5678-9abc-abcdef012345'):
|
|
# TODO(dmendiza) Why are we calling super().setUp() from _setUp()?
|
|
super(BaseEntityResource, self).setUp()
|
|
|
|
self.entity = entity
|
|
self.entity_id = entity_id
|
|
self.entity_base = self.endpoint + "/v1/" + self.entity
|
|
self.entity_href = self.entity_base + "/" + self.entity_id
|
|
self.entity_payload_href = self.entity_href + "/payload"
|
|
|
|
self.client = client.Client(endpoint=self.endpoint,
|
|
project_id=self.project_id)
|
|
|
|
|
|
class WhenTestingClientMicroversion(TestClient):
|
|
def _create_mock_session(
|
|
self, requested_version, server_max_version, server_min_version,
|
|
endpoint):
|
|
sess = mock_session()
|
|
|
|
mock_session_get_endpoint(sess, get_version_endpoint(endpoint))
|
|
mock_session_get(
|
|
sess, get_server_supported_versions(
|
|
server_min_version, server_max_version))
|
|
|
|
return sess
|
|
|
|
def _test_client_creation_with_endpoint(
|
|
self, requested_version, server_max_version, server_min_version,
|
|
endpoint):
|
|
sess = self._create_mock_session(
|
|
requested_version, server_max_version, server_min_version,
|
|
endpoint)
|
|
|
|
client.Client(session=sess, microversion=requested_version)
|
|
|
|
headers = {
|
|
'Accept': 'application/json',
|
|
'OpenStack-API-Version': 'key-manager 1.1'
|
|
}
|
|
|
|
sess.get.assert_called_with(
|
|
get_version_endpoint(endpoint), headers=headers,
|
|
authenticated=None)
|
|
|
|
def _mock_session_and_get_client(
|
|
self, requested_version, server_max_version, server_min_version,
|
|
endpoint=None):
|
|
sess = self._create_mock_session(
|
|
requested_version, server_max_version, server_min_version,
|
|
endpoint)
|
|
|
|
return client.Client(session=sess, microversion=requested_version)
|
|
|
|
def test_fails_when_requesting_invalid_microversion(self):
|
|
self.assertRaises(TypeError,
|
|
client.Client, session=self.session,
|
|
endpoint=self.endpoint, project_id=self.project_id,
|
|
microversion="a")
|
|
|
|
def test_fails_when_requesting_unsupported_microversion(self):
|
|
self.assertRaises(UnsupportedVersion,
|
|
client.Client, session=self.session,
|
|
endpoint=self.endpoint, project_id=self.project_id,
|
|
microversion="1.9")
|
|
|
|
def test_fails_when_requesting_unsupported_version(self):
|
|
self.assertRaises(UnsupportedVersion,
|
|
client.Client, session=self.session,
|
|
endpoint=self.endpoint, project_id=self.project_id,
|
|
version="v0")
|
|
|
|
def test_passes_without_providing_endpoint(self):
|
|
requested_version = None
|
|
server_max_version = (1, 1)
|
|
server_min_version = (1, 0)
|
|
endpoint = None
|
|
|
|
self._test_client_creation_with_endpoint(
|
|
requested_version, server_max_version, server_min_version,
|
|
endpoint)
|
|
|
|
def test_passes_with_custom_endpoint(self):
|
|
requested_version = None
|
|
server_max_version = (1, 1)
|
|
server_min_version = (1, 0)
|
|
endpoint = self.endpoint
|
|
|
|
self._test_client_creation_with_endpoint(
|
|
requested_version, server_max_version, server_min_version,
|
|
endpoint)
|
|
|
|
def test_passes_with_default_microversion_as_1_1(self):
|
|
requested_version = None
|
|
server_max_version = (1, 1)
|
|
server_min_version = (1, 0)
|
|
|
|
c = self._mock_session_and_get_client(
|
|
requested_version, server_max_version, server_min_version)
|
|
|
|
self.assertEqual("1.1", c.client.microversion)
|
|
|
|
def test_passes_with_default_microversion_as_1_0(self):
|
|
requested_version = None
|
|
server_max_version = (1, 0)
|
|
server_min_version = (1, 0)
|
|
|
|
c = self._mock_session_and_get_client(
|
|
requested_version, server_max_version, server_min_version)
|
|
|
|
self.assertEqual("1.0", c.client.microversion)
|
|
|
|
def test_fails_requesting_higher_microversion_than_supported_by_server(
|
|
self):
|
|
requested_version = "1.1"
|
|
server_max_version = (1, 0)
|
|
server_min_version = (1, 0)
|
|
|
|
sess = self._create_mock_session(
|
|
requested_version, server_max_version, server_min_version,
|
|
self.endpoint)
|
|
|
|
self.assertRaises(
|
|
UnsupportedVersion, client.Client, session=sess,
|
|
endpoint=self.endpoint, microversion=requested_version)
|
|
|
|
def test_fails_requesting_lower_microversion_than_supported_by_server(
|
|
self):
|
|
requested_version = "1.0"
|
|
server_max_version = (1, 1)
|
|
server_min_version = (1, 1)
|
|
|
|
sess = self._create_mock_session(
|
|
requested_version, server_max_version, server_min_version,
|
|
self.endpoint)
|
|
|
|
self.assertRaises(
|
|
UnsupportedVersion, client.Client, session=sess,
|
|
endpoint=self.endpoint, microversion=requested_version)
|
|
|
|
def test_passes_with_stable_server_version(self):
|
|
requested_version = "1.0"
|
|
server_max_version = None
|
|
server_min_version = None
|
|
|
|
c = self._mock_session_and_get_client(
|
|
requested_version, server_max_version, server_min_version)
|
|
|
|
self.assertEqual(requested_version, c.client.microversion)
|