Add tests for Replication Controller Rest API
Partially implements: blueprint increase-test-coverage Change-Id: I949566c8726c8d28b141c1a1497d365b34667426
This commit is contained in:
Hongbin Lu
parent
63040c95d8
commit
266573036b
|
|
@ -31,7 +31,11 @@ from magnum import objects
|
|||
|
||||
|
||||
class ReplicationControllerPatchType(v1_base.K8sPatchType):
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def internal_attrs():
|
||||
defaults = v1_base.K8sPatchType.internal_attrs()
|
||||
return defaults + ['/replicas']
|
||||
|
||||
|
||||
class ReplicationController(v1_base.K8sResourceBase):
|
||||
|
|
@ -93,7 +97,7 @@ class ReplicationController(v1_base.K8sResourceBase):
|
|||
labels={'name': 'foo'},
|
||||
replicas=2,
|
||||
manifest_url='file:///tmp/rc.yaml',
|
||||
replicationcontroller_data='''{
|
||||
manifest='''{
|
||||
"id": "name_of_rc",
|
||||
"replicas": 3,
|
||||
"labels": {
|
||||
|
|
@ -273,8 +277,8 @@ class ReplicationControllersController(rest.RestController):
|
|||
# ignore manifest_url as it was used for create rc
|
||||
if field == 'manifest_url':
|
||||
continue
|
||||
# ignore replicationcontroller_data as it was used for create rc
|
||||
if field == 'replicationcontroller_data':
|
||||
# ignore manifest as it was used for create rc
|
||||
if field == 'manifest':
|
||||
continue
|
||||
try:
|
||||
patch_val = getattr(rc, field)
|
||||
|
|
|
|||
|
|
@ -9,70 +9,352 @@
|
|||
# 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 replicationcontroller as api_rc
|
||||
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 TestRCController(db_base.DbTestCase):
|
||||
def mock_rc_create(self, rc):
|
||||
rc.create()
|
||||
class TestRCObject(base.TestCase):
|
||||
|
||||
def test_rc_init(self):
|
||||
rc_dict = apiutils.rc_post_data(bay_uuid=None)
|
||||
del rc_dict['images']
|
||||
rc = api_rc.ReplicationController(**rc_dict)
|
||||
self.assertEqual(wtypes.Unset, rc.images)
|
||||
|
||||
|
||||
class TestListRC(api_base.FunctionalTest):
|
||||
|
||||
def setUp(self):
|
||||
super(TestListRC, self).setUp()
|
||||
obj_utils.create_test_bay(self.context)
|
||||
|
||||
def test_empty(self):
|
||||
response = self.get_json('/rcs')
|
||||
self.assertEqual([], response['rcs'])
|
||||
|
||||
def _assert_rc_fields(self, rc):
|
||||
rc_fields = ['name', 'bay_uuid', 'name', 'images', 'labels',
|
||||
'replicas']
|
||||
for field in rc_fields:
|
||||
self.assertIn(field, rc)
|
||||
|
||||
def test_one(self):
|
||||
rc = obj_utils.create_test_rc(self.context)
|
||||
response = self.get_json('/rcs')
|
||||
self.assertEqual(rc.uuid, response['rcs'][0]["uuid"])
|
||||
self._assert_rc_fields(response['rcs'][0])
|
||||
|
||||
def test_get_one(self):
|
||||
rc = obj_utils.create_test_rc(self.context)
|
||||
response = self.get_json('/rcs/%s' % rc['uuid'])
|
||||
self.assertEqual(rc.uuid, response['uuid'])
|
||||
self._assert_rc_fields(response)
|
||||
|
||||
def test_detail(self):
|
||||
rc = obj_utils.create_test_rc(self.context)
|
||||
response = self.get_json('/rcs/detail')
|
||||
self.assertEqual(rc.uuid, response['rcs'][0]["uuid"])
|
||||
self._assert_rc_fields(response['rcs'][0])
|
||||
|
||||
def test_detail_against_single(self):
|
||||
rc = obj_utils.create_test_rc(self.context)
|
||||
response = self.get_json('/rcs/%s/detail' % rc['uuid'],
|
||||
expect_errors=True)
|
||||
self.assertEqual(404, response.status_int)
|
||||
|
||||
def test_many(self):
|
||||
rc_list = []
|
||||
for id_ in range(5):
|
||||
rc = obj_utils.create_test_rc(self.context, id=id_,
|
||||
uuid=utils.generate_uuid())
|
||||
rc_list.append(rc.uuid)
|
||||
response = self.get_json('/rcs')
|
||||
self.assertEqual(len(rc_list), len(response['rcs']))
|
||||
uuids = [r['uuid'] for r in response['rcs']]
|
||||
self.assertEqual(sorted(rc_list), sorted(uuids))
|
||||
|
||||
def test_links(self):
|
||||
uuid = utils.generate_uuid()
|
||||
obj_utils.create_test_rc(self.context, id=1, uuid=uuid)
|
||||
response = self.get_json('/rcs/%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_rc(self.context, id=id_,
|
||||
uuid=utils.generate_uuid())
|
||||
response = self.get_json('/rcs/?limit=3')
|
||||
self.assertEqual(3, len(response['rcs']))
|
||||
|
||||
next_marker = response['rcs'][-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_rc(self.context, id=id_,
|
||||
uuid=utils.generate_uuid())
|
||||
response = self.get_json('/rcs')
|
||||
self.assertEqual(3, len(response['rcs']))
|
||||
|
||||
next_marker = response['rcs'][-1]['uuid']
|
||||
self.assertIn(next_marker, response['next'])
|
||||
|
||||
|
||||
class TestPatch(api_base.FunctionalTest):
|
||||
|
||||
def setUp(self):
|
||||
super(TestPatch, self).setUp()
|
||||
obj_utils.create_test_bay(self.context)
|
||||
self.rc = obj_utils.create_test_rc(self.context,
|
||||
images=['rc_example_A_image'])
|
||||
|
||||
@mock.patch.object(timeutils, 'utcnow')
|
||||
def test_replace_ok(self, mock_utcnow):
|
||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||
mock_utcnow.return_value = test_time
|
||||
|
||||
new_image = 'rc_example_B_image'
|
||||
response = self.get_json('/rcs/%s' % self.rc.uuid)
|
||||
self.assertNotEqual(new_image, response['images'][0])
|
||||
|
||||
response = self.patch_json('/rcs/%s' % self.rc.uuid,
|
||||
[{'path': '/images/0',
|
||||
'value': new_image,
|
||||
'op': 'replace'}])
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(200, response.status_code)
|
||||
|
||||
response = self.get_json('/rcs/%s' % self.rc.uuid)
|
||||
self.assertEqual(new_image, response['images'][0])
|
||||
return_updated_at = timeutils.parse_isotime(
|
||||
response['updated_at']).replace(tzinfo=None)
|
||||
self.assertEqual(test_time, return_updated_at)
|
||||
|
||||
def test_replace_bay_uuid(self):
|
||||
another_bay = obj_utils.create_test_bay(self.context,
|
||||
uuid=utils.generate_uuid())
|
||||
response = self.patch_json('/rcs/%s' % self.rc.uuid,
|
||||
[{'path': '/bay_uuid',
|
||||
'value': another_bay.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('/rcs/%s' % self.rc.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('/rcs/%s' % self.rc.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_rc(self):
|
||||
response = self.patch_json('/rcs/%s' % utils.generate_uuid(),
|
||||
[{'path': '/images/0',
|
||||
'value': 'rc_example_B_image',
|
||||
'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_ok(self):
|
||||
new_image = 'rc_example_B_image'
|
||||
response = self.patch_json('/rcs/%s' % self.rc.uuid,
|
||||
[{'path': '/images/0',
|
||||
'value': new_image,
|
||||
'op': 'add'}])
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(200, response.status_int)
|
||||
|
||||
response = self.get_json('/rcs/%s' % self.rc.uuid)
|
||||
self.assertEqual(new_image, response['images'][0])
|
||||
|
||||
def test_add_non_existent_property(self):
|
||||
response = self.patch_json('/rcs/%s' % self.rc.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_ok(self):
|
||||
response = self.get_json('/rcs/%s' % self.rc.uuid)
|
||||
self.assertNotEqual(len(response['images']), 0)
|
||||
|
||||
response = self.patch_json('/rcs/%s' % self.rc.uuid,
|
||||
[{'path': '/images', 'op': 'remove'}])
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(200, response.status_code)
|
||||
|
||||
response = self.get_json('/rcs/%s' % self.rc.uuid)
|
||||
self.assertEqual(len(response['images']), 0)
|
||||
|
||||
def test_remove_uuid(self):
|
||||
response = self.patch_json('/rcs/%s' % self.rc.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('/rcs/%s' % self.rc.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('/rcs/%s' % self.rc.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('/rcs/%s' % self.rc.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, 'rc_create')
|
||||
self.mock_rc_create = p.start()
|
||||
self.mock_rc_create.side_effect = self._simulate_rpc_rc_create
|
||||
self.addCleanup(p.stop)
|
||||
|
||||
def _simulate_rpc_rc_create(self, rc):
|
||||
rc.create(self.context)
|
||||
return rc
|
||||
|
||||
def mock_rc_destroy(self, uuid):
|
||||
rc = objects.ReplicationController.get_by_uuid(self.context, uuid)
|
||||
@mock.patch.object(timeutils, 'utcnow')
|
||||
def test_create_rc(self, mock_utcnow):
|
||||
rc_dict = apiutils.rc_post_data()
|
||||
test_time = datetime.datetime(2000, 1, 1, 0, 0)
|
||||
mock_utcnow.return_value = test_time
|
||||
|
||||
response = self.post_json('/rcs', rc_dict)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(201, response.status_int)
|
||||
# Check location header
|
||||
self.assertIsNotNone(response.location)
|
||||
expected_location = '/v1/rcs/%s' % rc_dict['uuid']
|
||||
self.assertEqual(urlparse.urlparse(response.location).path,
|
||||
expected_location)
|
||||
|
||||
response = self.get_json('/rcs/%s' % rc_dict['uuid'])
|
||||
self.assertEqual(rc_dict['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_rc_doesnt_contain_id(self):
|
||||
with mock.patch.object(self.dbapi, 'create_rc',
|
||||
wraps=self.dbapi.create_rc) as cc_mock:
|
||||
rc_dict = apiutils.rc_post_data(images=['rc_example_A_image'])
|
||||
self.post_json('/rcs', rc_dict)
|
||||
response = self.get_json('/rcs/%s' % rc_dict['uuid'])
|
||||
self.assertEqual(rc_dict['images'], response['images'])
|
||||
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_rc_generate_uuid(self):
|
||||
rc_dict = apiutils.rc_post_data()
|
||||
del rc_dict['uuid']
|
||||
|
||||
response = self.post_json('/rcs', rc_dict)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(201, response.status_int)
|
||||
|
||||
response = self.get_json('/rcs')
|
||||
self.assertEqual(rc_dict['images'], response['rcs'][0]['images'])
|
||||
self.assertTrue(utils.is_uuid_like(response['rcs'][0]['uuid']))
|
||||
|
||||
def test_create_rc_no_bay_uuid(self):
|
||||
rc_dict = apiutils.rc_post_data()
|
||||
del rc_dict['bay_uuid']
|
||||
response = self.post_json('/rcs', rc_dict, expect_errors=True)
|
||||
self.assertEqual('application/json', response.content_type)
|
||||
self.assertEqual(400, response.status_int)
|
||||
|
||||
def test_create_rc_with_non_existent_bay_uuid(self):
|
||||
rc_dict = apiutils.rc_post_data(bay_uuid=utils.generate_uuid())
|
||||
response = self.post_json('/rcs', rc_dict, 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.rc = obj_utils.create_test_rc(self.context)
|
||||
p = mock.patch.object(rpcapi.API, 'rc_delete')
|
||||
self.mock_rc_delete = p.start()
|
||||
self.mock_rc_delete.side_effect = self._simulate_rpc_rc_delete
|
||||
self.addCleanup(p.stop)
|
||||
|
||||
def _simulate_rpc_rc_delete(self, rc_uuid):
|
||||
rc = objects.ReplicationController.get_by_uuid(self.context, rc_uuid)
|
||||
rc.destroy()
|
||||
|
||||
def test_rc_api(self):
|
||||
with patch.object(api.API, 'rc_create') as mock_method:
|
||||
mock_method.side_effect = self.mock_rc_create
|
||||
# Create a bay
|
||||
bay = db_utils.create_test_bay()
|
||||
def test_delete_rc(self):
|
||||
self.delete('/rcs/%s' % self.rc.uuid)
|
||||
response = self.get_json('/rcs/%s' % self.rc.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 replication controller
|
||||
params = '''
|
||||
{
|
||||
"bay_uuid": "%s",
|
||||
"manifest": "\
|
||||
{\
|
||||
\\"id\\": \\"name_of_rc\\", \
|
||||
\\"replicas\\": 3, \
|
||||
\\"labels\\": {\
|
||||
\\"foo\\": \\"foo1\\"\
|
||||
}\
|
||||
}\
|
||||
\"
|
||||
}
|
||||
''' % bay.uuid
|
||||
response = self.app.post('/v1/rcs',
|
||||
params=params,
|
||||
content_type='application/json')
|
||||
self.assertEqual(response.status_int, 201)
|
||||
|
||||
# Get all rcs
|
||||
response = self.app.get('/v1/rcs')
|
||||
self.assertEqual(response.status_int, 200)
|
||||
self.assertEqual(1, len(response.json))
|
||||
c = response.json['rcs'][0]
|
||||
self.assertIsNotNone(c.get('uuid'))
|
||||
self.assertEqual('name_of_rc', c.get('name'))
|
||||
self.assertEqual(bay.uuid, c.get('bay_uuid'))
|
||||
self.assertEqual('foo1', c.get('labels')['foo'])
|
||||
|
||||
# Get just the one we created
|
||||
response = self.app.get('/v1/rcs/%s' % c.get('uuid'))
|
||||
self.assertEqual(response.status_int, 200)
|
||||
|
||||
with patch.object(api.API, 'rc_delete') as mock_method:
|
||||
mock_method.side_effect = self.mock_rc_destroy
|
||||
# Delete the rc we created
|
||||
response = self.app.delete('/v1/rcs/%s' % c.get('uuid'))
|
||||
self.assertEqual(response.status_int, 204)
|
||||
|
||||
response = self.app.get('/v1/rcs')
|
||||
self.assertEqual(response.status_int, 200)
|
||||
c = response.json['rcs']
|
||||
self.assertEqual(0, len(c))
|
||||
def test_delete_rc_not_found(self):
|
||||
uuid = utils.generate_uuid()
|
||||
response = self.delete('/rcs/%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 replicationcontroller as rc_controller
|
||||
from magnum.api.controllers.v1 import service as service_controller
|
||||
from magnum.tests.db import utils
|
||||
|
||||
|
|
@ -69,4 +70,18 @@ def service_post_data(**kw):
|
|||
}
|
||||
}'''
|
||||
internal = service_controller.ServicePatchType.internal_attrs()
|
||||
return remove_internal(service, internal)
|
||||
return remove_internal(service, internal)
|
||||
|
||||
|
||||
def rc_post_data(**kw):
|
||||
rc = utils.get_test_rc(**kw)
|
||||
if 'manifest' not in rc:
|
||||
rc['manifest'] = '''{
|
||||
"id": "name_of_rc",
|
||||
"replicas": 3,
|
||||
"labels": {
|
||||
"foo": "foo1"
|
||||
}
|
||||
}'''
|
||||
internal = rc_controller.ReplicationControllerPatchType.internal_attrs()
|
||||
return remove_internal(rc, internal)
|
||||
|
|
@ -194,7 +194,7 @@ def get_test_rc(**kw):
|
|||
'project_id': kw.get('project_id', 'fake_project'),
|
||||
'user_id': kw.get('user_id', 'fake_user'),
|
||||
'images': kw.get('images', ['steak/for-dinner']),
|
||||
'bay_uuid': kw.get('bay_uuid', '10a47dd1-4874-4298-91cf-eff046dbdb8e'),
|
||||
'bay_uuid': kw.get('bay_uuid', '5d12f6fd-a196-4bf0-ae4c-1f639a523a52'),
|
||||
'labels': kw.get('labels', {'name': 'foo'}),
|
||||
'replicas': kw.get('replicas', 3),
|
||||
'manifest_url': kw.get('file:///tmp/rc.yaml'),
|
||||
|
|
|
|||
Loading…
Reference in New Issue