vm_states referenced but not being imported into scheduler/manager.py

Deployed devstack yesterday with cinder enabled, Volumes stayed in the creating state due to error in schedular manager

this path was executed as I supplied the incorrect zone(nova should have used cinder) to euca when attaching volume

2012-07-31 09:40:42 DEBUG cinder.openstack.common.rpc.amqp [-] received {u'_context_roles': [u'Member', u'anotherrole', u'admin'], u'_context_request_id': u'req-241b3a05-fba9-455b-a047-8cf716578aa6', u'_context_quota_class': None, u'args': {u'topic': u'cinder-volume', u'snapshot_id': None, u'volume_id': u'87b9977e-92aa-4889-9425-5b1b36f4be78'}, u'_context_auth_token': '<SANITIZED>', u'_context_is_admin': False, u'_context_project_id': u'44bfe0a1b43040dfa9dab439189f36eb', u'_context_timestamp': u'2012-07-31T09:40:42.456224', u'_context_read_deleted': u'no', u'_context_user_id': u'a1fbe650390d468cbbc4cd6a527e0335', u'method': u'create_volume', u'_context_remote_address': u'10.6.197.174'} from (pid=1972) _safe_log /opt/stack/cinder/cinder/openstack/common/rpc/common.py:199
2012-07-31 09:40:42 DEBUG cinder.openstack.common.rpc.amqp [-] unpacked context: {'user_id': u'a1fbe650390d468cbbc4cd6a527e0335', 'roles': [u'Member', u'anotherrole', u'admin'], 'timestamp': u'2012-07-31T09:40:42.456224', 'auth_token': '<SANITIZED>', 'remote_address': u'10.6.197.174', 'quota_class': None, 'is_admin': False, 'request_id': u'req-241b3a05-fba9-455b-a047-8cf716578aa6', 'project_id': u'44bfe0a1b43040dfa9dab439189f36eb', 'read_deleted': u'no'} from (pid=1972) _safe_log /opt/stack/cinder/cinder/openstack/common/rpc/common.py:199
2012-07-31 09:40:42 ERROR cinder.openstack.common.rpc.amqp [-] Exception during message handling
2012-07-31 09:40:42 TRACE cinder.openstack.common.rpc.amqp Traceback (most recent call last):
2012-07-31 09:40:42 TRACE cinder.openstack.common.rpc.amqp File "/opt/stack/cinder/cinder/openstack/common/rpc/amqp.py", line 275, in _process_data
2012-07-31 09:40:42 TRACE cinder.openstack.common.rpc.amqp rval = self.proxy.dispatch(ctxt, version, method, **args)
2012-07-31 09:40:42 TRACE cinder.openstack.common.rpc.amqp File "/opt/stack/cinder/cinder/openstack/common/rpc/dispatcher.py", line 145, in dispatch
2012-07-31 09:40:42 TRACE cinder.openstack.common.rpc.amqp return getattr(proxyobj, method)(ctxt, **kwargs)
2012-07-31 09:40:42 TRACE cinder.openstack.common.rpc.amqp File "/opt/stack/cinder/cinder/scheduler/manager.py", line 101, in _schedule
2012-07-31 09:40:42 TRACE cinder.openstack.common.rpc.amqp {'vm_state': vm_states.ERROR},
2012-07-31 09:40:42 TRACE cinder.openstack.common.rpc.amqp NameError: global name 'vm_states' is not defined
2012-07-31 09:40:42 TRACE cinder.openstack.common.rpc.amqp

We need to import vm_states from nova or created our own in cinder/common