openstack
/
nova
Code Issues Proposed changes

Compute: VM-Mode should use instance dict. 

Instance dicts no longer support attribute-style access.

Change-Id: Ia5191aa14ad7cc62630bd6b0df8aaccb87e51e03
This commit is contained in:
Rick Harris 2012-07-30 20:05:35 +00:00
parent a84c35d083
commit c46394ac7b
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/vm_mode.py
View File

@ -38,7 +38,7 @@ ALL = [HVM, XEN, UML, EXE]
def get_from_instance(instance):
mode = instance.vm_mode
mode = instance['vm_mode']
if mode is None:
return None

15
nova/tests/test_vmmode.py
View File

@ -22,33 +22,28 @@ from nova.compute import vm_mode
class ComputeVMModeTest(test.TestCase):
class testinstance(object):
def __init__(self, mode):
self.vm_mode = mode
def test_case(self):
inst = ComputeVMModeTest.testinstance("HVM")
inst = dict(vm_mode="HVM")
mode = vm_mode.get_from_instance(inst)
self.assertEqual(mode, "hvm")
def test_legacy_pv(self):
inst = ComputeVMModeTest.testinstance("pv")
inst = dict(vm_mode="pv")
mode = vm_mode.get_from_instance(inst)
self.assertEqual(mode, "xen")
def test_legacy_hv(self):
inst = ComputeVMModeTest.testinstance("hv")
inst = dict(vm_mode="hv")
mode = vm_mode.get_from_instance(inst)
self.assertEqual(mode, "hvm")
def test_bogus(self):
inst = ComputeVMModeTest.testinstance("wibble")
inst = dict(vm_mode="wibble")
self.assertRaises(exception.Invalid,
vm_mode.get_from_instance,
inst)
def test_good(self):
inst = ComputeVMModeTest.testinstance("hvm")
inst = dict(vm_mode="hvm")
mode = vm_mode.get_from_instance(inst)
self.assertEqual(mode, "hvm")