still rubbing off differences

[nepi.git] / examples / openvswitch / ovs_ping_3_switches.py

diff --git a/examples/openvswitch/ovs_ping_3_switches.py b/examples/openvswitch/ovs_ping_3_switches.py
index 60efc35..1562d70 100644 (file)
--- a/examples/openvswitch/ovs_ping_3_switches.py
+++ b/examples/openvswitch/ovs_ping_3_switches.py
@@ -4,9 +4,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +32,7 @@
 # $ PYTHONPATH=$PYTHONPATH:src/ python examples/openvswitch/ovs_ping_3_switches.py -n "192.168.3.0/24" -C "1.1.1.1" -s <slicename> -i /~/.ssh/id_rsa
 #
 
-
+from __future__ import print_function
 
 from nepi.execution.ec import ExperimentController
 
@@ -226,8 +225,8 @@ r2ip = dict({
     })
 
 # Ping from all resources to all other resources
-for r1, (n1, ip1) in r2ip.iteritems():
-    for r2, (n2, ip2) in r2ip.iteritems():
+for r1, (n1, ip1) in r2ip.items():
+    for r2, (n2, ip2) in r2ip.items():
         if r1 == r2:
             continue
 
@@ -237,16 +236,16 @@ for r1, (n1, ip1) in r2ip.iteritems():
 
 ec.deploy()
 
+# py3: no need to transform into a list
+# as wait_finished (wait in fact) will do it anyway
 ec.wait_finished(apps.values())
 
 # collect results
-for key, app in apps.iteritems():
+for key, app in apps.items():
     stdout = ec.trace(app, "stdout")
-    print "***************************", key, "************************"
-    print stdout
-    print "\n"
+    print("***************************", key, "************************")
+    print(stdout)
+    print("\n")
 
 # Delete the overlay network
 ec.shutdown()
-
-