git://git.onelab.eu
/
nepi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bb69853
)
reinstate import of print_function in py3 so as to shorten the distance between both...
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 14 Oct 2015 10:06:15 +0000
(12:06 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Wed, 14 Oct 2015 10:06:15 +0000
(12:06 +0200)
64 files changed:
examples/ccn_emu_live/dce.py
patch
|
blob
|
history
examples/ccn_emu_live/planetlab.py
patch
|
blob
|
history
examples/ccn_emu_live/planetlab_4_nodes_linear.py
patch
|
blob
|
history
examples/dce/custom_dlm_ping.py
patch
|
blob
|
history
examples/dce/custom_local_csma_ping.py
patch
|
blob
|
history
examples/dce/custom_local_p2p_ccn.py
patch
|
blob
|
history
examples/dce/custom_local_p2p_ping.py
patch
|
blob
|
history
examples/dce/custom_local_wifi_ping.py
patch
|
blob
|
history
examples/dce/wrapped_local_p2p_ccncat.py
patch
|
blob
|
history
examples/dce/wrapped_local_p2p_ccnpeek.py
patch
|
blob
|
history
examples/dce/wrapped_local_p2p_ping.py
patch
|
blob
|
history
examples/linux/ccn_simple_transfer.py
patch
|
blob
|
history
examples/linux/ccn_transfer_using_linuxapp.py
patch
|
blob
|
history
examples/linux/hello_world.py
patch
|
blob
|
history
examples/linux/netcat_file_transfer.py
patch
|
blob
|
history
examples/linux/vlc_streaming.py
patch
|
blob
|
history
examples/netns/local_switch_ping.py
patch
|
blob
|
history
examples/ns3/local_csma_p2p_star_ping.py
patch
|
blob
|
history
examples/ns3/local_csma_ping.py
patch
|
blob
|
history
examples/ns3/local_mobile_wifi_ping.py
patch
|
blob
|
history
examples/ns3/local_p2p_ping.py
patch
|
blob
|
history
examples/ns3/local_wifi_ping.py
patch
|
blob
|
history
examples/ns3/multi_host/distributed.py
patch
|
blob
|
history
examples/ns3/multi_host/hybrid.py
patch
|
blob
|
history
examples/ns3/multi_host/parallel.py
patch
|
blob
|
history
examples/ns3/remote_p2p_ping.py
patch
|
blob
|
history
examples/omf/iminds_omf6_ping.py
patch
|
blob
|
history
examples/omf/iminds_omf6_vlc.py
patch
|
blob
|
history
examples/omf/nitos_omf6_ping.py
patch
|
blob
|
history
examples/omf/nitos_omf6_vlc.py
patch
|
blob
|
history
examples/omf/nitos_testbed_bootstrap.py
patch
|
blob
|
history
examples/omf/testing/nitos_omf5_ping.py
patch
|
blob
|
history
examples/openvswitch/ovs_ping.py
patch
|
blob
|
history
examples/openvswitch/ovs_ping_2_switches.py
patch
|
blob
|
history
examples/openvswitch/ovs_ping_3_switches.py
patch
|
blob
|
history
examples/planetlab/ccn_simple_transfer.py
patch
|
blob
|
history
examples/planetlab/ping.py
patch
|
blob
|
history
examples/planetlab/ping_with_filters.py
patch
|
blob
|
history
examples/planetlab/select_nodes.py
patch
|
blob
|
history
examples/planetlab/update_fedora_repo.py
patch
|
blob
|
history
src/nepi/__init__.py
patch
|
blob
|
history
src/nepi/data/processing/ccn/parser.py
patch
|
blob
|
history
src/nepi/resources/linux/scripts/linux-tap-create.py
patch
|
blob
|
history
src/nepi/resources/linux/scripts/linux-tap-delete.py
patch
|
blob
|
history
src/nepi/resources/linux/scripts/tunchannel.py
patch
|
blob
|
history
src/nepi/resources/ns3/resource_manager_generator.py
patch
|
blob
|
history
src/nepi/resources/omf/application.py
patch
|
blob
|
history
src/nepi/resources/planetlab/scripts/pl-vif-create.py
patch
|
blob
|
history
src/nepi/resources/planetlab/scripts/pl-vif-down.py
patch
|
blob
|
history
src/nepi/resources/planetlab/sfa_node.py
patch
|
blob
|
history
src/nepi/util/manifoldapi.py
patch
|
blob
|
history
src/nepi/util/parsers/xml_parser.py
patch
|
blob
|
history
src/nepi/util/statfuncs.py
patch
|
blob
|
history
test/lib/test_utils.py
patch
|
blob
|
history
test/resources/linux/ccn/ccnpeek.py
patch
|
blob
|
history
test/resources/linux/netns/netnsclient.py
patch
|
blob
|
history
test/resources/linux/netns/netnsemulation.py
patch
|
blob
|
history
test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py
patch
|
blob
|
history
test/resources/linux/ns3/ns3fdnetdevice.py
patch
|
blob
|
history
test/resources/linux/ns3/ns3simulation.py
patch
|
blob
|
history
test/resources/linux/ns3/serialization.py
patch
|
blob
|
history
test/resources/linux/udptunnel.py
patch
|
blob
|
history
test/resources/ns3/ns3wrapper.py
patch
|
blob
|
history
test/resources/omf/set_hook.py
patch
|
blob
|
history
diff --git
a/examples/ccn_emu_live/dce.py
b/examples/ccn_emu_live/dce.py
index
b01f37c
..
ef56243
100644
(file)
--- a/
examples/ccn_emu_live/dce.py
+++ b/
examples/ccn_emu_live/dce.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.runner import ExperimentRunner
from nepi.execution.ec import ExperimentController
from nepi.execution.runner import ExperimentRunner
diff --git
a/examples/ccn_emu_live/planetlab.py
b/examples/ccn_emu_live/planetlab.py
index
f88be44
..
fc16560
100644
(file)
--- a/
examples/ccn_emu_live/planetlab.py
+++ b/
examples/ccn_emu_live/planetlab.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.runner import ExperimentRunner
from nepi.execution.ec import ExperimentController
from nepi.execution.runner import ExperimentRunner
diff --git
a/examples/ccn_emu_live/planetlab_4_nodes_linear.py
b/examples/ccn_emu_live/planetlab_4_nodes_linear.py
index
12f81c1
..
bb3b449
100644
(file)
--- a/
examples/ccn_emu_live/planetlab_4_nodes_linear.py
+++ b/
examples/ccn_emu_live/planetlab_4_nodes_linear.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.runner import ExperimentRunner
from nepi.execution.ec import ExperimentController
from nepi.execution.runner import ExperimentRunner
diff --git
a/examples/dce/custom_dlm_ping.py
b/examples/dce/custom_dlm_ping.py
index
89900b2
..
69f69e1
100644
(file)
--- a/
examples/dce/custom_dlm_ping.py
+++ b/
examples/dce/custom_dlm_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/dce/custom_local_csma_ping.py
b/examples/dce/custom_local_csma_ping.py
index
fcdaca3
..
54085ab
100644
(file)
--- a/
examples/dce/custom_local_csma_ping.py
+++ b/
examples/dce/custom_local_csma_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/dce/custom_local_p2p_ccn.py
b/examples/dce/custom_local_p2p_ccn.py
index
d5e0b40
..
243470f
100644
(file)
--- a/
examples/dce/custom_local_p2p_ccn.py
+++ b/
examples/dce/custom_local_p2p_ccn.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/dce/custom_local_p2p_ping.py
b/examples/dce/custom_local_p2p_ping.py
index
8abac0a
..
f99ac7b
100644
(file)
--- a/
examples/dce/custom_local_p2p_ping.py
+++ b/
examples/dce/custom_local_p2p_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/dce/custom_local_wifi_ping.py
b/examples/dce/custom_local_wifi_ping.py
index
ddcd22c
..
c751b5d
100644
(file)
--- a/
examples/dce/custom_local_wifi_ping.py
+++ b/
examples/dce/custom_local_wifi_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/dce/wrapped_local_p2p_ccncat.py
b/examples/dce/wrapped_local_p2p_ccncat.py
index
d602844
..
b85bdff
100644
(file)
--- a/
examples/dce/wrapped_local_p2p_ccncat.py
+++ b/
examples/dce/wrapped_local_p2p_ccncat.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/dce/wrapped_local_p2p_ccnpeek.py
b/examples/dce/wrapped_local_p2p_ccnpeek.py
index
e1dd118
..
0ba078c
100644
(file)
--- a/
examples/dce/wrapped_local_p2p_ccnpeek.py
+++ b/
examples/dce/wrapped_local_p2p_ccnpeek.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/dce/wrapped_local_p2p_ping.py
b/examples/dce/wrapped_local_p2p_ping.py
index
92c9f65
..
cdcfd6b
100644
(file)
--- a/
examples/dce/wrapped_local_p2p_ping.py
+++ b/
examples/dce/wrapped_local_p2p_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/linux/ccn_simple_transfer.py
b/examples/linux/ccn_simple_transfer.py
index
6473ff9
..
ccf92eb
100644
(file)
--- a/
examples/linux/ccn_simple_transfer.py
+++ b/
examples/linux/ccn_simple_transfer.py
@@
-31,7
+31,7
@@
# 0 ------- network -------- 1
#
# 0 ------- network -------- 1
#
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/linux/ccn_transfer_using_linuxapp.py
b/examples/linux/ccn_transfer_using_linuxapp.py
index
a22e561
..
8bf7cfc
100644
(file)
--- a/
examples/linux/ccn_transfer_using_linuxapp.py
+++ b/
examples/linux/ccn_transfer_using_linuxapp.py
@@
-40,7
+40,7
@@
# $ cd <path-to-nepi>
# python examples/linux/ccn_advanced_transfer.py -a <hostname1> -b <hostname2> -u <username> -i <ssh-key>
# $ cd <path-to-nepi>
# python examples/linux/ccn_advanced_transfer.py -a <hostname1> -b <hostname2> -u <username> -i <ssh-key>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
diff --git
a/examples/linux/hello_world.py
b/examples/linux/hello_world.py
index
2553650
..
2e026b5
100644
(file)
--- a/
examples/linux/hello_world.py
+++ b/
examples/linux/hello_world.py
@@
-22,7
+22,7
@@
# $ cd <path-to-nepi>
# python examples/linux/hello_world.py -a <hostname> -u <username> -i <ssh-key>
# $ cd <path-to-nepi>
# python examples/linux/hello_world.py -a <hostname> -u <username> -i <ssh-key>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/linux/netcat_file_transfer.py
b/examples/linux/netcat_file_transfer.py
index
e632c44
..
6d43764
100644
(file)
--- a/
examples/linux/netcat_file_transfer.py
+++ b/
examples/linux/netcat_file_transfer.py
@@
-24,7
+24,7
@@
# $ cd <path-to-nepi>
# python examples/linux/netcat_file_transfer.py -a <hostname1> -b <hostname2> -u <username> -i <ssh-key>
# $ cd <path-to-nepi>
# python examples/linux/netcat_file_transfer.py -a <hostname1> -b <hostname2> -u <username> -i <ssh-key>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
diff --git
a/examples/linux/vlc_streaming.py
b/examples/linux/vlc_streaming.py
index
d888e3b
..
9f31286
100644
(file)
--- a/
examples/linux/vlc_streaming.py
+++ b/
examples/linux/vlc_streaming.py
@@
-21,7
+21,7
@@
# $ cd <path-to-nepi>
# python examples/linux/vlc_streaming.py -a <hostname1> -b <hostname2> -u <username> -i <ssh-key>
# $ cd <path-to-nepi>
# python examples/linux/vlc_streaming.py -a <hostname1> -b <hostname2> -u <username> -i <ssh-key>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceState, ResourceAction
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceState, ResourceAction
diff --git
a/examples/netns/local_switch_ping.py
b/examples/netns/local_switch_ping.py
index
7f37168
..
e69a7e8
100644
(file)
--- a/
examples/netns/local_switch_ping.py
+++ b/
examples/netns/local_switch_ping.py
@@
-21,7
+21,7
@@
# This example must be executed as root:
# $ sudo PYTHONPATH=$PYTHONPATH:src python examples/netns/local_switch_ping.py
# This example must be executed as root:
# $ sudo PYTHONPATH=$PYTHONPATH:src python examples/netns/local_switch_ping.py
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/ns3/local_csma_p2p_star_ping.py
b/examples/ns3/local_csma_p2p_star_ping.py
index
f7e4590
..
5d7593f
100644
(file)
--- a/
examples/ns3/local_csma_p2p_star_ping.py
+++ b/
examples/ns3/local_csma_p2p_star_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
"""
network topology:
"""
network topology:
diff --git
a/examples/ns3/local_csma_ping.py
b/examples/ns3/local_csma_ping.py
index
a63e8ba
..
97afd3f
100644
(file)
--- a/
examples/ns3/local_csma_ping.py
+++ b/
examples/ns3/local_csma_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/ns3/local_mobile_wifi_ping.py
b/examples/ns3/local_mobile_wifi_ping.py
index
8beefdb
..
f51986b
100644
(file)
--- a/
examples/ns3/local_mobile_wifi_ping.py
+++ b/
examples/ns3/local_mobile_wifi_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
"""
network topology:
"""
network topology:
diff --git
a/examples/ns3/local_p2p_ping.py
b/examples/ns3/local_p2p_ping.py
index
ff93f16
..
1741cdd
100644
(file)
--- a/
examples/ns3/local_p2p_ping.py
+++ b/
examples/ns3/local_p2p_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/ns3/local_wifi_ping.py
b/examples/ns3/local_wifi_ping.py
index
4d038c5
..
8c17d7f
100644
(file)
--- a/
examples/ns3/local_wifi_ping.py
+++ b/
examples/ns3/local_wifi_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/ns3/multi_host/distributed.py
b/examples/ns3/multi_host/distributed.py
index
5c7a28f
..
c3aef65
100644
(file)
--- a/
examples/ns3/multi_host/distributed.py
+++ b/
examples/ns3/multi_host/distributed.py
@@
-37,7
+37,7
@@
# PYTHONPATH=$PYTHONPATH:src python examples/ns3/multi_host/ditributed.py
#
# PYTHONPATH=$PYTHONPATH:src python examples/ns3/multi_host/ditributed.py
#
-
+from __future__ import print_function
import os
import os
diff --git
a/examples/ns3/multi_host/hybrid.py
b/examples/ns3/multi_host/hybrid.py
index
f67bf3b
..
630fec2
100644
(file)
--- a/
examples/ns3/multi_host/hybrid.py
+++ b/
examples/ns3/multi_host/hybrid.py
@@
-38,7
+38,7
@@
# PYTHONPATH=$PYTHONPATH:src python examples/ns3/multi_host/hybrid.py
#
# PYTHONPATH=$PYTHONPATH:src python examples/ns3/multi_host/hybrid.py
#
-
+from __future__ import print_function
import os
import os
diff --git
a/examples/ns3/multi_host/parallel.py
b/examples/ns3/multi_host/parallel.py
index
e9736df
..
fa53457
100644
(file)
--- a/
examples/ns3/multi_host/parallel.py
+++ b/
examples/ns3/multi_host/parallel.py
@@
-37,7
+37,7
@@
# PYTHONPATH=$PYTHONPATH:src python examples/ns3/multi_host/parallel.py
#
# PYTHONPATH=$PYTHONPATH:src python examples/ns3/multi_host/parallel.py
#
-
+from __future__ import print_function
import os
import os
diff --git
a/examples/ns3/remote_p2p_ping.py
b/examples/ns3/remote_p2p_ping.py
index
cbbd0d7
..
57bda49
100644
(file)
--- a/
examples/ns3/remote_p2p_ping.py
+++ b/
examples/ns3/remote_p2p_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/omf/iminds_omf6_ping.py
b/examples/omf/iminds_omf6_ping.py
index
825d41a
..
d5e02c7
100644
(file)
--- a/
examples/omf/iminds_omf6_ping.py
+++ b/
examples/omf/iminds_omf6_ping.py
@@
-44,7
+44,7
@@
# - t3 (t2 + 2s) : Kill the application
#
# - t3 (t2 + 2s) : Kill the application
#
-
+from __future__ import print_function
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
diff --git
a/examples/omf/iminds_omf6_vlc.py
b/examples/omf/iminds_omf6_vlc.py
index
fedee24
..
b312abd
100644
(file)
--- a/
examples/omf/iminds_omf6_vlc.py
+++ b/
examples/omf/iminds_omf6_vlc.py
@@
-45,7
+45,7
@@
# - t3 (t2 + 2s) : Kill the application
#
# - t3 (t2 + 2s) : Kill the application
#
-
+from __future__ import print_function
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
diff --git
a/examples/omf/nitos_omf6_ping.py
b/examples/omf/nitos_omf6_ping.py
index
696e430
..
6deaf18
100644
(file)
--- a/
examples/omf/nitos_omf6_ping.py
+++ b/
examples/omf/nitos_omf6_ping.py
@@
-45,7
+45,7
@@
# - t3 (t2 + 2s) : Kill the application
#
# - t3 (t2 + 2s) : Kill the application
#
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
diff --git
a/examples/omf/nitos_omf6_vlc.py
b/examples/omf/nitos_omf6_vlc.py
index
4e4a1dd
..
c6c2600
100644
(file)
--- a/
examples/omf/nitos_omf6_vlc.py
+++ b/
examples/omf/nitos_omf6_vlc.py
@@
-46,7
+46,7
@@
# - t3 (t2 + 2s) : Kill the application
#
# - t3 (t2 + 2s) : Kill the application
#
-
+from __future__ import print_function
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
diff --git
a/examples/omf/nitos_testbed_bootstrap.py
b/examples/omf/nitos_testbed_bootstrap.py
index
b4905aa
..
6d70818
100644
(file)
--- a/
examples/omf/nitos_testbed_bootstrap.py
+++ b/
examples/omf/nitos_testbed_bootstrap.py
@@
-30,7
+30,7
@@
# python examples/linux/nitos_testbed_bootstrap.py -H <omf.nitos.node0XX,omf.nitos.node0ZZ,..> -U <node-username> -i <ssh-key> -g <nitos-gateway> -u <nitos-slice>
#
# python examples/linux/nitos_testbed_bootstrap.py -H <omf.nitos.node0XX,omf.nitos.node0ZZ,..> -U <node-username> -i <ssh-key> -g <nitos-gateway> -u <nitos-slice>
#
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
diff --git
a/examples/omf/testing/nitos_omf5_ping.py
b/examples/omf/testing/nitos_omf5_ping.py
index
8498d60
..
44d0ae9
100644
(file)
--- a/
examples/omf/testing/nitos_omf5_ping.py
+++ b/
examples/omf/testing/nitos_omf5_ping.py
@@
-42,7
+42,7
@@
#
#
#
#
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
diff --git
a/examples/openvswitch/ovs_ping.py
b/examples/openvswitch/ovs_ping.py
index
5de45db
..
7f50846
100644
(file)
--- a/
examples/openvswitch/ovs_ping.py
+++ b/
examples/openvswitch/ovs_ping.py
@@
-32,7
+32,7
@@
# $ PYTHONPATH=$PYTHONPATH:src/ python examples/openvswitch/ovs_ping.py -n "192.168.3.0/24" -s <slicename> -i /~/.ssh/id_rsa
#
# $ PYTHONPATH=$PYTHONPATH:src/ python examples/openvswitch/ovs_ping.py -n "192.168.3.0/24" -s <slicename> -i /~/.ssh/id_rsa
#
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/openvswitch/ovs_ping_2_switches.py
b/examples/openvswitch/ovs_ping_2_switches.py
index
6fc773b
..
a28bef2
100644
(file)
--- a/
examples/openvswitch/ovs_ping_2_switches.py
+++ b/
examples/openvswitch/ovs_ping_2_switches.py
@@
-33,7
+33,7
@@
# $ PYTHONPATH=$PYTHONPATH:src/ python examples/openvswitch/ovs_ping_2_switches.py -n "192.168.3.0/24" -C "1.1.1.1" -s <slicename> -i /~/.ssh/id_rsa
#
# $ PYTHONPATH=$PYTHONPATH:src/ python examples/openvswitch/ovs_ping_2_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
from nepi.execution.ec import ExperimentController
diff --git
a/examples/openvswitch/ovs_ping_3_switches.py
b/examples/openvswitch/ovs_ping_3_switches.py
index
510c9e6
..
1562d70
100644
(file)
--- a/
examples/openvswitch/ovs_ping_3_switches.py
+++ b/
examples/openvswitch/ovs_ping_3_switches.py
@@
-32,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
#
# $ 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
from nepi.execution.ec import ExperimentController
diff --git
a/examples/planetlab/ccn_simple_transfer.py
b/examples/planetlab/ccn_simple_transfer.py
index
3363557
..
fabbcbc
100644
(file)
--- a/
examples/planetlab/ccn_simple_transfer.py
+++ b/
examples/planetlab/ccn_simple_transfer.py
@@
-31,7
+31,7
@@
# 0 ------- network -------- 1
#
# 0 ------- network -------- 1
#
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/planetlab/ping.py
b/examples/planetlab/ping.py
index
5f07bf0
..
f35ea70
100644
(file)
--- a/
examples/planetlab/ping.py
+++ b/
examples/planetlab/ping.py
@@
-24,7
+24,7
@@
# $ cd <path-to-nepi>
# python examples/planetlab/ping.py -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key>
# $ cd <path-to-nepi>
# python examples/planetlab/ping.py -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/planetlab/ping_with_filters.py
b/examples/planetlab/ping_with_filters.py
index
f0e498f
..
f21d282
100644
(file)
--- a/
examples/planetlab/ping_with_filters.py
+++ b/
examples/planetlab/ping_with_filters.py
@@
-22,7
+22,7
@@
# $ cd <path-to-nepi>
# python examples/planetlab/ping_with_filters.py -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key>
# $ cd <path-to-nepi>
# python examples/planetlab/ping_with_filters.py -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceAction, ResourceState
diff --git
a/examples/planetlab/select_nodes.py
b/examples/planetlab/select_nodes.py
index
a0aec7d
..
465e949
100644
(file)
--- a/
examples/planetlab/select_nodes.py
+++ b/
examples/planetlab/select_nodes.py
@@
-22,7
+22,7
@@
# $ cd <path-to-nepi>
# python examples/planetlab/select_nodes.py -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key> -c <country> -o <operating-system> -n <node-count>
# $ cd <path-to-nepi>
# python examples/planetlab/select_nodes.py -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key> -c <country> -o <operating-system> -n <node-count>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/examples/planetlab/update_fedora_repo.py
b/examples/planetlab/update_fedora_repo.py
index
f4929fb
..
630fe10
100644
(file)
--- a/
examples/planetlab/update_fedora_repo.py
+++ b/
examples/planetlab/update_fedora_repo.py
@@
-27,7
+27,7
@@
# $ cd <path-to-nepi>
# python examples/planetlab/update_fedora_repo.py -H <host1,host2,..> -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key>
# $ cd <path-to-nepi>
# python examples/planetlab/update_fedora_repo.py -H <host1,host2,..> -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/src/nepi/__init__.py
b/src/nepi/__init__.py
index
8e7ff2a
..
18764d0
100644
(file)
--- a/
src/nepi/__init__.py
+++ b/
src/nepi/__init__.py
@@
-16,7
+16,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
import logging
import os
import logging
import os
diff --git
a/src/nepi/data/processing/ccn/parser.py
b/src/nepi/data/processing/ccn/parser.py
index
1538b0c
..
64e2ada
100644
(file)
--- a/
src/nepi/data/processing/ccn/parser.py
+++ b/
src/nepi/data/processing/ccn/parser.py
@@
-40,7
+40,7
@@
# \ nid3.log
#
# \ nid3.log
#
-
+from __future__ import print_function
import collections
import functools
import collections
import functools
diff --git
a/src/nepi/resources/linux/scripts/linux-tap-create.py
b/src/nepi/resources/linux/scripts/linux-tap-create.py
index
035f1a6
..
256aff6
100644
(file)
--- a/
src/nepi/resources/linux/scripts/linux-tap-create.py
+++ b/
src/nepi/resources/linux/scripts/linux-tap-create.py
@@
-16,7
+16,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
import base64
import fcntl
import base64
import fcntl
diff --git
a/src/nepi/resources/linux/scripts/linux-tap-delete.py
b/src/nepi/resources/linux/scripts/linux-tap-delete.py
index
60a0e1a
..
78b69c3
100644
(file)
--- a/
src/nepi/resources/linux/scripts/linux-tap-delete.py
+++ b/
src/nepi/resources/linux/scripts/linux-tap-delete.py
@@
-16,7
+16,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
import base64
import socket
import base64
import socket
diff --git
a/src/nepi/resources/linux/scripts/tunchannel.py
b/src/nepi/resources/linux/scripts/tunchannel.py
index
cca5205
..
6f40460
100644
(file)
--- a/
src/nepi/resources/linux/scripts/tunchannel.py
+++ b/
src/nepi/resources/linux/scripts/tunchannel.py
@@
-18,7
+18,7
@@
# Claudio Freire <claudio-daniel.freire@inria.fr>
#
# Claudio Freire <claudio-daniel.freire@inria.fr>
#
-
+from __future__ import print_function
import select
import sys
import select
import sys
diff --git
a/src/nepi/resources/ns3/resource_manager_generator.py
b/src/nepi/resources/ns3/resource_manager_generator.py
index
3bfd08a
..
6bd9b89
100644
(file)
--- a/
src/nepi/resources/ns3/resource_manager_generator.py
+++ b/
src/nepi/resources/ns3/resource_manager_generator.py
@@
-29,7
+29,7
@@
# PYTHONPATH=$PYTHONPATH:~/repos/nepi/src python src/nepi/resources/ns3/resource_manager_generator.py
#
# PYTHONPATH=$PYTHONPATH:~/repos/nepi/src python src/nepi/resources/ns3/resource_manager_generator.py
#
-
+from __future__ import print_function
# Force the load of ns3 libraries
from nepi.resources.ns3.ns3wrapper import load_ns3_module
# Force the load of ns3 libraries
from nepi.resources.ns3.ns3wrapper import load_ns3_module
diff --git
a/src/nepi/resources/omf/application.py
b/src/nepi/resources/omf/application.py
index
86c82cb
..
03db088
100644
(file)
--- a/
src/nepi/resources/omf/application.py
+++ b/
src/nepi/resources/omf/application.py
@@
-17,7
+17,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
# Julien Tribino <julien.tribino@inria.fr>
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
# Julien Tribino <julien.tribino@inria.fr>
-
+from __future__ import print_function
import os
import os
diff --git
a/src/nepi/resources/planetlab/scripts/pl-vif-create.py
b/src/nepi/resources/planetlab/scripts/pl-vif-create.py
index
bd45a0c
..
6b72278
100644
(file)
--- a/
src/nepi/resources/planetlab/scripts/pl-vif-create.py
+++ b/
src/nepi/resources/planetlab/scripts/pl-vif-create.py
@@
-16,7
+16,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
import base64
import errno
import base64
import errno
diff --git
a/src/nepi/resources/planetlab/scripts/pl-vif-down.py
b/src/nepi/resources/planetlab/scripts/pl-vif-down.py
index
be12575
..
f766a37
100644
(file)
--- a/
src/nepi/resources/planetlab/scripts/pl-vif-down.py
+++ b/
src/nepi/resources/planetlab/scripts/pl-vif-down.py
@@
-16,7
+16,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
import base64
import socket
import base64
import socket
diff --git
a/src/nepi/resources/planetlab/sfa_node.py
b/src/nepi/resources/planetlab/sfa_node.py
index
a0dca11
..
e05a3a7
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>
#
# 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, \
from nepi.execution.attribute import Attribute, Flags, Types
from nepi.execution.resource import ResourceManager, clsinit_copy, \
diff --git
a/src/nepi/util/manifoldapi.py
b/src/nepi/util/manifoldapi.py
index
43acf58
..
d9141b6
100644
(file)
--- a/
src/nepi/util/manifoldapi.py
+++ b/
src/nepi/util/manifoldapi.py
@@
-16,6
+16,7
@@
#
# Author: Lucia Guevgeozian Odizzio <lucia.guevgeozian_odizzio@inria.fr>
#
# Author: Lucia Guevgeozian Odizzio <lucia.guevgeozian_odizzio@inria.fr>
+from __future__ import print_function
import xmlrpc.client
import xmlrpc.client
diff --git
a/src/nepi/util/parsers/xml_parser.py
b/src/nepi/util/parsers/xml_parser.py
index
b42d39b
..
d6b14cd
100644
(file)
--- a/
src/nepi/util/parsers/xml_parser.py
+++ b/
src/nepi/util/parsers/xml_parser.py
@@
-16,7
+16,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.util.netgraph import NetGraph, TopologyType
from nepi.util.timefuncs import stformat, tsformat
from nepi.util.netgraph import NetGraph, TopologyType
from nepi.util.timefuncs import stformat, tsformat
diff --git
a/src/nepi/util/statfuncs.py
b/src/nepi/util/statfuncs.py
index
b500664
..
f6a8b54
100644
(file)
--- a/
src/nepi/util/statfuncs.py
+++ b/
src/nepi/util/statfuncs.py
@@
-16,7
+16,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
import math
import numpy
import math
import numpy
diff --git
a/test/lib/test_utils.py
b/test/lib/test_utils.py
index
beea118
..
cd67dcd
100644
(file)
--- a/
test/lib/test_utils.py
+++ b/
test/lib/test_utils.py
@@
-16,7
+16,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.resources.linux.node import LinuxNode
from nepi.resources.linux.node import LinuxNode
diff --git
a/test/resources/linux/ccn/ccnpeek.py
b/test/resources/linux/ccn/ccnpeek.py
index
0384f3b
..
22acdbb
100755
(executable)
--- a/
test/resources/linux/ccn/ccnpeek.py
+++ b/
test/resources/linux/ccn/ccnpeek.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.resource import ResourceState, ResourceAction
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceState, ResourceAction
from nepi.execution.ec import ExperimentController
diff --git
a/test/resources/linux/netns/netnsclient.py
b/test/resources/linux/netns/netnsclient.py
index
0918d3b
..
48e6bf6
100755
(executable)
--- a/
test/resources/linux/netns/netnsclient.py
+++ b/
test/resources/linux/netns/netnsclient.py
@@
-20,7
+20,7
@@
# Test based on netns test/test_core.py file test_run_ping_routing test
#
# Test based on netns test/test_core.py file test_run_ping_routing test
#
-
+from __future__ import print_function
from nepi.resources.netns.netnsserver import run_server
from nepi.resources.linux.netns.netnsclient import LinuxNetNSClient
from nepi.resources.netns.netnsserver import run_server
from nepi.resources.linux.netns.netnsclient import LinuxNetNSClient
diff --git
a/test/resources/linux/netns/netnsemulation.py
b/test/resources/linux/netns/netnsemulation.py
index
5657774
..
48186b8
100755
(executable)
--- a/
test/resources/linux/netns/netnsemulation.py
+++ b/
test/resources/linux/netns/netnsemulation.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.trace import TraceAttr
from nepi.execution.ec import ExperimentController
from nepi.execution.trace import TraceAttr
diff --git
a/test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py
b/test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py
index
ccaaf51
..
ac03fde
100755
(executable)
--- a/
test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py
+++ b/
test/resources/linux/ns3/cross_ns3_linux_tuntapfdlink_ping.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceState, ResourceAction
from nepi.execution.ec import ExperimentController
from nepi.execution.resource import ResourceState, ResourceAction
diff --git
a/test/resources/linux/ns3/ns3fdnetdevice.py
b/test/resources/linux/ns3/ns3fdnetdevice.py
index
12f3b61
..
6723629
100755
(executable)
--- a/
test/resources/linux/ns3/ns3fdnetdevice.py
+++ b/
test/resources/linux/ns3/ns3fdnetdevice.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.trace import TraceAttr
from nepi.execution.ec import ExperimentController
from nepi.execution.trace import TraceAttr
diff --git
a/test/resources/linux/ns3/ns3simulation.py
b/test/resources/linux/ns3/ns3simulation.py
index
621bfb7
..
f00dcad
100755
(executable)
--- a/
test/resources/linux/ns3/ns3simulation.py
+++ b/
test/resources/linux/ns3/ns3simulation.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.trace import TraceAttr
from nepi.execution.ec import ExperimentController
from nepi.execution.trace import TraceAttr
diff --git
a/test/resources/linux/ns3/serialization.py
b/test/resources/linux/ns3/serialization.py
index
eb310d7
..
2685bb8
100755
(executable)
--- a/
test/resources/linux/ns3/serialization.py
+++ b/
test/resources/linux/ns3/serialization.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.trace import TraceAttr
from nepi.execution.ec import ExperimentController
from nepi.execution.trace import TraceAttr
diff --git
a/test/resources/linux/udptunnel.py
b/test/resources/linux/udptunnel.py
index
25d619e
..
2963f90
100755
(executable)
--- a/
test/resources/linux/udptunnel.py
+++ b/
test/resources/linux/udptunnel.py
@@
-17,7
+17,7
@@
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
#
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
diff --git
a/test/resources/ns3/ns3wrapper.py
b/test/resources/ns3/ns3wrapper.py
index
c6bff04
..
2051fdd
100755
(executable)
--- a/
test/resources/ns3/ns3wrapper.py
+++ b/
test/resources/ns3/ns3wrapper.py
@@
-28,11
+28,11
@@
#
# node n0 sends IGMP traffic to node n3
#
# node n0 sends IGMP traffic to node n3
-
+from __future__ import print_function
from nepi.resources.ns3.ns3wrapper import NS3Wrapper
from nepi.resources.ns3.ns3wrapper import NS3Wrapper
-import
io
+import
StringIO
import subprocess
import sys
import time
import subprocess
import sys
import time
diff --git
a/test/resources/omf/set_hook.py
b/test/resources/omf/set_hook.py
index
f01ec3e
..
1ac0693
100755
(executable)
--- a/
test/resources/omf/set_hook.py
+++ b/
test/resources/omf/set_hook.py
@@
-17,7
+17,7
@@
#
# Author: Julien Tribino <julien.tribino@inria.fr>
#
# Author: Julien Tribino <julien.tribino@inria.fr>
-
+from __future__ import print_function
from nepi.execution.resource import (ResourceFactory, clsinit_copy,
ResourceManager, ResourceAction, ResourceState)
from nepi.execution.resource import (ResourceFactory, clsinit_copy,
ResourceManager, ResourceAction, ResourceState)