diff options
| author | Yun Mao <yunmao@gmail.com> | 2012-05-24 21:51:57 -0400 |
|---|---|---|
| committer | Yun Mao <yunmao@gmail.com> | 2012-05-29 10:16:59 -0400 |
| commit | 5b85997e33aa749ece94edebaaefefe71b899561 (patch) | |
| tree | da5aedf4131803b153d2c4ed2fb76cf2d86aada1 /nova/tests | |
| parent | d7e613dabc2dbc28d9405a5b450dc2b4dfa9d47b (diff) | |
cleanup power state (partially implements bp task-management)
Removed duplicate and invalid state in power_state:
FAILED, SHUTOFF, BLOCKED
This is the first step in cleaning up nova state machine
and do better task management (bp/task-management)
http://wiki.openstack.org/VMState
Change-Id: I586b9058fada5efd468870fb187590fc0e37aa8f
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/baremetal/test_proxy_bare_metal.py | 14 | ||||
| -rw-r--r-- | nova/tests/test_libvirt.py | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/nova/tests/baremetal/test_proxy_bare_metal.py b/nova/tests/baremetal/test_proxy_bare_metal.py index 5b9900265..423d96da7 100644 --- a/nova/tests/baremetal/test_proxy_bare_metal.py +++ b/nova/tests/baremetal/test_proxy_bare_metal.py @@ -174,18 +174,14 @@ class BareMetalDomTestCase(test.TestCase): """Check to see that all entries in the domain list are removed except for the one that is in the running state""" - fake_file = StringIO.StringIO() - domains = [dict(node_id=1, name='i-00000001', status=power_state.NOSTATE), dict(node_id=2, name='i-00000002', status=power_state.RUNNING), - dict(node_id=3, name='i-00000003', status=power_state.BLOCKED), - dict(node_id=4, name='i-00000004', status=power_state.PAUSED), - dict(node_id=5, name='i-00000005', status=power_state.SHUTDOWN), - dict(node_id=6, name='i-00000006', status=power_state.SHUTOFF), - dict(node_id=7, name='i-00000007', status=power_state.CRASHED), - dict(node_id=8, name='i-00000008', status=power_state.SUSPENDED), - dict(node_id=9, name='i-00000009', status=power_state.FAILED)] + dict(node_id=3, name='i-00000003', status=power_state.PAUSED), + dict(node_id=5, name='i-00000004', status=power_state.SHUTDOWN), + dict(node_id=7, name='i-00000005', status=power_state.CRASHED), + dict(node_id=8, name='i-00000006', status=power_state.SUSPENDED), + dict(node_id=9, name='i-00000007', status=power_state.NOSTATE)] # Create the mock objects self.mox.StubOutWithMock(dom, 'read_domains') diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 9ba45481c..f4ad8b1f8 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -2577,7 +2577,7 @@ class LibvirtConnectionTestCase(test.TestCase): elif instance['name'] == "running": return {'state': power_state.RUNNING} else: - return {'state': power_state.SHUTOFF} + return {'state': power_state.SHUTDOWN} self.stubs.Set(self.libvirtconnection, 'get_info', fake_get_info) |