Merge "Add tests for Service Rest API"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
2720b8fe0f
|
|
@ -33,7 +33,11 @@ _ = _LI = _LW = _LE = _LC = lambda x: x
|
|||
|
||||
|
||||
class ServicePatchType(v1_base.K8sPatchType):
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def internal_attrs():
|
||||
defaults = v1_base.K8sPatchType.internal_attrs()
|
||||
return defaults + ['/selector', '/port', '/ip']
|
||||
|
||||
|
||||
class Service(v1_base.K8sResourceBase):
|
||||
|
|
@ -47,7 +51,7 @@ class Service(v1_base.K8sResourceBase):
|
|||
ip = wtypes.text
|
||||
"""IP of this service"""
|
||||
|
||||
port = wtypes.IntegerType()
|
||||
port = wsme.wsattr(wtypes.IntegerType(), readonly=True)
|
||||
"""Port of this service"""
|
||||
|
||||
links = wsme.wsattr([link.Link], readonly=True)
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ class TestPatch(api_base.FunctionalTest):
|
|||
|
||||
def test_replace_bay_uuid(self):
|
||||
another_bay = obj_utils.create_test_bay(self.context,
|
||||
uuid=utils.generate_uuid())
|
||||
uuid=utils.generate_uuid())
|
||||
response = self.patch_json('/pods/%s' % self.pod.uuid,
|
||||
[{'path': '/bay_uuid',
|
||||
'value': another_bay.uuid,
|
||||
|
|
|
|||
|
|
@ -9,85 +9,306 @@
|
|||
# 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 magnum.conductor import api
|
||||
|
||||
import datetime
|
||||
|
||||
import mock
|
||||
from oslo.config import cfg
|
||||
from oslo.utils import timeutils
|
||||
from six.moves.urllib import parse as urlparse
|
||||
from wsme import types as wtypes
|
||||
|
||||
from magnum.api.controllers.v1 import service as api_service
|
||||
from magnum.common import utils
|
||||
from magnum.conductor import api as rpcapi
|
||||
from magnum import objects
|
||||
from magnum.tests.db import base as db_base
|
||||
from magnum.tests.db import utils as db_utils
|
||||
|
||||
from mock import patch
|
||||
from magnum.tests.api import base as api_base
|
||||
from magnum.tests.api import utils as apiutils
|
||||
from magnum.tests import base
|
||||
from magnum.tests.objects import utils as obj_utils
|
||||
|
||||
|
||||
class TestServiceController(db_base.DbTestCase):
|
||||
class TestServiceObject(base.TestCase):
|
||||
|
||||
def mock_service_create(self, service):
|
||||
def test_service_init(self):
|
||||
service_dict = apiutils.service_post_data(bay_uuid=None)
|
||||
del service_dict['uuid']
|
||||
service = api_service.Service(**service_dict)
|
||||
self.assertEqual(wtypes.Unset, service.uuid)
|
||||
|
||||
|
||||
class TestListService(api_base.FunctionalTest):
|
||||
|
||||
def setUp(self):
|
||||
super(TestListService, self).setUp()
|
||||
obj_utils.create_test_bay(self.context)
|
||||
|
||||
def test_empty(self):
|
||||
response = self.get_json('/services')
|
||||
self.assertEqual([], response['services'])
|
||||
|
||||
def _assert_service_fields(self, service):
|
||||
service_fields = ['name', 'bay_uuid', 'name', 'labels', 'selector',
|
||||
'ip', 'port']
|
||||
for field in service_fields:
|
||||
self.assertIn(field, service)
|
||||
|
||||
def test_one(self):
|
||||
service = obj_utils.create_test_service(self.context)
|
||||
response = self.get_json('/services')
|
||||
self.assertEqual(service.uuid, response['services'][0]["uuid"])
|
||||
self._assert_service_fields(response['services'][0])
|
||||
|
||||
def test_get_one(self):
|
||||
service = obj_utils.create_test_service(self.context)
|
||||
response = self.get_json('/services/%s' % service['uuid'])
|
||||
self.assertEqual(service.uuid, response['uuid'])
|
||||
self._assert_service_fields(response)
|
||||
|
||||
def test_detail(self):
|
||||
service = obj_utils.create_test_service(self.context)
|
||||
response = self.get_json('/services/detail')
|
||||
self.assertEqual(service.uuid, response['services'][0]["uuid"])
|
||||
self._assert_service_fields(response['services'][0])
|
||||
|
||||
def test_detail_against_single(self):
|
||||
service = obj_utils.create_test_service(self.context)
|
||||
response = self.get_json('/services/%s/detail' % service['uuid'],
|
||||
expect_errors=True)
|
||||
self.assertEqual(404, response.status_int)
|
||||
|
||||
def test_many(self):
|
||||
service_list = []
|
||||
for id_ in range(5):
|
||||
service = obj_utils.create_test_service(self.context, id=id_,
|
||||
uuid=utils.generate_uuid())
|
||||
service_list.append(service.uuid)
|
||||
response = self.get_json('/services')
|
||||
self.assertEqual(len(service_list), len(response['services']))
|
||||
uuids = [s['uuid'] for s in response['services']]
|
||||
self.assertEqual(sorted(service_list), sorted(uuids))
|
||||
|
||||
def test_links(self):
|
||||
uuid = utils.generate_uuid()
|
||||
obj_utils.create_test_service(self.context, id=1, uuid=uuid)
|
||||
response = self.get_json('/services/%s' % uuid)
|
||||
self.assertIn('links', response.keys())
|
||||
self.assertEqual(2, len(response['links']))
|
||||
self.assertIn(uuid, response['links'][0]['href'])
|
||||
for l in response['links']:
|
||||
bookmark = l['rel'] == 'bookmark'
|
||||
self.assertTrue(self.validate_link(l['href'], bookmark=bookmark))
|
||||
|
||||
def test_collection_links(self):
|
||||
for id_ in range(5):
|
||||
obj_utils.create_test_service(self.context, id=id_,
|
||||
uuid=utils.generate_uuid())
|
||||
response = self.get_json('/services/?limit=3')
|
||||
self.assertEqual(3, len(response['services']))
|
||||
|
||||
next_marker = response['services'][-1]['uuid']
|
||||
self.assertIn(next_marker, response['next'])
|
||||
|
||||
def test_collection_links_default_limit(self):
|
||||
cfg.CONF.set_override('max_limit', 3, 'api')
|
||||
for id_ in range(5):
|
||||
obj_utils.create_test_service(self.context, id=id_,
|
||||
uuid=utils.generate_uuid())
|
||||
response = self.get_json('/services')
|
||||
self.assertEqual(3, len(response['services']))
|
||||
|
||||
next_marker = response['services'][-1]['uuid']
|
||||
self.assertIn(next_marker, response['next'])
|
||||
|
||||
|
||||
class TestPatch(api_base.FunctionalTest):
|
||||
|
||||
def setUp(self):
|
||||
super(TestPatch, self).setUp()
|
||||
self.bay = obj_utils.create_test_bay(self.context,
|
||||
uuid=utils.generate_uuid())
|
||||
self.bay2 = obj_utils.create_test_bay(self.context,
|
||||
uuid=utils.generate_uuid())
|
||||
self.service = obj_utils.create_test_service(self.context,
|
||||
bay_uuid=self.bay.uuid)
|
||||
|
||||
def test_replace_bay_uuid(self):
|
||||
response = self.patch_json('/services/%s' % self.service.uuid,
|
||||
[{'path': '/bay_uuid',
|
||||
'value': self.bay2.uuid,
|
||||
'op': 'replace'}],
|
||||
expect_errors=True)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(200, response.status_code)
|
||||
|
||||
def test_replace_non_existent_bay_uuid(self):
|
||||
response = self.patch_json('/services/%s' % self.service.uuid,
|
||||
[{'path': '/bay_uuid',
|
||||
'value': utils.generate_uuid(),
|
||||
'op': 'replace'}],
|
||||
expect_errors=True)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(400, response.status_code)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
def test_replace_internal_field(self):
|
||||
response = self.patch_json('/services/%s' % self.service.uuid,
|
||||
[{'path': '/labels', 'value': {}, 'op': 'replace'}],
|
||||
expect_errors=True)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(400, response.status_code)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
def test_replace_non_existent_service(self):
|
||||
response = self.patch_json('/services/%s' % utils.generate_uuid(),
|
||||
[{'path': '/bay_uuid',
|
||||
'value': self.bay2.uuid,
|
||||
'op': 'replace'}],
|
||||
expect_errors=True)
|
||||
self.assertEqual(404, response.status_int)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
def test_add_non_existent_property(self):
|
||||
response = self.patch_json('/services/%s' % self.service.uuid,
|
||||
[{'path': '/foo', 'value': 'bar', 'op': 'add'}],
|
||||
expect_errors=True)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(400, response.status_int)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
def test_remove_uuid(self):
|
||||
response = self.patch_json('/services/%s' % self.service.uuid,
|
||||
[{'path': '/uuid', 'op': 'remove'}],
|
||||
expect_errors=True)
|
||||
self.assertEqual(400, response.status_int)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
def test_remove_bay_uuid(self):
|
||||
response = self.patch_json('/services/%s' % self.service.uuid,
|
||||
[{'path': '/bay_uuid', 'op': 'remove'}],
|
||||
expect_errors=True)
|
||||
self.assertEqual(400, response.status_int)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
def test_remove_internal_field(self):
|
||||
response = self.patch_json('/services/%s' % self.service.uuid,
|
||||
[{'path': '/labels', 'op': 'remove'}],
|
||||
expect_errors=True)
|
||||
self.assertEqual(400, response.status_int)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
def test_remove_non_existent_property(self):
|
||||
response = self.patch_json('/services/%s' % self.service.uuid,
|
||||
[{'path': '/non-existent', 'op': 'remove'}],
|
||||
expect_errors=True)
|
||||
self.assertEqual(400, response.status_code)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
|
||||
class TestPost(api_base.FunctionalTest):
|
||||
|
||||
def setUp(self):
|
||||
super(TestPost, self).setUp()
|
||||
obj_utils.create_test_bay(self.context)
|
||||
p = mock.patch.object(rpcapi.API, 'service_create')
|
||||
self.mock_service_create = p.start()
|
||||
self.mock_service_create.side_effect = (
|
||||
self._simulate_rpc_service_create)
|
||||
self.addCleanup(p.stop)
|
||||
|
||||
def _simulate_rpc_service_create(self, service):
|
||||
service.create()
|
||||
return service
|
||||
|
||||
def mock_service_destroy(self, uuid):
|
||||
service = objects.Service.get_by_uuid({}, uuid)
|
||||
@mock.patch.object(timeutils, 'utcnow')
|
||||
def test_create_service(self, mock_utcnow):
|
||||
sdict = apiutils.service_post_data()
|
||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||
mock_utcnow.return_value = test_time
|
||||
|
||||
response = self.post_json('/services', sdict)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(201, response.status_int)
|
||||
# Check location header
|
||||
self.assertIsNotNone(response.location)
|
||||
expected_location = '/v1/services/%s' % sdict['uuid']
|
||||
self.assertEqual(urlparse.urlparse(response.location).path,
|
||||
expected_location)
|
||||
|
||||
response = self.get_json('/services/%s' % sdict['uuid'])
|
||||
self.assertEqual(sdict['uuid'], response['uuid'])
|
||||
self.assertFalse(response['updated_at'])
|
||||
return_created_at = timeutils.parse_isotime(
|
||||
response['created_at']).replace(tzinfo=None)
|
||||
self.assertEqual(test_time, return_created_at)
|
||||
|
||||
def test_create_service_doesnt_contain_id(self):
|
||||
with mock.patch.object(self.dbapi, 'create_service',
|
||||
wraps=self.dbapi.create_service) as cc_mock:
|
||||
sdict = apiutils.service_post_data()
|
||||
self.post_json('/services', sdict)
|
||||
cc_mock.assert_called_once_with(mock.ANY)
|
||||
# Check that 'id' is not in first arg of positional args
|
||||
self.assertNotIn('id', cc_mock.call_args[0][0])
|
||||
|
||||
def test_create_service_generate_uuid(self):
|
||||
sdict = apiutils.service_post_data()
|
||||
del sdict['uuid']
|
||||
|
||||
response = self.post_json('/services', sdict)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(201, response.status_int)
|
||||
|
||||
response = self.get_json('/services')
|
||||
self.assertTrue(utils.is_uuid_like(response['services'][0]['uuid']))
|
||||
|
||||
def test_create_service_no_bay_uuid(self):
|
||||
sdict = apiutils.service_post_data()
|
||||
del sdict['bay_uuid']
|
||||
response = self.post_json('/services', sdict, expect_errors=True)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(400, response.status_int)
|
||||
|
||||
def test_create_service_with_non_existent_bay_uuid(self):
|
||||
sdict = apiutils.service_post_data(bay_uuid=utils.generate_uuid())
|
||||
response = self.post_json('/services', sdict, expect_errors=True)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(400, response.status_int)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
|
||||
class TestDelete(api_base.FunctionalTest):
|
||||
|
||||
def setUp(self):
|
||||
super(TestDelete, self).setUp()
|
||||
obj_utils.create_test_bay(self.context)
|
||||
self.service = obj_utils.create_test_service(self.context)
|
||||
p = mock.patch.object(rpcapi.API, 'service_delete')
|
||||
self.mock_service_delete = p.start()
|
||||
self.mock_service_delete.side_effect = (
|
||||
self._simulate_rpc_service_delete)
|
||||
self.addCleanup(p.stop)
|
||||
|
||||
def _simulate_rpc_service_delete(self, service_uuid):
|
||||
service = objects.Service.get_by_uuid(self.context, service_uuid)
|
||||
service.destroy()
|
||||
|
||||
def test_service_api(self):
|
||||
with patch.object(api.API, 'service_create') as mock_method:
|
||||
mock_method.side_effect = self.mock_service_create
|
||||
# Create a bay
|
||||
bay = db_utils.create_test_bay()
|
||||
def test_delete_service(self):
|
||||
self.delete('/services/%s' % self.service.uuid)
|
||||
response = self.get_json('/services/%s' % self.service.uuid,
|
||||
expect_errors=True)
|
||||
self.assertEqual(404, response.status_int)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
||||
# Create a service
|
||||
params = '''
|
||||
{
|
||||
"bay_uuid": "%s",
|
||||
"manifest": "\
|
||||
{\
|
||||
\\"id\\": \\"service_foo\\",\
|
||||
\\"kind\\": \\"Service\\",\
|
||||
\\"apiVersion\\": \\"v1beta1\\",\
|
||||
\\"port\\": 88,\
|
||||
\\"selector\\": {\
|
||||
\\"bar\\": \\"foo\\"\
|
||||
},\
|
||||
\\"labels\\": {\
|
||||
\\"bar\\": \\"foo\\"\
|
||||
}\
|
||||
}\
|
||||
\"
|
||||
}
|
||||
''' % bay.uuid
|
||||
response = self.app.post('/v1/services',
|
||||
params=params,
|
||||
content_type='application/json')
|
||||
self.assertEqual(response.status_int, 201)
|
||||
# Get all services
|
||||
response = self.app.get('/v1/services')
|
||||
self.assertEqual(response.status_int, 200)
|
||||
self.assertEqual(1, len(response.json))
|
||||
c = response.json['services'][0]
|
||||
self.assertIsNotNone(c.get('uuid'))
|
||||
self.assertEqual('service_foo', c.get('name'))
|
||||
self.assertEqual(bay.uuid, c.get('bay_uuid'))
|
||||
self.assertEqual('foo', c.get('labels')['bar'])
|
||||
self.assertEqual('foo', c.get('selector')['bar'])
|
||||
self.assertEqual(88, c.get('port'))
|
||||
|
||||
# Get just the one we created
|
||||
response = self.app.get('/v1/services/%s' % c.get('uuid'))
|
||||
self.assertEqual(response.status_int, 200)
|
||||
|
||||
# Update the description
|
||||
params = [{'path': '/port',
|
||||
'value': '8888',
|
||||
'op': 'replace'}]
|
||||
response = self.app.patch_json('/v1/services/%s' % c.get('uuid'),
|
||||
params=params)
|
||||
self.assertEqual(response.status_int, 200)
|
||||
|
||||
with patch.object(api.API, 'service_delete') as mock_method:
|
||||
mock_method.side_effect = self.mock_service_destroy
|
||||
# Delete the service we created
|
||||
response = self.app.delete('/v1/services/%s' % c.get('uuid'))
|
||||
self.assertEqual(response.status_int, 204)
|
||||
|
||||
response = self.app.get('/v1/services')
|
||||
self.assertEqual(response.status_int, 200)
|
||||
c = response.json['services']
|
||||
self.assertEqual(0, len(c))
|
||||
def test_delete_service_not_found(self):
|
||||
uuid = utils.generate_uuid()
|
||||
response = self.delete('/services/%s' % uuid, expect_errors=True)
|
||||
self.assertEqual(404, response.status_int)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertTrue(response.json['error_message'])
|
||||
|
|
@ -18,6 +18,7 @@ Utils for testing the API service.
|
|||
from magnum.api.controllers.v1 import bay as bay_controller
|
||||
from magnum.api.controllers.v1 import baymodel as baymodel_controller
|
||||
from magnum.api.controllers.v1 import pod as pod_controller
|
||||
from magnum.api.controllers.v1 import service as service_controller
|
||||
from magnum.tests.db import utils
|
||||
|
||||
|
||||
|
|
@ -49,4 +50,23 @@ def pod_post_data(**kw):
|
|||
}
|
||||
}'''
|
||||
internal = pod_controller.PodPatchType.internal_attrs()
|
||||
return remove_internal(pod, internal)
|
||||
return remove_internal(pod, internal)
|
||||
|
||||
|
||||
def service_post_data(**kw):
|
||||
service = utils.get_test_service(**kw)
|
||||
if 'manifest' not in service:
|
||||
service['manifest'] = '''{
|
||||
"id": "service_foo",
|
||||
"kind": "Service",
|
||||
"apiVersion": "v1beta1",
|
||||
"port": 88,
|
||||
"selector": {
|
||||
"bar": "foo"
|
||||
},
|
||||
"labels": {
|
||||
"bar": "foo"
|
||||
}
|
||||
}'''
|
||||
internal = service_controller.ServicePatchType.internal_attrs()
|
||||
return remove_internal(service, internal)
|
||||
Loading…
Reference in New Issue