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
use print() - import print_function - should be fine for both py2 and py3
[nepi.git]
/
examples
/
linux
/
ccn_transfer_using_linuxapp.py
diff --git
a/examples/linux/ccn_transfer_using_linuxapp.py
b/examples/linux/ccn_transfer_using_linuxapp.py
index
de85570
..
0395a40
100644
(file)
--- a/
examples/linux/ccn_transfer_using_linuxapp.py
+++ b/
examples/linux/ccn_transfer_using_linuxapp.py
@@
-5,9
+5,8
@@
# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
# 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
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-41,6
+40,8
@@
# $ 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
@@
-67,7
+68,7
@@
username = options.username
ssh_key = options.ssh_key
def add_node(ec, host, user, ssh_key = None):
ssh_key = options.ssh_key
def add_node(ec, host, user, ssh_key = None):
- node = ec.register_resource("
Linux
Node")
+ node = ec.register_resource("
linux::
Node")
ec.set(node, "hostname", host)
ec.set(node, "username", user)
ec.set(node, "identity", ssh_key)
ec.set(node, "hostname", host)
ec.set(node, "username", user)
ec.set(node, "identity", ssh_key)
@@
-121,7
+122,7
@@
def add_ccnd(ec, peers):
command += " ; ".join(peers) + " && "
command += " ccnr & "
command += " ; ".join(peers) + " && "
command += " ccnr & "
- app = ec.register_resource("
Linux
Application")
+ app = ec.register_resource("
linux::
Application")
ec.set(app, "depends", depends)
ec.set(app, "sources", sources)
ec.set(app, "install", install)
ec.set(app, "depends", depends)
ec.set(app, "sources", sources)
ec.set(app, "install", install)
@@
-135,7
+136,7
@@
def add_publish(ec, movie, content_name):
env = "PATH=$PATH:${BIN}/ccnx-0.8.2/bin"
command = "ccnseqwriter -r %s" % content_name
env = "PATH=$PATH:${BIN}/ccnx-0.8.2/bin"
command = "ccnseqwriter -r %s" % content_name
- app = ec.register_resource("
Linux
Application")
+ app = ec.register_resource("
linux::
Application")
ec.set(app, "stdin", movie)
ec.set(app, "env", env)
ec.set(app, "command", command)
ec.set(app, "stdin", movie)
ec.set(app, "env", env)
ec.set(app, "command", command)
@@
-146,7
+147,7
@@
def add_ccncat(ec, content_name):
env = "PATH=$PATH:${BIN}/ccnx-0.8.2/bin"
command = "ccncat %s" % content_name
env = "PATH=$PATH:${BIN}/ccnx-0.8.2/bin"
command = "ccncat %s" % content_name
- app = ec.register_resource("
Linux
Application")
+ app = ec.register_resource("
linux::
Application")
ec.set(app, "env", env)
ec.set(app, "command", command)
ec.set(app, "env", env)
ec.set(app, "command", command)
@@
-213,5
+214,5
@@
f.close()
# Shutdown the experiment controller
ec.shutdown()
# Shutdown the experiment controller
ec.shutdown()
-print
"Transfered FILE stored localy at video.ts"
+print
("Transfered FILE stored localy at video.ts")