Merged task_state -> task_states and fixed test_servers test.

This commit is contained in:
Brian Lamar
2011-08-22 11:04:45 -04:00
2 changed files with 2 additions and 3 deletions

View File

@@ -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

View File

@@ -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()),