use print() - import print_function - should be fine for both py2 and py3

[nepi.git] / examples / planetlab / select_nodes.py

diff --git a/examples/planetlab/select_nodes.py b/examples/planetlab/select_nodes.py
index 4151932..f856f52 100644 (file)
--- a/examples/planetlab/select_nodes.py
+++ b/examples/planetlab/select_nodes.py
@@ -1,6 +1,32 @@
+#
+#    NEPI, a framework to manage network experiments
+#    Copyright (C) 2014 INRIA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    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
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
+#
+
+# Example of how to run this experiment (replace with your information):
+#
+# $ 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 optparse import OptionParser, SUPPRESS_HELP
+from optparse import OptionParser
 import os
 
 usage = ("usage: %prog -s <pl-slice> -u <pl-user> -p <pl-password> "
@@ -38,7 +64,7 @@ os = options.os
 node_count = options.node_count
 
 def add_node(ec, pl_slice, pl_ssh_key, pl_user, pl_password, country, os):
-    node = ec.register_resource("PlanetlabNode")
+    node = ec.register_resource("planetlab::Node")
     ec.set(node, "username", pl_slice)
     ec.set(node, "identity", pl_ssh_key)
     ec.set(node, "pluser", pl_user)
@@ -49,7 +75,7 @@ def add_node(ec, pl_slice, pl_ssh_key, pl_user, pl_password, country, os):
     if os:
         ec.set(node, "operatingSystem", os)
 
-    ec.set(node, "cleanHome", True)
+    ec.set(node, "cleanExperiment", True)
     ec.set(node, "cleanProcesses", True)
 
     return node
@@ -67,10 +93,10 @@ ec.deploy()
 
 ec.wait_deployed(nodes)
 
-print "SELECTED HOSTS"
+print("SELECTED HOSTS")
 
 for node in nodes:
-    print ec.get(node, "hostname")
+    print(ec.get(node, "hostname"))
 
 ec.shutdown()