git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
c97b3a7
..
1562d70
100644
(file)
--- a/
examples/openvswitch/ovs_ping_3_switches.py
+++ b/
examples/openvswitch/ovs_ping_3_switches.py
@@
-225,8
+225,8
@@
r2ip = dict({
})
# Ping from all resources to all other resources
})
# Ping from all resources to all other resources
-for r1, (n1, ip1) in r2ip.ite
rite
ms():
- for r2, (n2, ip2) in r2ip.ite
rite
ms():
+for r1, (n1, ip1) in r2ip.items():
+ for r2, (n2, ip2) in r2ip.items():
if r1 == r2:
continue
if r1 == r2:
continue
@@
-236,10
+236,12
@@
for r1, (n1, ip1) in r2ip.iteritems():
ec.deploy()
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
ec.wait_finished(apps.values())
# collect results
-for key, app in apps.ite
rite
ms():
+for key, app in apps.items():
stdout = ec.trace(app, "stdout")
print("***************************", key, "************************")
print(stdout)
stdout = ec.trace(app, "stdout")
print("***************************", key, "************************")
print(stdout)