Migrated interfaces_client.py from tempest
This migrates the above files from tempest. This includes tempest commits: * interfaces_client.py: Idacc612bfed3d5a4abd58c8a987f68675b948f86 * test_interfaces_client.py: I976fd1d91dc3db4006f32b30e859981120487b0b * interfaces.py: I64883306235dc3b90a3a878674532f77d825d5c4 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: I758cf64ba1e6f760a60ed253cb9a8c9bc75ba73b
This commit is contained in:
Reedip Banerjee
parent
9a68f4d125
commit
0cbcb9fa9a
|
|
@ -0,0 +1,73 @@
|
|||
# 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
|
||||
|
||||
interface_common_info = {
|
||||
'type': 'object',
|
||||
'properties': {
|
||||
'port_state': {'type': 'string'},
|
||||
'fixed_ips': {
|
||||
'type': 'array',
|
||||
'items': {
|
||||
'type': 'object',
|
||||
'properties': {
|
||||
'subnet_id': {
|
||||
'type': 'string',
|
||||
'format': 'uuid'
|
||||
},
|
||||
'ip_address': parameter_types.ip_address
|
||||
},
|
||||
'additionalProperties': False,
|
||||
'required': ['subnet_id', 'ip_address']
|
||||
}
|
||||
},
|
||||
'port_id': {'type': 'string', 'format': 'uuid'},
|
||||
'net_id': {'type': 'string', 'format': 'uuid'},
|
||||
'mac_addr': parameter_types.mac_address
|
||||
},
|
||||
'additionalProperties': False,
|
||||
'required': ['port_state', 'fixed_ips', 'port_id', 'net_id', 'mac_addr']
|
||||
}
|
||||
|
||||
get_create_interfaces = {
|
||||
'status_code': [200],
|
||||
'response_body': {
|
||||
'type': 'object',
|
||||
'properties': {
|
||||
'interfaceAttachment': interface_common_info
|
||||
},
|
||||
'additionalProperties': False,
|
||||
'required': ['interfaceAttachment']
|
||||
}
|
||||
}
|
||||
|
||||
list_interfaces = {
|
||||
'status_code': [200],
|
||||
'response_body': {
|
||||
'type': 'object',
|
||||
'properties': {
|
||||
'interfaceAttachments': {
|
||||
'type': 'array',
|
||||
'items': interface_common_info
|
||||
}
|
||||
},
|
||||
'additionalProperties': False,
|
||||
'required': ['interfaceAttachments']
|
||||
}
|
||||
}
|
||||
|
||||
delete_interface = {
|
||||
'status_code': [202]
|
||||
}
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
# Copyright 2013 IBM Corp.
|
||||
# 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 tempest_lib.api_schema.response.compute.v2_1 import interfaces as schema
|
||||
from tempest_lib.common import rest_client
|
||||
|
||||
|
||||
class InterfacesClient(rest_client.RestClient):
|
||||
|
||||
def list_interfaces(self, server_id):
|
||||
resp, body = self.get('servers/%s/os-interface' % server_id)
|
||||
body = json.loads(body)
|
||||
self.validate_response(schema.list_interfaces, resp, body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def create_interface(self, server_id, **kwargs):
|
||||
post_body = {'interfaceAttachment': kwargs}
|
||||
post_body = json.dumps(post_body)
|
||||
resp, body = self.post('servers/%s/os-interface' % server_id,
|
||||
body=post_body)
|
||||
body = json.loads(body)
|
||||
self.validate_response(schema.get_create_interfaces, resp, body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def show_interface(self, server_id, port_id):
|
||||
resp, body = self.get('servers/%s/os-interface/%s' % (server_id,
|
||||
port_id))
|
||||
body = json.loads(body)
|
||||
self.validate_response(schema.get_create_interfaces, resp, body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
||||
def delete_interface(self, server_id, port_id):
|
||||
resp, body = self.delete('servers/%s/os-interface/%s' % (server_id,
|
||||
port_id))
|
||||
self.validate_response(schema.delete_interface, resp, body)
|
||||
return rest_client.ResponseBody(resp, body)
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
# 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 interfaces_client
|
||||
from tempest_lib.tests import fake_auth_provider
|
||||
from tempest_lib.tests.services.compute import base
|
||||
|
||||
|
||||
class TestInterfacesClient(base.BaseComputeServiceTest):
|
||||
# Data Values to be used for testing #
|
||||
FAKE_INTERFACE_DATA = {
|
||||
"fixed_ips": [{
|
||||
"ip_address": "192.168.1.1",
|
||||
"subnet_id": "f8a6e8f8-c2ec-497c-9f23-da9616de54ef"
|
||||
}],
|
||||
"mac_addr": "fa:16:3e:4c:2c:30",
|
||||
"net_id": "3cb9bc59-5699-4588-a4b1-b87f96708bc6",
|
||||
"port_id": "ce531f90-199f-48c0-816c-13e38010b442",
|
||||
"port_state": "ACTIVE"}
|
||||
|
||||
FAKE_SHOW_DATA = {
|
||||
"interfaceAttachment": FAKE_INTERFACE_DATA}
|
||||
FAKE_LIST_DATA = {
|
||||
"interfaceAttachments": [FAKE_INTERFACE_DATA]}
|
||||
|
||||
FAKE_SERVER_ID = "ec14c864-096e-4e27-bb8a-2c2b4dc6f3f5"
|
||||
FAKE_PORT_ID = FAKE_SHOW_DATA['interfaceAttachment']['port_id']
|
||||
func2mock = {
|
||||
'delete': 'tempest_lib.common.rest_client.RestClient.delete',
|
||||
'get': 'tempest_lib.common.rest_client.RestClient.get',
|
||||
'post': 'tempest_lib.common.rest_client.RestClient.post'}
|
||||
|
||||
def setUp(self):
|
||||
super(TestInterfacesClient, self).setUp()
|
||||
fake_auth = fake_auth_provider.FakeAuthProvider()
|
||||
self.client = interfaces_client.InterfacesClient(fake_auth,
|
||||
"compute",
|
||||
"regionOne")
|
||||
|
||||
def _test_interface_operation(self, operation="create", bytes_body=False):
|
||||
response_code = 200
|
||||
expected_op = self.FAKE_SHOW_DATA
|
||||
mock_operation = self.func2mock['get']
|
||||
params = {'server_id': self.FAKE_SERVER_ID,
|
||||
'port_id': self.FAKE_PORT_ID}
|
||||
if operation == 'list':
|
||||
expected_op = self.FAKE_LIST_DATA
|
||||
function = self.client.list_interfaces
|
||||
params = {'server_id': self.FAKE_SERVER_ID}
|
||||
elif operation == 'show':
|
||||
function = self.client.show_interface
|
||||
elif operation == 'delete':
|
||||
expected_op = {}
|
||||
mock_operation = self.func2mock['delete']
|
||||
function = self.client.delete_interface
|
||||
response_code = 202
|
||||
else:
|
||||
function = self.client.create_interface
|
||||
mock_operation = self.func2mock['post']
|
||||
|
||||
self.check_service_client_function(
|
||||
function, mock_operation, expected_op,
|
||||
bytes_body, response_code, **params)
|
||||
|
||||
def test_list_interfaces_with_str_body(self):
|
||||
self._test_interface_operation('list')
|
||||
|
||||
def test_list_interfaces_with_bytes_body(self):
|
||||
self._test_interface_operation('list', True)
|
||||
|
||||
def test_show_interface_with_str_body(self):
|
||||
self._test_interface_operation('show')
|
||||
|
||||
def test_show_interface_with_bytes_body(self):
|
||||
self._test_interface_operation('show', True)
|
||||
|
||||
def test_delete_interface_with_str_body(self):
|
||||
self._test_interface_operation('delete')
|
||||
|
||||
def test_delete_interface_with_bytes_body(self):
|
||||
self._test_interface_operation('delete', True)
|
||||
|
||||
def test_create_interface_with_str_body(self):
|
||||
self._test_interface_operation()
|
||||
|
||||
def test_create_interface_with_bytes_body(self):
|
||||
self._test_interface_operation(bytes_body=True)
|
||||
Loading…
Reference in New Issue