diff options
| author | Alessandro Pilotti <ap@pilotti.it> | 2012-11-20 13:38:14 +0200 |
|---|---|---|
| committer | Alessandro Pilotti <ap@pilotti.it> | 2012-11-20 13:38:14 +0200 |
| commit | 9ddca42fe618f6417e785c6aef1f8dc5ee8fcdf4 (patch) | |
| tree | d25f493c912a3760964fcce39f620921df8f28e4 | |
| parent | 98032e804aa442e1aad17723cab2ed163ee0c810 (diff) | |
| download | nova-9ddca42fe618f6417e785c6aef1f8dc5ee8fcdf4.tar.gz nova-9ddca42fe618f6417e785c6aef1f8dc5ee8fcdf4.tar.xz nova-9ddca42fe618f6417e785c6aef1f8dc5ee8fcdf4.zip | |
Fixes a bug in get_info in the Hyper-V Driver
Fixes Bug #1081070
When a VM is getting manually shut down on Hyper-V or in case of a host
reboot, "nova list" still reports the VM as ACTIVE after
nova.compute.manager_sync_power_states runs.
The bug is releated to the vm state being incorrectly returned as a
string.
Change-Id: I87957d2fa504bad110fb4d1d8b209a45cad11c2c
| -rw-r--r-- | nova/tests/test_hypervapi.py | 2 | ||||
| -rw-r--r-- | nova/virt/hyperv/vmops.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_hypervapi.py b/nova/tests/test_hypervapi.py index 1c49fe2f5..36f153531 100644 --- a/nova/tests/test_hypervapi.py +++ b/nova/tests/test_hypervapi.py @@ -188,7 +188,7 @@ class HyperVAPITestCase(basetestcase.BaseTestCase): self._spawn_instance(True) info = self._conn.get_info(self._instance_data) - self.assertEquals(info["state"], str(power_state.RUNNING)) + self.assertEquals(info["state"], power_state.RUNNING) def test_spawn_cow_image(self): self._test_spawn_instance(True) diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py index e4704798b..480eb394f 100644 --- a/nova/virt/hyperv/vmops.py +++ b/nova/virt/hyperv/vmops.py @@ -102,12 +102,12 @@ class VMOps(baseops.BaseOps): info = summary_info[0] LOG.debug(_("hyperv vm state: %s"), info.EnabledState) - state = str(constants.HYPERV_POWER_STATE[info.EnabledState]) + state = constants.HYPERV_POWER_STATE[info.EnabledState] memusage = str(info.MemoryUsage) numprocs = str(info.NumberOfProcessors) uptime = str(info.UpTime) - LOG.debug(_("Got Info for vm %(instance_name)s: state=%(state)s," + LOG.debug(_("Got Info for vm %(instance_name)s: state=%(state)d," " mem=%(memusage)s, num_cpu=%(numprocs)s," " uptime=%(uptime)s"), locals()) |