summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/api/openstack/common.py2
-rw-r--r--nova/tests/api/openstack/compute/test_servers.py2
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):