From ea3684d2a2e60f19bdea6b3117be613103a605dc Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Mon, 22 Aug 2011 13:16:48 -0400
Subject: Fixes for a number of tests.

---
 nova/compute/api.py              | 3 +++
 nova/compute/task_states.py      | 1 +
 nova/tests/vmwareapi/db_fakes.py | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 3664be5ed..0f993015b 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -36,6 +36,7 @@ from nova import utils
 from nova import volume
 from nova.compute import instance_types
 from nova.compute import power_state
+from nova.compute import task_states
 from nova.compute import vm_states
 from nova.compute.utils import terminate_volumes
 from nova.scheduler import api as scheduler_api
@@ -397,6 +398,8 @@ class API(base.Base):
             updates['display_name'] = "Server %s" % instance_id
             instance['display_name'] = updates['display_name']
         updates['hostname'] = self.hostname_factory(instance)
+        updates['vm_state'] = vm_states.BUILD
+        updates['task_state'] = task_states.SCHEDULING
 
         instance = self.update(context, instance_id, **updates)
         return instance
diff --git a/nova/compute/task_states.py b/nova/compute/task_states.py
index 55466c783..885a30ebe 100644
--- a/nova/compute/task_states.py
+++ b/nova/compute/task_states.py
@@ -17,6 +17,7 @@
 
 """Possible task states for instances"""
 
+SCHEDULING='scheduling'
 BLOCK_DEVICE_MAPPING='block_device_mapping'
 NETWORKING='networking'
 SPAWN='spawn'
diff --git a/nova/tests/vmwareapi/db_fakes.py b/nova/tests/vmwareapi/db_fakes.py
index b046071c7..b56956f96 100644
--- a/nova/tests/vmwareapi/db_fakes.py
+++ b/nova/tests/vmwareapi/db_fakes.py
@@ -67,7 +67,7 @@ def stub_out_db_instance_api(stubs):
             'kernel_id': values['kernel_id'],
             'ramdisk_id': values['ramdisk_id'],
             'vm_state': vm_states.BUILD,
-            'task_state': task_states.SCHEDULE,
+            'task_state': task_states.SCHEDULING,
             'user_id': values['user_id'],
             'project_id': values['project_id'],
             'launch_time': time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()),
-- 
cgit