still rubbing off differences

[nepi.git] / examples / linux / testing / ccncat_extended_ring_topo.py

diff --git a/examples/linux/testing/ccncat_extended_ring_topo.py b/examples/linux/testing/ccncat_extended_ring_topo.py
index ec06b06..2e5cce8 100644 (file)
--- a/examples/linux/testing/ccncat_extended_ring_topo.py
+++ b/examples/linux/testing/ccncat_extended_ring_topo.py
@@ -5,9 +5,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
@@ -157,7 +156,7 @@ if __name__ == '__main__':
     ring_hosts = [host1, host2, host3, host4]
     ccnds = dict()
 
-    for i in xrange(len(ring_hosts)):
+    for i in range(len(ring_hosts)):
         host = ring_hosts[i]
         node = add_node(ec, host, pl_user, pl_ssh_key)
         ccnd = add_ccnd(ec, node)
@@ -214,7 +213,7 @@ if __name__ == '__main__':
 
     # Register a collector to automatically collect traces
     collector = add_collector(ec, "stderr")
-    for ccnd in ccnds.values():
+    for ccnd in ccnds:
         ec.register_connection(collector, ccnd)
 
     # deploy all ResourceManagers