diff --git a/tempest_lib/api_schema/response/compute/v2_1/floating_ips.py b/tempest_lib/api_schema/response/compute/v2_1/floating_ips.py new file mode 100644 index 0000000..f24fb50 --- /dev/null +++ b/tempest_lib/api_schema/response/compute/v2_1/floating_ips.py @@ -0,0 +1,148 @@ +# Copyright 2014 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. + +from tempest_lib.api_schema.response.compute.v2_1 import parameter_types + +common_floating_ip_info = { + 'type': 'object', + 'properties': { + # NOTE: Now the type of 'id' is integer, but + # here allows 'string' also because we will be + # able to change it to 'uuid' in the future. + 'id': {'type': ['integer', 'string']}, + 'pool': {'type': ['string', 'null']}, + 'instance_id': {'type': ['string', 'null']}, + 'ip': parameter_types.ip_address, + 'fixed_ip': parameter_types.ip_address + }, + 'additionalProperties': False, + 'required': ['id', 'pool', 'instance_id', + 'ip', 'fixed_ip'], + +} +list_floating_ips = { + 'status_code': [200], + 'response_body': { + 'type': 'object', + 'properties': { + 'floating_ips': { + 'type': 'array', + 'items': common_floating_ip_info + }, + }, + 'additionalProperties': False, + 'required': ['floating_ips'], + } +} + +create_get_floating_ip = { + 'status_code': [200], + 'response_body': { + 'type': 'object', + 'properties': { + 'floating_ip': common_floating_ip_info + }, + 'additionalProperties': False, + 'required': ['floating_ip'], + } +} + +list_floating_ip_pools = { + 'status_code': [200], + 'response_body': { + 'type': 'object', + 'properties': { + 'floating_ip_pools': { + 'type': 'array', + 'items': { + 'type': 'object', + 'properties': { + 'name': {'type': 'string'} + }, + 'additionalProperties': False, + 'required': ['name'], + } + } + }, + 'additionalProperties': False, + 'required': ['floating_ip_pools'], + } +} + +add_remove_floating_ip = { + 'status_code': [202] +} + +create_floating_ips_bulk = { + 'status_code': [200], + 'response_body': { + 'type': 'object', + 'properties': { + 'floating_ips_bulk_create': { + 'type': 'object', + 'properties': { + 'interface': {'type': ['string', 'null']}, + 'ip_range': {'type': 'string'}, + 'pool': {'type': ['string', 'null']}, + }, + 'additionalProperties': False, + 'required': ['interface', 'ip_range', 'pool'], + } + }, + 'additionalProperties': False, + 'required': ['floating_ips_bulk_create'], + } +} + +delete_floating_ips_bulk = { + 'status_code': [200], + 'response_body': { + 'type': 'object', + 'properties': { + 'floating_ips_bulk_delete': {'type': 'string'} + }, + 'additionalProperties': False, + 'required': ['floating_ips_bulk_delete'], + } +} + +list_floating_ips_bulk = { + 'status_code': [200], + 'response_body': { + 'type': 'object', + 'properties': { + 'floating_ip_info': { + 'type': 'array', + 'items': { + 'type': 'object', + 'properties': { + 'address': parameter_types.ip_address, + 'instance_uuid': {'type': ['string', 'null']}, + 'interface': {'type': ['string', 'null']}, + 'pool': {'type': ['string', 'null']}, + 'project_id': {'type': ['string', 'null']}, + 'fixed_ip': parameter_types.ip_address + }, + 'additionalProperties': False, + # NOTE: fixed_ip is introduced after JUNO release, + # So it is not defined as 'required'. + 'required': ['address', 'instance_uuid', 'interface', + 'pool', 'project_id'], + } + } + }, + 'additionalProperties': False, + 'required': ['floating_ip_info'], + } +} diff --git a/tempest_lib/services/compute/floating_ip_pools_client.py b/tempest_lib/services/compute/floating_ip_pools_client.py new file mode 100644 index 0000000..b95e761 --- /dev/null +++ b/tempest_lib/services/compute/floating_ip_pools_client.py @@ -0,0 +1,34 @@ +# Copyright 2012 OpenStack Foundation +# 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. + +from oslo_serialization import jsonutils as json +from six.moves.urllib import parse as urllib + +from tempest_lib.api_schema.response.compute.v2_1 import floating_ips as schema +from tempest_lib.common import rest_client + + +class FloatingIPPoolsClient(rest_client.RestClient): + + def list_floating_ip_pools(self, params=None): + """Gets all floating IP Pools list.""" + url = 'os-floating-ip-pools' + if params: + url += '?%s' % urllib.urlencode(params) + + resp, body = self.get(url) + body = json.loads(body) + self.validate_response(schema.list_floating_ip_pools, resp, body) + return rest_client.ResponseBody(resp, body) diff --git a/tempest_lib/tests/services/compute/test_floating_ip_pools_client.py b/tempest_lib/tests/services/compute/test_floating_ip_pools_client.py new file mode 100644 index 0000000..21f9c46 --- /dev/null +++ b/tempest_lib/tests/services/compute/test_floating_ip_pools_client.py @@ -0,0 +1,46 @@ +# 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. + +from tempest_lib.services.compute import floating_ip_pools_client +from tempest_lib.tests import fake_auth_provider +from tempest_lib.tests.services.compute import base + + +class TestFloatingIPPoolsClient(base.BaseComputeServiceTest): + + FAKE_FLOATING_IP_POOLS = { + "floating_ip_pools": + [ + {"name": u'\u3042'}, + {"name": u'\u3044'} + ] + } + + def setUp(self): + super(TestFloatingIPPoolsClient, self).setUp() + fake_auth = fake_auth_provider.FakeAuthProvider() + self.client = floating_ip_pools_client.FloatingIPPoolsClient( + fake_auth, 'compute', 'regionOne') + + def test_list_floating_ip_pools_with_str_body(self): + self.check_service_client_function( + self.client.list_floating_ip_pools, + 'tempest_lib.common.rest_client.RestClient.get', + self.FAKE_FLOATING_IP_POOLS) + + def test_list_floating_ip_pools_with_bytes_body(self): + self.check_service_client_function( + self.client.list_floating_ip_pools, + 'tempest_lib.common.rest_client.RestClient.get', + self.FAKE_FLOATING_IP_POOLS, to_utf=True)