X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Flinux%2Fnetcat_file_transfer.py;h=3734af318890194e20462a383de8c0d0af2979df;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=69091b49c2d346220bbc4abe4d9876bbc5459f9b;hpb=19e3969ca3da5eb9da00d2a0cc256eee2eb70533;p=nepi.git

diff --git a/examples/linux/netcat_file_transfer.py b/examples/linux/netcat_file_transfer.py
index 69091b49..3734af31 100644
--- a/examples/linux/netcat_file_transfer.py
+++ b/examples/linux/netcat_file_transfer.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
@@ -20,10 +19,12 @@
 #         Alina Quereilhac <alina.quereilhac@inria.fr>
 #
 #
-# Example of how to run this experiment (replace with your credentials):
+# Example of how to run this experiment (replace with your information):
 #
 # $ cd <path-to-nepi>
-# python examples/linux/netcat_file_transfer.py -a <hostanme1> -b <hostname2> -u <username> -i <ssh-key>
+# 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
@@ -54,7 +55,7 @@ ssh_key = options.ssh_key
 ec = ExperimentController(exp_id = "nc_file_transfer")
 
 ## Register node 1
-node1 = ec.register_resource("LinuxNode")
+node1 = ec.register_resource("linux::Node")
 # Set the hostname of the first node to use for the experiment
 ec.set(node1, "hostname", hostname1)
 # username should be your SSH user 
@@ -67,7 +68,7 @@ ec.set(node1, "cleanExperiment", True)
 ec.set(node1, "cleanProcesses", True)
 
 ## Register node 2 
-node2 = ec.register_resource("LinuxNode")
+node2 = ec.register_resource("linux::Node")
 # Set the hostname of the first node to use for the experiment
 ec.set(node2, "hostname", hostname2)
 # username should be your SSH user 
@@ -88,7 +89,7 @@ local_path_to_video = os.path.join(
 command = "cat ${SHARE}/%s | pv -fbt 2> bw.txt | nc %s 1234" % ( 
         video, hostname2 )
 
-server = ec.register_resource("LinuxApplication")
+server = ec.register_resource("linux::Application")
 ec.set(server, "depends", "pv nc tcpdump")
 ec.set(server, "files", local_path_to_video)
 ec.set(server, "command", command)
@@ -100,7 +101,7 @@ ec.register_connection(server, node1)
 # if not nc in the client side close the socket suddently if runned in background
 command =  "nc -dl 1234 > %s" % video
 
-client = ec.register_resource("LinuxApplication")
+client = ec.register_resource("linux::Application")
 ec.set(client, "depends", "nc")
 ec.set(client, "command", command)
 ec.register_connection(client, node2)
@@ -108,7 +109,7 @@ ec.register_connection(client, node2)
 # Register a tcpdump in the server node to monitor the file transfer 
 command = "tcpdump -ni eth0 -w file_transfer.pcap -s0 port 1234 2>&1"
 
-capture = ec.register_resource("LinuxApplication")
+capture = ec.register_resource("linux::Application")
 ec.set(capture, "depends", "tcpdump")
 ec.set(capture, "command", command)
 ec.set(capture, "sudo", True)
@@ -139,3 +140,5 @@ f.close()
 
 ec.shutdown()
 
+print("Total bytes transfered saved to bw.txt...")
+