openstack
/
magnum
Code Issues Proposed changes

Use proper rpcapi in Containers API 

The Containers API wasn't using the rpcapi constructed by pecan
and thus any rpc calls included incorrect contexts. This patch
replaces the backend_api calls with the proper pecan.request.rpcapi
calls.

Change-Id: Idc5d6a2a8099b8d574fca825d9f1578b6b705580
Closes-bug: #1447248
This commit is contained in:
Andrew Melton 2015-04-22 14:35:34 -04:00
parent 14ff11c017
commit b0f46abcf9
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
magnum/api/controllers/v1/container.py
View File

@ -26,9 +26,7 @@ from magnum.api.controllers import link
from magnum.api.controllers.v1 import collection from magnum.api.controllers.v1 import collection
from magnum.api.controllers.v1 import types from magnum.api.controllers.v1 import types
from magnum.api.controllers.v1 import utils as api_utils from magnum.api.controllers.v1 import utils as api_utils
from magnum.common import context as magnum_context
from magnum.common import exception from magnum.common import exception
from magnum.conductor import api
from magnum import objects from magnum import objects
from magnum.openstack.common import log as logging from magnum.openstack.common import log as logging
@ -152,8 +150,6 @@ class ContainerCollection(collection.Collection):
sample.containers = [Container.sample(expand=False)] sample.containers = [Container.sample(expand=False)]
return sample return sample
backend_api = api.API(context=magnum_context.RequestContext())
class StartController(object): class StartController(object):
@wsme_pecan.wsexpose(wtypes.text, wtypes.text) @wsme_pecan.wsexpose(wtypes.text, wtypes.text)
@ -161,9 +157,9 @@ class StartController(object):
if pecan.request.method != 'PUT': if pecan.request.method != 'PUT':
pecan.abort(405, ('HTTP method %s is not allowed' pecan.abort(405, ('HTTP method %s is not allowed'
% pecan.request.method)) % pecan.request.method))
LOG.debug('Calling backend_api.container_start with %s' % LOG.debug('Calling conductor.container_start with %s' %
container_uuid) container_uuid)
return backend_api.container_start(container_uuid) return pecan.request.rpcapi.container_start(container_uuid)
class StopController(object): class StopController(object):
@ -172,9 +168,9 @@ class StopController(object):
if pecan.request.method != 'PUT': if pecan.request.method != 'PUT':
pecan.abort(405, ('HTTP method %s is not allowed' pecan.abort(405, ('HTTP method %s is not allowed'
% pecan.request.method)) % pecan.request.method))
LOG.debug('Calling backend_api.container_stop with %s' % LOG.debug('Calling conductor.container_stop with %s' %
container_uuid) container_uuid)
return backend_api.container_stop(container_uuid) return pecan.request.rpcapi.container_stop(container_uuid)
class RebootController(object): class RebootController(object):
@ -183,9 +179,9 @@ class RebootController(object):
if pecan.request.method != 'PUT': if pecan.request.method != 'PUT':
pecan.abort(405, ('HTTP method %s is not allowed' pecan.abort(405, ('HTTP method %s is not allowed'
% pecan.request.method)) % pecan.request.method))
LOG.debug('Calling backend_api.container_reboot with %s' % LOG.debug('Calling conductor.container_reboot with %s' %
container_uuid) container_uuid)
return backend_api.container_reboot(container_uuid) return pecan.request.rpcapi.container_reboot(container_uuid)
class PauseController(object): class PauseController(object):
@ -194,9 +190,9 @@ class PauseController(object):
if pecan.request.method != 'PUT': if pecan.request.method != 'PUT':
pecan.abort(405, ('HTTP method %s is not allowed' pecan.abort(405, ('HTTP method %s is not allowed'
% pecan.request.method)) % pecan.request.method))
LOG.debug('Calling backend_api.container_pause with %s' % LOG.debug('Calling conductor.container_pause with %s' %
container_uuid) container_uuid)
return backend_api.container_pause(container_uuid) return pecan.request.rpcapi.container_pause(container_uuid)
class UnpauseController(object): class UnpauseController(object):
@ -205,9 +201,9 @@ class UnpauseController(object):
if pecan.request.method != 'PUT': if pecan.request.method != 'PUT':
pecan.abort(405, ('HTTP method %s is not allowed' pecan.abort(405, ('HTTP method %s is not allowed'
% pecan.request.method)) % pecan.request.method))
LOG.debug('Calling backend_api.container_unpause with %s' % LOG.debug('Calling conductor.container_unpause with %s' %
container_uuid) container_uuid)
return backend_api.container_unpause(container_uuid) return pecan.request.rpcapi.container_unpause(container_uuid)
class LogsController(object): class LogsController(object):
@ -216,9 +212,9 @@ class LogsController(object):
if pecan.request.method != 'GET': if pecan.request.method != 'GET':
pecan.abort(405, ('HTTP method %s is not allowed' pecan.abort(405, ('HTTP method %s is not allowed'
% pecan.request.method)) % pecan.request.method))
LOG.debug('Calling backend_api.container_logs with %s' % LOG.debug('Calling conductor.container_logs with %s' %
container_uuid) container_uuid)
return backend_api.container_logs(container_uuid) return pecan.request.rpcapi.container_logs(container_uuid)
class ExecuteController(object): class ExecuteController(object):
@ -227,9 +223,9 @@ class ExecuteController(object):
if pecan.request.method != 'PUT': if pecan.request.method != 'PUT':
pecan.abort(405, ('HTTP method %s is not allowed' pecan.abort(405, ('HTTP method %s is not allowed'
% pecan.request.method)) % pecan.request.method))
LOG.debug('Calling backend_api.container_execute with %s command %s' LOG.debug('Calling conductor.container_execute with %s command %s'
% (container_uuid, command)) % (container_uuid, command))
return backend_api.container_execute(container_uuid, command) return pecan.request.rpcapi.container_execute(container_uuid, command)
class ContainersController(rest.RestController): class ContainersController(rest.RestController):
@ -342,9 +338,9 @@ class ContainersController(rest.RestController):
container_dict['user_id'] = auth_token['user']['id'] container_dict['user_id'] = auth_token['user']['id']
new_container = objects.Container(context, **container_dict) new_container = objects.Container(context, **container_dict)
new_container.create() new_container.create()
res_container = backend_api.container_create(new_container.name, res_container = pecan.request.rpcapi.container_create(
new_container.uuid, new_container.name, new_container.uuid,
new_container) new_container)
# Set the HTTP Location Header # Set the HTTP Location Header
pecan.response.location = link.build_url('containers', pecan.response.location = link.build_url('containers',
@ -395,7 +391,7 @@ class ContainersController(rest.RestController):
if self.from_containers: if self.from_containers:
raise exception.OperationNotPermitted raise exception.OperationNotPermitted
backend_api.container_delete(container_uuid) pecan.request.rpcapi.container_delete(container_uuid)
rpc_container = objects.Container.get_by_uuid(pecan.request.context, rpc_container = objects.Container.get_by_uuid(pecan.request.context,
container_uuid) container_uuid)
rpc_container.destroy() rpc_container.destroy()

11
magnum/tests/unit/api/controllers/v1/test_container.py
View File

@ -118,6 +118,15 @@ class TestContainerController(db_base.DbTestCase):
c = response.json['containers'] c = response.json['containers']
self.assertEqual(0, len(c)) self.assertEqual(0, len(c))
self.assertTrue(mock_container_create.called)
self.assertTrue(mock_container_start.called)
self.assertTrue(mock_container_stop.called)
self.assertTrue(mock_container_pause.called)
self.assertTrue(mock_container_unpause.called)
self.assertTrue(mock_container_reboot.called)
self.assertTrue(mock_container_logs.called)
self.assertTrue(mock_container_execute.called)
@patch('magnum.objects.bay.Bay.get_by_uuid') @patch('magnum.objects.bay.Bay.get_by_uuid')
@patch('magnum.conductor.api.API.container_create') @patch('magnum.conductor.api.API.container_create')
@patch('magnum.conductor.api.API.container_delete') @patch('magnum.conductor.api.API.container_delete')
@ -155,6 +164,7 @@ class TestContainerController(db_base.DbTestCase):
self.assertEqual(response.status_int, 200) self.assertEqual(response.status_int, 200)
c = response.json['containers'] c = response.json['containers']
self.assertEqual(0, len(c)) self.assertEqual(0, len(c))
self.assertTrue(mock_container_create.called)
@patch('magnum.objects.bay.Bay.get_by_uuid') @patch('magnum.objects.bay.Bay.get_by_uuid')
@patch('magnum.conductor.api.API.container_create') @patch('magnum.conductor.api.API.container_create')
@ -193,3 +203,4 @@ class TestContainerController(db_base.DbTestCase):
self.assertEqual(response.status_int, 200) self.assertEqual(response.status_int, 200)
c = response.json['containers'] c = response.json['containers']
self.assertEqual(0, len(c)) self.assertEqual(0, len(c))
self.assertTrue(mock_container_create.called)