From 9081425fda149a50fc694d3e81768a3c86f14422 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 29 Dec 2014 14:54:31 -0500 Subject: [PATCH] container_delete should call docker.remove_container Change-Id: Ied3f4817c8698af6931cd03f102804d35dc1f409 --- magnum/api/controllers/v1/container.py | 1 + magnum/conductor/handlers/docker_conductor.py | 2 +- magnum/tests/api/controllers/v1/test_container.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/magnum/api/controllers/v1/container.py b/magnum/api/controllers/v1/container.py index 8754c54bc3..7a65ea5cb9 100644 --- a/magnum/api/controllers/v1/container.py +++ b/magnum/api/controllers/v1/container.py @@ -401,6 +401,7 @@ class ContainersController(rest.RestController): if self.from_containers: raise exception.OperationNotPermitted + backend_api.container_delete(container_uuid) rpc_container = objects.Container.get_by_uuid(pecan.request.context, container_uuid) rpc_container.destroy() diff --git a/magnum/conductor/handlers/docker_conductor.py b/magnum/conductor/handlers/docker_conductor.py index b75d606926..4cdae41a4d 100644 --- a/magnum/conductor/handlers/docker_conductor.py +++ b/magnum/conductor/handlers/docker_conductor.py @@ -148,7 +148,7 @@ class Handler(object): def container_delete(self, ctxt, container_uuid): LOG.debug("container_delete %s" % container_uuid) docker_id = self._find_container_by_name(container_uuid) - return self.docker.stop(docker_id) + return self.docker.remove_container(docker_id) def container_show(self, ctxt, container_uuid): LOG.debug("container_show %s" % container_uuid) diff --git a/magnum/tests/api/controllers/v1/test_container.py b/magnum/tests/api/controllers/v1/test_container.py index 4cad4821cd..a63f685d67 100644 --- a/magnum/tests/api/controllers/v1/test_container.py +++ b/magnum/tests/api/controllers/v1/test_container.py @@ -16,6 +16,7 @@ from mock import patch class TestContainerController(db_base.DbTestCase): @patch('magnum.conductor.api.API.container_create') + @patch('magnum.conductor.api.API.container_delete') @patch('magnum.conductor.api.API.container_start') @patch('magnum.conductor.api.API.container_stop') @patch('magnum.conductor.api.API.container_pause') @@ -31,6 +32,7 @@ class TestContainerController(db_base.DbTestCase): mock_container_pause, mock_container_stop, mock_container_start, + mock_container_delete, mock_container_create): mock_container_create.side_effect = lambda x, y, z: z mock_container_start.return_value = None