diff --git a/magnum/api/controllers/v1/bay.py b/magnum/api/controllers/v1/bay.py index dd441d9932..e2e0054d57 100644 --- a/magnum/api/controllers/v1/bay.py +++ b/magnum/api/controllers/v1/bay.py @@ -211,10 +211,9 @@ class BaysController(rest.RestController): marker_obj = objects.Bay.get_by_uuid(pecan.request.context, marker) - bays = pecan.request.rpcapi.bay_list( - pecan.request.context, limit, - marker_obj, sort_key=sort_key, - sort_dir=sort_dir) + bays = objects.Bay.list(pecan.request.context, limit, + marker_obj, sort_key=sort_key, + sort_dir=sort_dir) return BayCollection.convert_with_links(bays, limit, url=resource_url, diff --git a/magnum/api/controllers/v1/container.py b/magnum/api/controllers/v1/container.py index cd58a4781a..4906c3986f 100644 --- a/magnum/api/controllers/v1/container.py +++ b/magnum/api/controllers/v1/container.py @@ -286,16 +286,21 @@ class ContainersController(rest.RestController): limit = api_utils.validate_limit(limit) sort_dir = api_utils.validate_sort_dir(sort_dir) + filters = None marker_obj = None if marker: marker_obj = objects.Container.get_by_uuid(context, marker) + if bay_ident: + bay_obj = api_utils.get_resource('Bay', bay_ident) + filters = {'bay_uuid': bay_obj.uuid} - containers = pecan.request.rpcapi.container_list(context, limit, - marker_obj, - sort_key=sort_key, - sort_dir=sort_dir, - bay_ident=bay_ident) + containers = objects.Container.list(context, + limit, + marker_obj, + sort_key, + sort_dir, + filters=filters) for i, c in enumerate(containers): try: diff --git a/magnum/api/controllers/v1/magnum_services.py b/magnum/api/controllers/v1/magnum_services.py index fe2a7371fd..80d24730e2 100644 --- a/magnum/api/controllers/v1/magnum_services.py +++ b/magnum/api/controllers/v1/magnum_services.py @@ -92,9 +92,11 @@ class MagnumServiceController(rest.RestController): """Retrieve a list of magnum-services. """ - msvcs = pecan.request.rpcapi.magnum_services_list( - pecan.request.context, limit=None, - marker=None, sort_key='id', - sort_dir='asc') + msvcs = objects.MagnumService.list(pecan.request.context, + limit=None, + marker=None, + sort_key='id', + sort_dir='asc') + return MagnumServiceCollection.convert_db_rec_list_to_collection( self.servicegroup_api, msvcs) diff --git a/magnum/api/controllers/v1/x509keypair.py b/magnum/api/controllers/v1/x509keypair.py index f7fafb20ec..07b92b96ef 100644 --- a/magnum/api/controllers/v1/x509keypair.py +++ b/magnum/api/controllers/v1/x509keypair.py @@ -174,7 +174,7 @@ class X509KeyPairController(rest.RestController): marker_obj = objects.X509KeyPair.get_by_uuid(pecan.request.context, marker) - x509keypairs = pecan.request.rpcapi.x509keypair_list( + x509keypairs = objects.X509KeyPair.list( pecan.request.context, limit, marker_obj, sort_key=sort_key, sort_dir=sort_dir) diff --git a/magnum/conductor/api.py b/magnum/conductor/api.py index 5ee2d79710..55ac12e3ba 100644 --- a/magnum/conductor/api.py +++ b/magnum/conductor/api.py @@ -14,8 +14,6 @@ from oslo_config import cfg from magnum.common import rpc_service -from magnum.conductor import utils as conductor_utils -from magnum import objects # The Backend API class serves as a AMQP client for communicating @@ -36,15 +34,9 @@ class API(rpc_service.API): return self._call('bay_create', bay=bay, bay_create_timeout=bay_create_timeout) - def bay_list(self, context, limit, marker, sort_key, sort_dir): - return objects.Bay.list(context, limit, marker, sort_key, sort_dir) - def bay_delete(self, uuid): return self._call('bay_delete', uuid=uuid) - def bay_show(self, context, uuid): - return objects.Bay.get_by_uuid(context, uuid) - def bay_update(self, bay): return self._call('bay_update', bay=bay) @@ -113,15 +105,6 @@ class API(rpc_service.API): def container_create(self, container): return self._call('container_create', container=container) - def container_list(self, context, limit, marker, sort_key, sort_dir, - bay_ident): - filters = None - if bay_ident is not None: - bay_uuid = conductor_utils.retrieve_bay_uuid(context, bay_ident) - filters = {'bay_uuid': bay_uuid} - return objects.Container.list(context, limit, marker, sort_key, - sort_dir, filters=filters) - def container_delete(self, container_uuid): return self._call('container_delete', container_uuid=container_uuid) @@ -158,9 +141,6 @@ class API(rpc_service.API): def x509keypair_delete(self, uuid): return self._call('x509keypair_delete', uuid=uuid) - def x509keypair_list(self, context, limit, marker, sort_key, sort_dir): - return objects.X509KeyPair.list(context, limit, marker, - sort_key, sort_dir) # CA operations def sign_certificate(self, bay, certificate): @@ -169,11 +149,6 @@ class API(rpc_service.API): def get_ca_certificate(self, bay): return self._call('get_ca_certificate', bay=bay) - # magnum-services - def magnum_services_list(self, context, limit, marker, sort_key, sort_dir): - return objects.MagnumService.list(context, limit, marker, sort_key, - sort_dir) - # Versioned Objects indirection API def object_class_action(self, context, objname, objmethod, objver, diff --git a/magnum/tests/unit/api/controllers/v1/test_container.py b/magnum/tests/unit/api/controllers/v1/test_container.py index 11610834c2..2509203306 100644 --- a/magnum/tests/unit/api/controllers/v1/test_container.py +++ b/magnum/tests/unit/api/controllers/v1/test_container.py @@ -330,7 +330,7 @@ class TestContainerController(api_base.FunctionalTest): actual_containers[0].get('status')) @patch('magnum.conductor.api.API.container_show') - @patch('magnum.conductor.utils.retrieve_bay_uuid') + @patch('magnum.api.utils.get_resource') @patch('magnum.objects.Container.list') def test_get_all_containers_with_bay_ident(self, mock_container_list, mock_retrive_bay_uuid, @@ -338,7 +338,7 @@ class TestContainerController(api_base.FunctionalTest): test_container = utils.get_test_container() containers = [objects.Container(self.context, **test_container)] mock_container_list.return_value = containers - mock_retrive_bay_uuid.return_value = '12' + mock_retrive_bay_uuid.return_value.uuid = '12' mock_container_show.return_value = containers[0] response = self.app.get('/v1/containers/?bay_ident=12') diff --git a/magnum/tests/unit/api/controllers/v1/test_magnum_service.py b/magnum/tests/unit/api/controllers/v1/test_magnum_service.py index d1e1527831..b949962019 100644 --- a/magnum/tests/unit/api/controllers/v1/test_magnum_service.py +++ b/magnum/tests/unit/api/controllers/v1/test_magnum_service.py @@ -14,7 +14,7 @@ import mock from magnum.api.controllers.v1 import magnum_services as mservice from magnum.api import servicegroup as servicegroup -from magnum.conductor import api as rpcapi +from magnum import objects from magnum.tests import base from magnum.tests.unit.api import base as api_base from magnum.tests.unit.api import utils as apiutils @@ -60,7 +60,7 @@ class TestMagnumServiceController(api_base.FunctionalTest): reclist.append(rec) return reclist - @mock.patch.object(rpcapi.API, 'magnum_services_list') + @mock.patch.object(objects.MagnumService, 'list') @mock.patch.object(servicegroup.ServiceGroup, 'service_is_up') def test_get_one(self, svc_up, rpc_patcher): rpc_patcher.return_value = self._rpc_api_reply() @@ -70,7 +70,7 @@ class TestMagnumServiceController(api_base.FunctionalTest): self.assertEqual(1, len(response['mservices'])) self.assertEqual(1, response['mservices'][0]['id']) - @mock.patch.object(rpcapi.API, 'magnum_services_list') + @mock.patch.object(objects.MagnumService, 'list') @mock.patch.object(servicegroup.ServiceGroup, 'service_is_up') def test_get_many(self, svc_up, rpc_patcher): svc_num = 5