From 16ad8207bf590939d53808b7352cf4f3d2e524b8 Mon Sep 17 00:00:00 2001 From: Jay Lau Date: Mon, 22 Dec 2014 09:37:59 -0500 Subject: [PATCH] Implement container_list Change-Id: Ic2e72c04f37095a0cf731465bdf6fb8db0058e53 --- magnum/api/controllers/v1/container.py | 4 +++- magnum/conductor/api.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/magnum/api/controllers/v1/container.py b/magnum/api/controllers/v1/container.py index b18039ac4b..d2d3c2b4e3 100644 --- a/magnum/api/controllers/v1/container.py +++ b/magnum/api/controllers/v1/container.py @@ -27,6 +27,7 @@ from magnum.api.controllers.v1 import collection from magnum.api.controllers.v1 import types from magnum.api.controllers.v1 import utils as api_utils from magnum.common import exception +from magnum.conductor import api from magnum import objects @@ -231,7 +232,8 @@ class ContainersController(rest.RestController): marker_obj = objects.Container.get_by_uuid(pecan.request.context, marker) - containers = objects.Container.list(pecan.request.context, limit, + backend_api = api.API(context=pecan.request.context) + containers = backend_api.container_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 b2ed78936a..370a46a31c 100644 --- a/magnum/conductor/api.py +++ b/magnum/conductor/api.py @@ -92,8 +92,9 @@ class API(rpc_service.API): def container_create(self, uuid, container): return self._call('container_create', container=container) - def container_list(self): - return self._call('container_list') + def container_list(self, context, limit, marker, sort_key, sort_dir): + return objects.Container.list(context, limit, marker, sort_key, + sort_dir) def container_delete(self, uuid): return self._call('container_delete', uuid=uuid)