diff options
| author | jing.liuqing <jing.liuqing@99cloud.net> | 2018-01-02 21:54:12 +0800 |
|---|---|---|
| committer | Liuqing Jing <jing.liuqing@99cloud.net> | 2018-01-02 15:22:29 +0000 |
| commit | a3c5e9b7c176c34a4e470cf92e11b03d0cd56fb7 (patch) | |
| tree | 5f5a6c5cbb90e097dc396c597aefb563e27ffe19 /ceilometer/compute | |
| parent | 76b4e947d7acd149f5d86360751de01cbcabc991 (diff) | |
| download | ceilometer-a3c5e9b7c176c34a4e470cf92e11b03d0cd56fb7.tar.gz | |
Do not check iterable objects before for loop
get_VIFs, get_VBDs will return set
For more details see the XenAPI docs:
https://docs.citrix.com/content/dam/docs/en-us/xenserver/xenserver-62/xenenterpriseapi.pdf
Change-Id: Ic3f0e2eb18d5d6408c60979383465575e0a99d05
Diffstat (limited to 'ceilometer/compute')
| -rw-r--r-- | ceilometer/compute/virt/xenapi/inspector.py | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/ceilometer/compute/virt/xenapi/inspector.py b/ceilometer/compute/virt/xenapi/inspector.py index 451dc0fd..6fa6f53e 100644 --- a/ceilometer/compute/virt/xenapi/inspector.py +++ b/ceilometer/compute/virt/xenapi/inspector.py @@ -127,7 +127,7 @@ class XenapiInspector(virt_inspector.Inspector): LOG.debug("inspect_vnics, all bandwidth: %s", bw_all, instance=instance) - for vif_ref in vif_refs or []: + for vif_ref in vif_refs: vif_rec = self.session.VIF.get_record(vif_ref) bw_vif = bw_all[dom_id][vif_rec['device']] @@ -147,38 +147,36 @@ class XenapiInspector(virt_inspector.Inspector): instance_name = util.instance_name(instance) vm_ref = self._lookup_by_name(instance_name) vif_refs = self.session.VM.get_VIFs(vm_ref) - if vif_refs: - for vif_ref in vif_refs: - vif_rec = self.session.VIF.get_record(vif_ref) - - rx_rate = float(self.session.VM.query_data_source( - vm_ref, "vif_%s_rx" % vif_rec['device'])) - tx_rate = float(self.session.VM.query_data_source( - vm_ref, "vif_%s_tx" % vif_rec['device'])) - - yield virt_inspector.InterfaceRateStats( - name=vif_rec['uuid'], - mac=vif_rec['MAC'], - fref=None, - parameters=None, - rx_bytes_rate=rx_rate, - tx_bytes_rate=tx_rate) + for vif_ref in vif_refs: + vif_rec = self.session.VIF.get_record(vif_ref) + + rx_rate = float(self.session.VM.query_data_source( + vm_ref, "vif_%s_rx" % vif_rec['device'])) + tx_rate = float(self.session.VM.query_data_source( + vm_ref, "vif_%s_tx" % vif_rec['device'])) + + yield virt_inspector.InterfaceRateStats( + name=vif_rec['uuid'], + mac=vif_rec['MAC'], + fref=None, + parameters=None, + rx_bytes_rate=rx_rate, + tx_bytes_rate=tx_rate) def inspect_disk_rates(self, instance, duration): instance_name = util.instance_name(instance) vm_ref = self._lookup_by_name(instance_name) vbd_refs = self.session.VM.get_VBDs(vm_ref) - if vbd_refs: - for vbd_ref in vbd_refs: - vbd_rec = self.session.VBD.get_record(vbd_ref) - - read_rate = float(self.session.VM.query_data_source( - vm_ref, "vbd_%s_read" % vbd_rec['device'])) - write_rate = float(self.session.VM.query_data_source( - vm_ref, "vbd_%s_write" % vbd_rec['device'])) - yield virt_inspector.DiskRateStats( - device=vbd_rec['device'], - read_bytes_rate=read_rate, - read_requests_rate=0, - write_bytes_rate=write_rate, - write_requests_rate=0) + for vbd_ref in vbd_refs: + vbd_rec = self.session.VBD.get_record(vbd_ref) + + read_rate = float(self.session.VM.query_data_source( + vm_ref, "vbd_%s_read" % vbd_rec['device'])) + write_rate = float(self.session.VM.query_data_source( + vm_ref, "vbd_%s_write" % vbd_rec['device'])) + yield virt_inspector.DiskRateStats( + device=vbd_rec['device'], + read_bytes_rate=read_rate, + read_requests_rate=0, + write_bytes_rate=write_rate, + write_requests_rate=0) |