openstack
/
ceilometer
Code Issues Proposed changes

Checks for presence of Hyper-V cpu metrics before accessing 

Adds a default value if there are no cpu metrics to be retrieved.

Closes-Bug: 1249959
(cherry picked from commit f15e2cc924)

Change-Id: I39513648ab25d46b2639b24a94e7344954ce3aeb
This commit is contained in:
Claudiu Belu 2013-11-18 05:26:17 -08:00
parent 329bf4bd13
commit 6637acdd8d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ceilometer/compute/virt/hyperv/utilsv2.py
View File

@ -88,10 +88,10 @@ class UtilsV2(object):
vm = self._lookup_vm(vm_name)
cpu_sd = self._get_vm_resources(vm, self._PROC_SETTING)[0]
cpu_metrics_def = self._get_metric_def(self._CPU_METRIC_NAME)
cpu_metric_aggr = self._get_metrics(vm, cpu_metrics_def)[0]
cpu_metric_aggr = self._get_metrics(vm, cpu_metrics_def)
return (int(cpu_metric_aggr.MetricValue),
cpu_sd.VirtualQuantity,
return (long(cpu_metric_aggr[0].MetricValue) if cpu_metric_aggr else 0,
int(cpu_sd.VirtualQuantity),
long(vm.OnTimeInMilliseconds))
def get_vnic_metrics(self, vm_name):