diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-29 18:58:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-29 18:58:22 +0000 |
| commit | 1a4cb537e402a9cfb8f2a007c4033b2da90828f6 (patch) | |
| tree | 39186981d170f370cc40e999ffd8bfb92e0901ca | |
| parent | 74bd0b751500801ec0311b115d8248541db0df70 (diff) | |
| parent | f1451da5447a9af97cf6a7bbcd608195883de014 (diff) | |
| download | nova-1a4cb537e402a9cfb8f2a007c4033b2da90828f6.tar.gz nova-1a4cb537e402a9cfb8f2a007c4033b2da90828f6.tar.xz nova-1a4cb537e402a9cfb8f2a007c4033b2da90828f6.zip | |
Merge "OS API should return SHUTOFF, not STOPPED"
| -rw-r--r-- | nova/api/openstack/common.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/test_servers.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index 4dbfa51ff..b8e013f98 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -61,7 +61,7 @@ _STATE_MAP = { 'default': 'BUILD', }, vm_states.STOPPED: { - 'default': 'STOPPED', + 'default': 'SHUTOFF', }, vm_states.RESIZED: { 'default': 'VERIFY_RESIZE', diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 91a3ef68d..ca5efe6c3 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -1404,7 +1404,7 @@ class ServerStatusTest(test.TestCase): def test_stopped(self): response = self._get_with_state(vm_states.STOPPED) - self.assertEqual(response['server']['status'], 'STOPPED') + self.assertEqual(response['server']['status'], 'SHUTOFF') class ServersControllerCreateTest(test.TestCase): |