a first very rough step towards python3

[nepi.git] / src / nepi / resources / planetlab / sfa_node.py

diff --git a/src/nepi/resources/planetlab/sfa_node.py b/src/nepi/resources/planetlab/sfa_node.py
index 81783cd..9ca3181 100644 (file)
--- a/src/nepi/resources/planetlab/sfa_node.py
+++ b/src/nepi/resources/planetlab/sfa_node.py
@@ -16,7 +16,7 @@
 #
 # Author: Lucia Guevgeozian <lucia.guevgeozian_odizzio@inria.fr>
 
-from __future__ import print_function
+
 
 from nepi.execution.attribute import Attribute, Flags, Types
 from nepi.execution.resource import ResourceManager, clsinit_copy, \
@@ -260,7 +260,7 @@ class PlanetlabSfaNode(LinuxNode):
             super(PlanetlabSfaNode, self).do_discover()
 
         else:
-            hosts_hrn = nodes.values()
+            hosts_hrn = list(nodes.values())
             nodes_inslice = self._check_if_in_slice(hosts_hrn)
             nodes_not_inslice = list(set(hosts_hrn) - set(nodes_inslice))
             host_hrn = None
@@ -532,7 +532,7 @@ class PlanetlabSfaNode(LinuxNode):
             if not self._blacklisted(host_hrn):
                 if not self._reserved(host_hrn):
                     print(self.sfaapi._reserved ,self.guid)
-                    for hostname, hrn in nodes.iteritems():
+                    for hostname, hrn in nodes.items():
                         if host_hrn == hrn:
                             print('hostname' ,hostname)
                             ping_ok = self._do_ping(hostname)
@@ -584,7 +584,7 @@ class PlanetlabSfaNode(LinuxNode):
         attribute hostname, it will over write the previous value.
         """
         hosts_hrn = self.sfaapi.get_resources_hrn()
-        for hostname, hrn  in hosts_hrn.iteritems():
+        for hostname, hrn  in hosts_hrn.items():
             if hrn == node:
                 self.set("hostname", hostname)
 
@@ -597,7 +597,7 @@ class PlanetlabSfaNode(LinuxNode):
         slicename = 'ple.' + slicename
         slice_nodes = self.sfaapi.get_slice_resources(slicename)['resource']
         if slice_nodes:
-            slice_nodes_hrn = self.sfaapi.get_resources_hrn(slice_nodes).values()
+            slice_nodes_hrn = list(self.sfaapi.get_resources_hrn(slice_nodes).values())
         else: slice_nodes_hrn = []
         nodes_inslice = list(set(hosts_hrn) & set(slice_nodes_hrn))
         return nodes_inslice
@@ -648,24 +648,24 @@ class PlanetlabSfaNode(LinuxNode):
     def fail_discovery(self):
         msg = "Discovery failed. No candidates found for node"
         self.error(msg)
-        raise RuntimeError, msg
+        raise RuntimeError(msg)
 
     def fail_node_not_alive(self, hostname=None):
         msg = "Node %s not alive" % hostname
-        raise RuntimeError, msg
+        raise RuntimeError(msg)
     
     def fail_node_not_available(self, hostname):
         msg = "Node %s not available for provisioning" % hostname
-        raise RuntimeError, msg
+        raise RuntimeError(msg)
 
     def fail_not_enough_nodes(self):
         msg = "Not enough nodes available for provisioning"
-        raise RuntimeError, msg
+        raise RuntimeError(msg)
 
     def fail_sfaapi(self):
         msg = "Failing while trying to instanciate the SFA API.\nSet the" + \
             " attributes sfauser and sfaPrivateKey."
-        raise RuntimeError, msg
+        raise RuntimeError(msg)
 
     def valid_connection(self, guid):
         # TODO: Validate!