x/python-ganttclient
Code Issues Proposed changes

cleanup power state (partially implements bp task-management)

Browse Source 
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
This commit is contained in:
Yun Mao
2012-05-24 21:51:57 -04:00
parent 65a57a9e5d
commit 37db4c5ae0
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nova/tests/baremetal/test_proxy_bare_metal.py
View File

@@ -174,18 +174,14 @@ class BareMetalDomTestCase(test.TestCase):
"""Check to see that all entries in the domain list are removed """Check to see that all entries in the domain list are removed
except for the one that is in the running state""" except for the one that is in the running state"""
fake_file = StringIO.StringIO()
domains = [dict(node_id=1, name='i-00000001', domains = [dict(node_id=1, name='i-00000001',
status=power_state.NOSTATE), status=power_state.NOSTATE),
dict(node_id=2, name='i-00000002', status=power_state.RUNNING), 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=3, name='i-00000003', status=power_state.PAUSED),
dict(node_id=4, name='i-00000004', status=power_state.PAUSED), dict(node_id=5, name='i-00000004', status=power_state.SHUTDOWN),
dict(node_id=5, name='i-00000005', status=power_state.SHUTDOWN), dict(node_id=7, name='i-00000005', status=power_state.CRASHED),
dict(node_id=6, name='i-00000006', status=power_state.SHUTOFF), dict(node_id=8, name='i-00000006', status=power_state.SUSPENDED),
dict(node_id=7, name='i-00000007', status=power_state.CRASHED), dict(node_id=9, name='i-00000007', status=power_state.NOSTATE)]
dict(node_id=8, name='i-00000008', status=power_state.SUSPENDED),
dict(node_id=9, name='i-00000009', status=power_state.FAILED)]
# Create the mock objects # Create the mock objects
self.mox.StubOutWithMock(dom, 'read_domains') self.mox.StubOutWithMock(dom, 'read_domains')

2
nova/tests/test_libvirt.py
View File

@@ -2577,7 +2577,7 @@ class LibvirtConnectionTestCase(test.TestCase):
elif instance['name'] == "running": elif instance['name'] == "running":
return {'state': power_state.RUNNING} return {'state': power_state.RUNNING}
else: else:
return {'state': power_state.SHUTOFF} return {'state': power_state.SHUTDOWN}
self.stubs.Set(self.libvirtconnection, 'get_info', self.stubs.Set(self.libvirtconnection, 'get_info',
fake_get_info) fake_get_info)