From cac328d1c431f61bb81ea607d35859599b7ac6b5 Mon Sep 17 00:00:00 2001 From: Ryan Rossiter Date: Fri, 28 Aug 2015 18:39:19 +0000 Subject: [PATCH] Add UNKNOWN constant to container statuses The container API would set the status of a container to 'Unknown' if there was an exception when retrieving the container. This status should be contained as a constant (as with all other container constants). This change adds an UNKNOWN constant to the container object module, and changes the API to use that constant instead of the hard-coded string. Change-Id: I7cec02e2e8b8619bd2fcba4ba867ec8b21ad5afe Closes-Bug: #1489996 --- magnum/api/controllers/v1/container.py | 2 +- magnum/objects/container.py | 1 + magnum/tests/unit/api/controllers/v1/test_container.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/magnum/api/controllers/v1/container.py b/magnum/api/controllers/v1/container.py index 8fb502addb..7b52ce68cc 100644 --- a/magnum/api/controllers/v1/container.py +++ b/magnum/api/controllers/v1/container.py @@ -291,7 +291,7 @@ class ContainersController(rest.RestController): LOG.exception(_LE("Error while list container %(uuid)s: " "%(e)s."), {'uuid': c.uuid, 'e': e}) - containers[i].status = 'Unknown' + containers[i].status = objects.container.UNKNOWN return ContainerCollection.convert_with_links(containers, limit, url=resource_url, diff --git a/magnum/objects/container.py b/magnum/objects/container.py index fefd460f40..84716892db 100644 --- a/magnum/objects/container.py +++ b/magnum/objects/container.py @@ -24,6 +24,7 @@ ERROR = 'Error' RUNNING = 'Running' STOPPED = 'Stopped' PAUSED = 'Paused' +UNKNOWN = 'Unknown' @base.MagnumObjectRegistry.register diff --git a/magnum/tests/unit/api/controllers/v1/test_container.py b/magnum/tests/unit/api/controllers/v1/test_container.py index f815ffb429..a1a49b0270 100644 --- a/magnum/tests/unit/api/controllers/v1/test_container.py +++ b/magnum/tests/unit/api/controllers/v1/test_container.py @@ -253,7 +253,7 @@ class TestContainerController(api_base.FunctionalTest): test_container['uuid']) self.assertEqual(actual_containers[0].get('status'), - 'Unknown') + objects.container.UNKNOWN) @patch('magnum.conductor.api.API.container_show') @patch('magnum.objects.Container.get_by_uuid')