From 65cffd3bae5d5f6531ff8ac330b663687bcda3c4 Mon Sep 17 00:00:00 2001 From: Thao Nguyen Date: Tue, 29 Sep 2015 11:14:00 -0400 Subject: [PATCH] Migrated versions_client.py from tempest This migrates the above files from tempest. This includes tempest commits: * versions.py: I70294329870de46b2c4c8775a1d7920bee403954 * versions_client.py: I70294329870de46b2c4c8775a1d7920bee403954 to see the commit history for these files refer to the above Change-Ids in the tempest repository Partially implements blueprint migrate-service-clients-to-tempest-lib Change-Id: I41ec60e12a155ee80f3a1825405bdd6e1ec82425 --- .../response/compute/v2_1/versions.py | 110 ++++++++++++++++++ .../services/compute/versions_client.py | 55 +++++++++ 2 files changed, 165 insertions(+) create mode 100644 tempest_lib/api_schema/response/compute/v2_1/versions.py create mode 100644 tempest_lib/services/compute/versions_client.py diff --git a/tempest_lib/api_schema/response/compute/v2_1/versions.py b/tempest_lib/api_schema/response/compute/v2_1/versions.py new file mode 100644 index 0000000..08a9fab --- /dev/null +++ b/tempest_lib/api_schema/response/compute/v2_1/versions.py @@ -0,0 +1,110 @@ +# Copyright 2015 NEC Corporation. All rights reserved. +# +# 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 copy + + +_version = { + 'type': 'object', + 'properties': { + 'id': {'type': 'string'}, + 'links': { + 'type': 'array', + 'items': { + 'type': 'object', + 'properties': { + 'href': {'type': 'string', 'format': 'uri'}, + 'rel': {'type': 'string'}, + 'type': {'type': 'string'}, + }, + 'required': ['href', 'rel'], + 'additionalProperties': False + } + }, + 'status': {'type': 'string'}, + 'updated': {'type': 'string', 'format': 'date-time'}, + 'version': {'type': 'string'}, + 'min_version': {'type': 'string'}, + 'media-types': { + 'type': 'array', + 'properties': { + 'base': {'type': 'string'}, + 'type': {'type': 'string'}, + } + }, + }, + # NOTE: version and min_version have been added since Kilo, + # so they should not be required. + # NOTE(sdague): media-types only shows up in single version requests. + 'required': ['id', 'links', 'status', 'updated'], + 'additionalProperties': False +} + +list_versions = { + 'status_code': [200], + 'response_body': { + 'type': 'object', + 'properties': { + 'versions': { + 'type': 'array', + 'items': _version + } + }, + 'required': ['versions'], + 'additionalProperties': False + } +} + + +_detail_get_version = copy.deepcopy(_version) +_detail_get_version['properties'].pop('min_version') +_detail_get_version['properties'].pop('version') +_detail_get_version['properties'].pop('updated') +_detail_get_version['properties']['media-types'] = { + 'type': 'array', + 'items': { + 'type': 'object', + 'properties': { + 'base': {'type': 'string'}, + 'type': {'type': 'string'} + } + } +} +_detail_get_version['required'] = ['id', 'links', 'status', 'media-types'] + +get_version = { + 'status_code': [300], + 'response_body': { + 'type': 'object', + 'properties': { + 'choices': { + 'type': 'array', + 'items': _detail_get_version + } + }, + 'required': ['choices'], + 'additionalProperties': False + } +} + +get_one_version = { + 'status_code': [200], + 'response_body': { + 'type': 'object', + 'properties': { + 'version': _version + }, + 'additionalProperties': False + } +} diff --git a/tempest_lib/services/compute/versions_client.py b/tempest_lib/services/compute/versions_client.py new file mode 100644 index 0000000..4b7273d --- /dev/null +++ b/tempest_lib/services/compute/versions_client.py @@ -0,0 +1,55 @@ +# Copyright (c) 2015 Hewlett-Packard Development Company, L.P. +# +# 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 oslo_serialization import jsonutils as json +from six.moves import urllib + +from tempest_lib.api_schema.response.compute.v2_1 import versions as schema +from tempest_lib.common import rest_client + + +class VersionsClient(rest_client.RestClient): + + def _get_base_version_url(self): + # NOTE: The URL which is gotten from keystone's catalog contains + # API version and project-id like "v2/{project-id}", but we need + # to access the URL which doesn't contain them for getting API + # versions. For that, here should use raw_request() instead of + # get(). + endpoint = self.base_url + url = urllib.parse.urlparse(endpoint) + return '%s://%s/' % (url.scheme, url.netloc) + + def list_versions(self): + version_url = self._get_base_version_url() + resp, body = self.raw_request(version_url, 'GET') + body = json.loads(body) + self.validate_response(schema.list_versions, resp, body) + return rest_client.ResponseBody(resp, body) + + def get_version_by_url(self, version_url): + """Get the version document by url. + + This gets the version document for a url, useful in testing + the contents of things like /v2/ or /v2.1/ in Nova. That + controller needs authenticated access, so we have to get + ourselves a token before making the request. + + """ + # we need a token for this request + resp, body = self.raw_request(version_url, 'GET', + {'X-Auth-Token': self.token}) + body = json.loads(body) + self.validate_response(schema.get_one_version, resp, body) + return rest_client.ResponseBody(resp, body)