Merge lp:~vishvananda/nova/fix-state-description into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Fix a few references to state_description that slipped through.

[Brian Lamar (blamar)]

Arg! Sorry about this Vish. ack-grep the tool I used to search for state and state_description evidently doesn't search non-.py files and the ec2/admin.py changes must have slipped in between the time I merge propped and getting it accepted.

Thanks for cleaning this up.

review: Approve

[Alex Meade (alex-meade)]

simple enough

review: Approve

[Brian Waldon (bcwaldon)]

Fantastic.

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-08-26 22:07:34 +0000
+++ bin/nova-manage	2011-09-01 19:32:25 +0000
@@ -166,7 +166,7 @@
                 print address,
                 print vpn['host'],
                 print ec2utils.id_to_ec2_id(vpn['id']),
-                print vpn['state_description'],
+                print vpn['vm_state'],
                 print state
             else:
                 print None
@@ -869,7 +869,7 @@
                 instance['hostname'],
                 instance['host'],
                 instance['instance_type'].name,
-                instance['state_description'],
+                instance['vm_state'],
                 instance['launched_at'],
                 instance['image_ref'],
                 instance['kernel_id'],
@@ -1223,7 +1223,7 @@
                     type=vc['instance_type']['name'],
                     fl_ip=floating_addr,
                     fx_ip=fixed_addr,
-                    stat=vc['state_description'],
+                    stat=vc['vm_state'],
                     host=vc['host'],
                     time=str(vc['created_at']))
 
 
=== modified file 'nova/api/ec2/admin.py'
--- nova/api/ec2/admin.py	2011-08-18 02:31:01 +0000
+++ nova/api/ec2/admin.py	2011-09-01 19:32:25 +0000
@@ -21,7 +21,6 @@
 """
 
 import base64
-import datetime
 import netaddr
 import urllib
 
@@ -33,6 +32,7 @@
 from nova import utils
 from nova.api.ec2 import ec2utils
 from nova.auth import manager
+from nova.compute import vm_states
 
 
 FLAGS = flags.FLAGS
@@ -273,8 +273,7 @@
         """Get the VPN instance for a project ID."""
         for instance in db.instance_get_all_by_project(context, project_id):
             if (instance['image_id'] == str(FLAGS.vpn_image_id)
-                and not instance['state_description'] in
-                    ['shutting_down', 'shutdown']):
+                and not instance['vm_state'] in [vm_states.DELETED]):
                 return instance
 
     def start_vpn(self, context, project):
 
=== modified file 'nova/api/openstack/contrib/simple_tenant_usage.py'
--- nova/api/openstack/contrib/simple_tenant_usage.py	2011-08-30 19:41:30 +0000
+++ nova/api/openstack/contrib/simple_tenant_usage.py	2011-09-01 19:32:25 +0000
@@ -116,7 +116,7 @@
             if info['ended_at']:
                 info['state'] = 'terminated'
             else:
-                info['state'] = instance['state_description']
+                info['state'] = instance['vm_state']
 
             now = datetime.utcnow()
 
 
=== modified file 'nova/tests/test_libvirt.py'
--- nova/tests/test_libvirt.py	2011-08-24 23:48:04 +0000
+++ nova/tests/test_libvirt.py	2011-09-01 19:32:25 +0000
@@ -34,6 +34,7 @@
 from nova import utils
 from nova.api.ec2 import cloud
 from nova.compute import power_state
+from nova.compute import vm_states
 from nova.virt.libvirt import connection
 from nova.virt.libvirt import firewall
 
@@ -674,8 +675,9 @@
 
         # Preparing data
         self.compute = utils.import_object(FLAGS.compute_manager)
-        instance_dict = {'host': 'fake', 'state': power_state.RUNNING,
-                         'state_description': 'running'}
+        instance_dict = {'host': 'fake',
+                         'power_state': power_state.RUNNING,
+                         'vm_state': vm_states.ACTIVE}
         instance_ref = db.instance_create(self.context, self.test_instance)
         instance_ref = db.instance_update(self.context, instance_ref['id'],
                                           instance_dict)
@@ -713,8 +715,8 @@
                       self.compute.rollback_live_migration)
 
         instance_ref = db.instance_get(self.context, instance_ref['id'])
-        self.assertTrue(instance_ref['state_description'] == 'running')
-        self.assertTrue(instance_ref['state'] == power_state.RUNNING)
+        self.assertTrue(instance_ref['vm_state'] == vm_states.ACTIVE)
+        self.assertTrue(instance_ref['power_state'] == power_state.RUNNING)
         volume_ref = db.volume_get(self.context, volume_ref['id'])
         self.assertTrue(volume_ref['status'] == 'in-use')