X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=slivermanager.py;h=6db569a757f896dd659cddb24704dec82b251de3;hp=4a3c3ebb9503ea08e1bb001f6c19700c31ffb26d;hb=48a73b18fd7daed13c645c1adeddb57b560e7a2d;hpb=7b8fc390afd0349706c45c3ae970770cdf9dceae

diff --git a/slivermanager.py b/slivermanager.py
index 4a3c3eb..6db569a 100644
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -132,7 +132,7 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
     slivers."""
 
     logger.verbose("slivermanager: Entering GetSlivers with fullupdate=%r"%fullupdate)
-    for key in data.keys():
+    for key in list(data.keys()):
         logger.verbose('slivermanager: GetSlivers key : ' + key)
 
     node_id = None
@@ -145,9 +145,9 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
     except:
         logger.log_exc("slivermanager: GetSlivers failed to read /etc/planetlab/node_id")
 
-    if data.has_key('node_id') and data['node_id'] != node_id: return
+    if 'node_id' in data and data['node_id'] != node_id: return
 
-    if data.has_key('networks'):
+    if 'networks' in data:
         for network in data['networks']:
             if network['is_primary'] and network['bwlimit'] is not None:
                 DEFAULT_ALLOCATION['net_max_rate'] = network['bwlimit'] / 1000
@@ -205,7 +205,7 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
         # extract the implied rspec
         rspec = {}
         rec['rspec'] = rspec
-        for resname, default_amount in DEFAULT_ALLOCATION.iteritems():
+        for resname, default_amount in DEFAULT_ALLOCATION.items():
             try:
                 t = type(default_amount)
                 amount = t.__new__(t, attributes[resname])
@@ -213,7 +213,7 @@ def GetSlivers(data, config = None, plc=None, fullupdate=True):
             rspec[resname] = amount
 
         # add in sysctl attributes into the rspec
-        for key in attributes.keys():
+        for key in list(attributes.keys()):
             if key.find("sysctl.") == 0:
                 rspec[key] = attributes[key]
 
@@ -233,7 +233,7 @@ def start():
     # No default allocation values for LXC yet, think if its necessary given
     # that they are also default allocation values in this module
     if implementation == 'vs':
-        for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
+        for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.items():
             DEFAULT_ALLOCATION[resname]=default_amount
 
     account.register_class(sliver_class_to_register)