openstack
/
magnum
Code Issues Proposed changes

Merge "Update rc manifest parsing according to v1beta3"

This commit is contained in:
Jenkins 2015-05-10 18:12:59 +00:00 committed by Gerrit Code Review
parent 2704710e28 4d7a38d3af
commit 6f63be260e
3 changed files with 88 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
magnum/api/controllers/v1/replicationcontroller.py
View File

@ -98,10 +98,35 @@ class ReplicationController(v1_base.K8sResourceBase):
replicas=2,
manifest_url='file:///tmp/rc.yaml',
manifest='''{
"id": "name_of_rc",
"replicas": 3,
"labels": {
"foo": "foo1"
"metadata": {
"name": "name_of_rc"
},
"spec":{
"replicas":2,
"selector":{
"name":"frontend"
},
"template":{
"metadata":{
"labels":{
"name":"frontend"
}
},
"spec":{
"containers":[
{
"name":"test-redis",
"image":"steak/for-dinner",
"ports":[
{
"containerPort":80,
"protocol":"TCP"
}
]
}
]
}
}
}
}''',
created_at=datetime.datetime.utcnow(),
@ -114,14 +139,34 @@ class ReplicationController(v1_base.K8sResourceBase):
except ValueError as e:
raise exception.InvalidParameterValue(message=str(e))
try:
self.name = manifest["id"]
except KeyError:
self.name = manifest["metadata"]["name"]
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"'id' can't be empty in manifest.")
if "labels" in manifest:
self.labels = manifest["labels"]
if "replicas" in manifest:
self.replicas = manifest["replicas"]
"Field metadata['name'] can't be empty in manifest.")
try:
self.replicas = manifest["spec"]["replicas"]
except (KeyError, TypeError):
pass
try:
self.selector = manifest["spec"]["selector"]
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"Field spec['selector'] can't be empty in manifest.")
try:
self.labels = manifest["spec"]["template"]["metadata"]["labels"]
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"Field spec['template']['metadata']['labels'] "
"can't be empty in manifest.")
try:
images = []
for cont in manifest["spec"]["template"]["spec"]["containers"]:
images.append(cont["image"])
self.images = images
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"Field spec['template']['spec']['containers'] "
"can't be empty in manifest.")
class ReplicationControllerCollection(collection.Collection):

2
magnum/tests/unit/api/controllers/v1/test_replicationcontroller.py
View File

@ -379,7 +379,7 @@ class TestPost(api_base.FunctionalTest):
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'])
rc_dict = apiutils.rc_post_data()
response = self.post_json('/rcs', rc_dict)
self.assertEqual(rc_dict['images'], response.json['images'])
cc_mock.assert_called_once_with(mock.ANY)

37
magnum/tests/unit/api/utils.py
View File

@ -86,12 +86,37 @@ 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"
}
}'''
"metadata": {
"name": "name_of_rc"
},
"spec":{
"replicas":2,
"selector":{
"name":"frontend"
},
"template":{
"metadata":{
"labels":{
"name":"frontend"
}
},
"spec":{
"containers":[
{
"name":"test-redis",
"image":"steak/for-dinner",
"ports":[
{
"containerPort":80,
"protocol":"TCP"
}
]
}
]
}
}
}
}'''
internal = rc_controller.ReplicationControllerPatchType.internal_attrs()
return remove_internal(rc, internal)