hypervisor.domains: use itertools instead of manual counters

cloudcontrol/node/hypervisor/domains/__init__.py

@@ -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])