diff options
Diffstat (limited to 'nova/tests/compute/test_compute.py')
| -rw-r--r-- | nova/tests/compute/test_compute.py | 119 |
1 files changed, 0 insertions, 119 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index cb404b48d..11c393279 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -35,7 +35,6 @@ from nova import block_device from nova import compute from nova.compute import api as compute_api from nova.compute import flavors -from nova.compute import instance_actions from nova.compute import manager as compute_manager from nova.compute import power_state from nova.compute import rpcapi as compute_rpcapi @@ -273,24 +272,6 @@ class BaseTestCase(test.TestCase): {'fake_zone': [inst['host']]}) return db.instance_create(self.context, inst) - def _create_instance_obj(self, params=None, type_name='m1.tiny'): - """Create a test instance object.""" - instance = instance_obj.Instance() - instance.uuid = uuidutils.generate_uuid() - instance.cell_name = 'api!child' - - def _fake_db_create(_ctxt, inst): - for k, v in inst.items(): - if k == 'security_groups': - setattr(instance, k, v or None) - else: - setattr(instance, k, v) - return instance - - self.stubs.Set(db, 'instance_create', _fake_db_create) - return self._create_fake_instance(params=params, - type_name=type_name) - def _create_instance(self, params=None, type_name='m1.tiny'): """Create a test instance. Returns uuid.""" return self._create_fake_instance(params, type_name=type_name) @@ -5796,106 +5777,6 @@ class ComputeAPITestCase(BaseTestCase): finally: db.instance_destroy(self.context, ref[0]['uuid']) - def test_start(self): - # Undo setUp() stubs (test_compute_cells) - self.stubs.UnsetAll() - instance = self._create_instance_obj() - instance.vm_state = vm_states.STOPPED - - self.mox.StubOutWithMock(instance, 'save') - self.mox.StubOutWithMock(self.compute_api, - '_record_action_start') - self.mox.StubOutWithMock( - self.compute_api.compute_rpcapi, - 'start_instance') - - instance.save(expected_task_state=None) - self.compute_api._record_action_start(self.context, - instance, instance_actions.START) - self.compute_api.compute_rpcapi.start_instance( - self.context, instance) - - self.mox.ReplayAll() - - self.compute_api.start(self.context, instance) - self.assertEqual(task_states.POWERING_ON, - instance.task_state) - - def test_start_invalid_state(self): - # Undo setUp() stubs (test_compute_cells) - self.stubs.UnsetAll() - instance = self._create_instance_obj() - instance.vm_state = vm_states.ACTIVE - self.assertRaises(exception.InstanceInvalidState, - self.compute_api.start, - self.context, instance) - - def test_start_no_host(self): - # Undo setUp() stubs (test_compute_cells) - self.stubs.UnsetAll() - instance = self._create_instance_obj() - instance.vm_state = vm_states.STOPPED - instance.host = '' - self.assertRaises(exception.InstanceNotReady, - self.compute_api.start, - self.context, instance) - - def test_stop(self): - # Undo setUp() stubs (test_compute_cells) - self.stubs.UnsetAll() - instance = self._create_instance_obj() - instance.task_state = None - # Make sure this gets reset - instance.progress = 99 - - self.mox.StubOutWithMock(instance, 'save') - self.mox.StubOutWithMock(self.compute_api, - '_record_action_start') - self.mox.StubOutWithMock( - self.compute_api.compute_rpcapi, - 'stop_instance') - - instance.save(expected_task_state=None) - self.compute_api._record_action_start(self.context, - instance, instance_actions.STOP) - self.compute_api.compute_rpcapi.stop_instance( - self.context, instance, cast=True) - - self.mox.ReplayAll() - - self.compute_api.stop(self.context, instance) - self.assertEqual(task_states.POWERING_OFF, - instance.task_state) - self.assertEqual(0, instance.progress) - - def test_stop_invalid_state(self): - # Undo setUp() stubs (test_compute_cells) - self.stubs.UnsetAll() - instance = self._create_instance_obj() - instance.vm_state = vm_states.PAUSED - self.assertRaises(exception.InstanceInvalidState, - self.compute_api.stop, - self.context, instance) - - def test_stop_a_stopped_inst(self): - instance = jsonutils.to_primitive(self._create_fake_instance( - {'vm_state': vm_states.STOPPED})) - - self.assertRaises(exception.InstanceInvalidState, - self.compute_api.stop, - self.context, instance) - - db.instance_destroy(self.context, instance['uuid']) - - def test_stop_no_host(self): - # Undo setUp() stubs (test_compute_cells) - self.stubs.UnsetAll() - instance = self._create_instance_obj() - instance.host = '' - self.assertRaises(exception.InstanceNotReady, - self.compute_api.stop, - self.context, instance) - def test_delete(self): instance, instance_uuid = self._run_instance(params={ 'host': CONF.host}) |