x/python-ganttclient
Code Issues Proposed changes

remove extra references to state_description

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-09-01 12:22:32 -07:00
parent 09814431e0
commit 31ea2d0a0a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/nova-manage
View File

@@ -166,7 +166,7 @@ class VpnCommands(object):
print address, print address,
print vpn['host'], print vpn['host'],
print ec2utils.id_to_ec2_id(vpn['id']), print ec2utils.id_to_ec2_id(vpn['id']),
print vpn['state_description'], print vpn['vm_state'],
print state print state
else: else:
print None print None
@@ -869,7 +869,7 @@ class VmCommands(object):
instance['hostname'], instance['hostname'],
instance['host'], instance['host'],
instance['instance_type'].name, instance['instance_type'].name,
instance['state_description'], instance['vm_state'],
instance['launched_at'], instance['launched_at'],
instance['image_ref'], instance['image_ref'],
instance['kernel_id'], instance['kernel_id'],
@@ -1223,7 +1223,7 @@ class VsaCommands(object):
type=vc['instance_type']['name'], type=vc['instance_type']['name'],
fl_ip=floating_addr, fl_ip=floating_addr,
fx_ip=fixed_addr, fx_ip=fixed_addr,
stat=vc['state_description'], stat=vc['vm_state'],
host=vc['host'], host=vc['host'],
time=str(vc['created_at'])) time=str(vc['created_at']))

10
nova/tests/test_libvirt.py
View File

@@ -34,6 +34,7 @@ from nova import test
from nova import utils from nova import utils
from nova.api.ec2 import cloud from nova.api.ec2 import cloud
from nova.compute import power_state from nova.compute import power_state
from nova.compute import vm_states
from nova.virt.libvirt import connection from nova.virt.libvirt import connection
from nova.virt.libvirt import firewall from nova.virt.libvirt import firewall
@@ -674,8 +675,9 @@ class LibvirtConnTestCase(test.TestCase):
# Preparing data # Preparing data
self.compute = utils.import_object(FLAGS.compute_manager) self.compute = utils.import_object(FLAGS.compute_manager)
instance_dict = {'host': 'fake', 'state': power_state.RUNNING, instance_dict = {'host': 'fake',
'state_description': 'running'} 'power_state': power_state.RUNNING,
'vm_state': vm_states.ACTIVE}
instance_ref = db.instance_create(self.context, self.test_instance) instance_ref = db.instance_create(self.context, self.test_instance)
instance_ref = db.instance_update(self.context, instance_ref['id'], instance_ref = db.instance_update(self.context, instance_ref['id'],
instance_dict) instance_dict)
@@ -713,8 +715,8 @@ class LibvirtConnTestCase(test.TestCase):
self.compute.rollback_live_migration) self.compute.rollback_live_migration)
instance_ref = db.instance_get(self.context, instance_ref['id']) instance_ref = db.instance_get(self.context, instance_ref['id'])
self.assertTrue(instance_ref['state_description'] == 'running') self.assertTrue(instance_ref['vm_state'] == vm_states.ACTIVE)
self.assertTrue(instance_ref['state'] == power_state.RUNNING) self.assertTrue(instance_ref['power_state'] == power_state.RUNNING)
volume_ref = db.volume_get(self.context, volume_ref['id']) volume_ref = db.volume_get(self.context, volume_ref['id'])
self.assertTrue(volume_ref['status'] == 'in-use') self.assertTrue(volume_ref['status'] == 'in-use')