Skip to content
Snippets Groups Projects
Commit 052c6f7f authored by Anael Beutot's avatar Anael Beutot
Browse files

hypervisor.domains: use itertools instead of manual counters

parent af6d3c81
No related branches found
No related tags found
No related merge requests found
......@@ -21,6 +21,7 @@ import weakref
from StringIO import StringIO
from xml.etree import cElementTree as et
from collections import namedtuple
from itertools import izip, count
import pyev
import libvirt
......@@ -64,8 +65,7 @@ class VirtualMachine(object):
#: http://libvirt.org/formatdomain.html#elementsDisks
self.cache_behaviour = dict()
# define dynamic tags
i = 0
for v in self.iter_disks():
for i, v in izip(count(), self.iter_disks()):
for t in (
Tag('disk%s_size' % i, v.capacity, 10),
Tag('disk%s_path' % i, v.path, 10),
......@@ -76,9 +76,7 @@ class VirtualMachine(object):
):
self.tags[t.name] = t
i += 1
i = 0
for nic in self.iter_nics():
for i, nic in izip(count(), self.iter_nics()):
for t in (
Tag('nic%s_mac' % i, nic.mac),
Tag('nic%s_source' % i, nic.source),
......@@ -86,8 +84,6 @@ class VirtualMachine(object):
):
self.tags[t.name] = t
i += 1
#: keep record of CPU stats (libev timestamp, cpu time)
self.cpu_stats = (hypervisor.handler.main.evloop.now(), dom.info()[4])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment