x
/
ceilometer-zvm
Code Issues Proposed changes

take out cpu_util as it will be calculated in nova 

Change-Id: If809a37674ad768f96a6656053505df39b0a372e
This commit is contained in:
DCC 2020-12-28 17:12:04 +08:00 committed by CHENGCHENG DONG
parent c492bcd05d
commit 48074dc17b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ceilometer_zvm/compute/virt/zvm/inspector.py
View File

@ -86,15 +86,14 @@ class ZVMInspector(virt_inspector.Inspector):
LOG.debug("instance stats:%s", str(inst_stats))
cpu_number = inst_stats['guest_cpus']
used_cpu_time = (inst_stats['used_cpu_time_us'] * units.k)
cpu_util = self._calc_cpu_util(instance, inst_stats)
used_mem_mb = inst_stats['used_mem_kb'] / units.Ki
# Construct the final result
return virt_inspector.InstanceStats(cpu_number=cpu_number,
cpu_time=used_cpu_time,
memory_usage=used_mem_mb,
cpu_util=cpu_util
memory_usage=used_mem_mb
)
<<<<<<< HEAD (c492bc take out nic_rx_delta and nic_rx_delta as they were taken ou)
def _save_inst_data(self, instance, inst_stats):
inst_name = zvmutils.get_inst_name(instance).upper()
data = inst_stats
@ -128,6 +127,8 @@ class ZVMInspector(virt_inspector.Inspector):
self._save_inst_data(instance, inst_stats)
return cpu_util
=======
>>>>>>> CHANGE (ca7b76 take out cpu_util as it will be calculated in nova)
def _inspect_inst_data(self, instance, inspect_type):
inspect_data = {}
# Make sure the inst name in upper case