x
/
deb-python-tempest-lib
Code Issues Proposed changes

Migrated floating_ip_pools_client.py from tempest 

This migrates the above files from tempest. This includes tempest
commits:

 * floating_ip_pools_client.py     : Icb38fd22c61545cfbe024108a06068ada01afc6b
 * test_floating_ip_pools_client.py: I3ad6761651cec5e66012d08e6b63322f53286a5c
 * floating_ips.py                 : I64883306235dc3b90a3a878674532f77d825d5c4

to see the commit history for these files refer to the above sha1s
in the tempest repository

Partially implements blueprint migrate-service-clients-to-tempest-lib
Change-Id: Iab0f7faca8d23d18061c5b3d13bb8b5e0536025c
This commit is contained in:
Ken'ichi Ohmichi 2015-09-28 07:50:58 +00:00
parent 8b0fe8bc5a
commit 2ac21562d6
3 changed files with 228 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
tempest_lib/api_schema/response/compute/v2_1/floating_ips.py Normal file
View File

@ -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'],
}
}

34
tempest_lib/services/compute/floating_ip_pools_client.py Normal file
View File

@ -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)

46
tempest_lib/tests/services/compute/test_floating_ip_pools_client.py Normal file
View File

@ -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)