Merged task_state -> task_states and fixed test_servers test.

7 files changed, 22 insertions, 24 deletions

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index eae0fd916..778c1e514 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -28,7 +28,7 @@ from nova import log as logging
 from nova import quota
 from nova.api.openstack import wsgi
 from nova.compute import vm_states
-from nova.compute import task_state
+from nova.compute import task_states
 
 
 LOG = logging.getLogger('nova.api.openstack.common')
@@ -56,9 +56,9 @@ _STATE_MAP = {
 }
 
 
-def status_from_state(_vm_state, _task_state=None):
+def status_from_state(_vm_state, task_state=None):
     """Given vm_state and task_state, return a status string."""
-    if _vm_state == vm_states.ACTIVE and _task_state == task_state.PASSWORD:
+    if _vm_state == vm_states.ACTIVE and task_state == task_states.PASSWORD:
         return "PASSWORD"
     return _STATE_MAP.get(_vm_state, "UNKNOWN_STATE")
 
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 4be5bdd69..5a4f62b76 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -56,7 +56,7 @@ from nova import rpc
 from nova import utils
 from nova import volume
 from nova.compute import power_state
-from nova.compute import task_state
+from nova.compute import task_states
 from nova.compute import vm_states
 from nova.notifier import api as notifier
 from nova.compute.utils import terminate_volumes
@@ -373,7 +373,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         updates['host'] = self.host
         updates['launched_on'] = self.host
         updates['vm_state'] = vm_states.BUILD
-        updates['task_state'] = task_state.NETWORKING
+        updates['task_state'] = task_states.NETWORKING
         instance = self.db.instance_update(context, instance_id, updates)
         instance['injected_files'] = kwargs.get('injected_files', [])
         instance['admin_pass'] = kwargs.get('admin_password', None)
@@ -398,7 +398,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             self._instance_update(context,
                                   instance_id,
                                   vm_state=vm_states.BUILD,
-                                  task_state=task_state.BLOCK_DEVICE_MAPPING)
+                                  task_state=task_states.BLOCK_DEVICE_MAPPING)
 
             (swap, ephemerals,
              block_device_mapping) = self._setup_block_device_mapping(
@@ -411,7 +411,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
             self._instance_update(context,
                                   instance_id,
-                                  task_state=task_state.SPAWN)
+                                  task_state=task_states.SPAWN)
 
             # TODO(vish) check to make sure the availability zone matches
             try:
@@ -524,7 +524,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                               instance_id,
                               power_state=current_power_state,
                               vm_state=vm_states.REBUILD,
-                              task_state=task_state.REBUILDING)
+                              task_state=task_states.REBUILDING)
 
         network_info = self._get_instance_nw_info(context, instance_ref)
         self.driver.destroy(instance_ref, network_info)
@@ -532,7 +532,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.REBUILD,
-                              task_state=task_state.BLOCK_DEVICE_MAPPING)
+                              task_state=task_states.BLOCK_DEVICE_MAPPING)
 
         bd_mapping = self._setup_block_device_mapping(context, instance_id)
 
@@ -545,7 +545,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.REBUILD,
-                              task_state=task_state.SPAWN)
+                              task_state=task_states.SPAWN)
 
         self.driver.spawn(context, instance_ref, network_info, bd_mapping)
 
@@ -578,7 +578,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                               instance_id,
                               power_state=current_power_state,
                               vm_state=vm_states.REBOOT,
-                              task_state=task_state.REBOOTING)
+                              task_state=task_states.REBOOTING)
 
         if instance_ref['power_state'] != power_state.RUNNING:
             state = instance_ref['power_state']
@@ -788,7 +788,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.RESCUE,
-                              task_state=task_state.RESCUING)
+                              task_state=task_states.RESCUING)
 
         instance_ref = self.db.instance_get(context, instance_id)
         network_info = self._get_instance_nw_info(context, instance_ref)
@@ -800,7 +800,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.RESCUE,
-                              task_state=task_state.RESCUED,
+                              task_state=task_states.RESCUED,
                               power_state=current_power_state)
 
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
@@ -813,7 +813,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.ACTIVE,
-                              task_state=task_state.UNRESCUING)
+                              task_state=task_states.UNRESCUING)
 
         instance_ref = self.db.instance_get(context, instance_id)
         network_info = self._get_instance_nw_info(context, instance_ref)
@@ -1049,7 +1049,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.PAUSE,
-                              task_state=task_state.PAUSING)
+                              task_state=task_states.PAUSING)
 
         instance_ref = self.db.instance_get(context, instance_id)
         self.driver.pause(instance_ref, lambda result: None)
@@ -1071,7 +1071,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.ACTIVE,
-                              task_state=task_state.UNPAUSING)
+                              task_state=task_states.UNPAUSING)
 
         instance_ref = self.db.instance_get(context, instance_id)
         self.driver.unpause(instance_ref, lambda result: None)
@@ -1112,7 +1112,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.SUSPEND,
-                              task_state=task_state.SUSPENDING)
+                              task_state=task_states.SUSPENDING)
 
         instance_ref = self.db.instance_get(context, instance_id)
         self.driver.suspend(instance_ref, lambda result: None)
@@ -1134,7 +1134,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         self._instance_update(context,
                               instance_id,
                               vm_state=vm_states.ACTIVE,
-                              task_state=task_state.RESUMING)
+                              task_state=task_states.RESUMING)
 
         instance_ref = self.db.instance_get(context, instance_id)
         self.driver.resume(instance_ref, lambda result: None)
diff --git a/nova/compute/task_state.py b/nova/compute/task_states.py
index 55466c783..55466c783 100644
--- a/nova/compute/task_state.py
+++ b/nova/compute/task_states.py
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index 8f9be879b..fd00ce495 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -30,7 +30,6 @@ from nova import log as logging
 from nova import rpc
 from nova import utils
 from nova.compute import power_state
-from nova.compute import task_state
 from nova.compute import vm_states
 from nova.api.ec2 import ec2utils
 
diff --git a/nova/tests/api/openstack/test_server_actions.py b/nova/tests/api/openstack/test_server_actions.py
index 6f8be0f47..011f83773 100644
--- a/nova/tests/api/openstack/test_server_actions.py
+++ b/nova/tests/api/openstack/test_server_actions.py
@@ -13,7 +13,6 @@ from nova import flags
 from nova.api.openstack import create_instance_helper
 from nova.compute import instance_types
 from nova.compute import vm_states
-from nova.compute import task_state
 import nova.db.api
 from nova import test
 from nova.tests.api.openstack import common
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index d0ed61c00..dc037d10e 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -36,7 +36,7 @@ from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
 import nova.compute.api
 from nova.compute import instance_types
-from nova.compute import task_state
+from nova.compute import task_states
 from nova.compute import vm_states
 import nova.db.api
 import nova.scheduler.api
@@ -2337,7 +2337,7 @@ class TestServerStatus(test.TestCase):
         self.assertEqual(response['server']['status'], 'VERIFY_RESIZE')
 
     def test_password_update(self):
-        response = self._get_with_state(vm_states.ACTIVE, task_state.PASSWORD)
+        response = self._get_with_state(vm_states.ACTIVE, task_states.PASSWORD)
         self.assertEqual(response['server']['status'], 'PASSWORD')
 
     def test_stopped(self):
diff --git a/nova/tests/vmwareapi/db_fakes.py b/nova/tests/vmwareapi/db_fakes.py
index dd38420ce..b046071c7 100644
--- a/nova/tests/vmwareapi/db_fakes.py
+++ b/nova/tests/vmwareapi/db_fakes.py
@@ -23,7 +23,7 @@ import time
 

 from nova import db

 from nova import utils

-from nova.compute import task_state

+from nova.compute import task_states

 from nova.compute import vm_states

 

 

@@ -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_state.SCHEDULE,

+            'task_state': task_states.SCHEDULE,

             'user_id': values['user_id'],

             'project_id': values['project_id'],

             'launch_time': time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()),