register_resource accepts a keyword argument, so that subsequent calls to ec.set...

[nepi.git] / examples / linux / ping.py

diff --git a/examples/linux/ping.py b/examples/linux/ping.py
index 0b8715a..4d6c7a9 100644 (file)
--- a/examples/linux/ping.py
+++ b/examples/linux/ping.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
@@ -18,32 +17,47 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
-# Example of how to run this experiment (replace with your information):
+# This very simple experiment will ssh in a linux box, and from there
+# issue a ping command towards a landmark (default faraday.inria.fr)
 #
-# $ cd <path-to-nepi>
-# python examples/linux/ping.py -a <hostname> -u <username> -i <ssh-key>
+# $ ping.py -u root mybox.domain.com
+# 
+# would do the equivalent of
+# ssh root@mybox.domain.com ping -c3 faraday.inria.fr
+#
+# If nepi is not installed in your system, and you only have a git clone
+# you might wish to do instead
+#  
+# $ cd <path-to-nepi>/src
+# $ python ../examples/linux/ping.py -u root mybox.domain.com
+
+# let's be ready for python3
+from __future__ import print_function
 
+import os
+from argparse import ArgumentParser
 
 from nepi.execution.ec import ExperimentController 
 
-from optparse import OptionParser, SUPPRESS_HELP
-import os
+# 
+default_landmark = "faraday.inria.fr"
 
-usage = ("usage: %prog -a <hostanme> -u <username> -i <ssh-key>")
+parser = ArgumentParser()
+parser.add_argument("-u", "--username", dest="username", 
+                    help="Username to SSH to remote host")
+parser.add_argument("-i", "--ssh-key", dest="ssh_key", 
+                    help="Path to private SSH key to be used for connection")
+parser.add_argument("-l", "--landmark", dest='landmark', default=default_landmark,
+                    help="Set pings destination, default={}".format(default_landmark))
+# this is required
+parser.add_argument("hostname", type=str)
 
-parser = OptionParser(usage = usage)
-parser.add_option("-a", "--hostname", dest="hostname", 
-        help="Remote host", type="str")
-parser.add_option("-u", "--username", dest="username", 
-        help="Username to SSH to remote host", type="str")
-parser.add_option("-i", "--ssh-key", dest="ssh_key", 
-        help="Path to private SSH key to be used for connection", 
-        type="str")
-(options, args) = parser.parse_args()
+args = parser.parse_args()
 
-hostname = options.hostname
-username = options.username
-ssh_key = options.ssh_key
+hostname = args.hostname
+username = args.username
+ssh_key = args.ssh_key
+landmark = args.landmark
 
 ec = ExperimentController(exp_id = "ping-exp")
         
@@ -55,14 +69,14 @@ ec.set(node, "cleanExperiment", True)
 ec.set(node, "cleanProcesses", True)
 
 app = ec.register_resource("linux::Application")
-ec.set(app, "command", "ping -c3 nepi.inria.fr")
+ec.set(app, "command", "ping -c3 {}".format(landmark))
 ec.register_connection(app, node)
 
 ec.deploy()
 
 ec.wait_finished(app)
 
-print ec.trace(app, "stdout")
+print(ec.trace(app, "stdout"))
 
 ec.shutdown()