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

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

diff --git a/examples/planetlab/ping_with_filters.py b/examples/planetlab/ping_with_filters.py
index 71f23d9..f21d282 100644 (file)
--- a/examples/planetlab/ping_with_filters.py
+++ b/examples/planetlab/ping_with_filters.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
@@ -23,6 +22,8 @@
 # $ 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
 
@@ -34,7 +35,7 @@ def create_node(ec, pl_slice, pl_ssh_key, pl_user, pl_password,
        hostname = None, country = None, operatingSystem = None, 
        minBandwidth = None, minCpu = None):
 
-    node = ec.register_resource("PlanetlabNode")
+    node = ec.register_resource("planetlab::Node")
 
     ec.set(node, "username", pl_slice)
     ec.set(node, "identity", pl_ssh_key)
@@ -52,14 +53,14 @@ def create_node(ec, pl_slice, pl_ssh_key, pl_user, pl_password,
     if minCpu:
         ec.set(node, "minCpu", minCpu)
 
-    ec.set(node, "cleanHome", True)
+    ec.set(node, "cleanExperiment", True)
     ec.set(node, "cleanProcesses", True)
     
     return node
 
 def add_app(ec, command, node, newname = None, sudo = None, 
         video = None, depends = None, forward_x11 = None, env = None):
-    app = ec.register_resource("LinuxApplication")
+    app = ec.register_resource("linux::Application")
 
     if sudo is not None:
         ec.set(app, "sudo", sudo)
@@ -179,7 +180,7 @@ ec.deploy()
 # Wait until the applications are finish to retrive the traces:
 ec.wait_finished(apps)
 
-print "Results stored at", ec.exp_dir
+print("Results stored at", ec.exp_dir)
 
 # Do the experiment controller shutdown:
 ec.shutdown()