Adding simpler ping experiment

diff --git a/examples/planetlab/ping_experiment.py b/examples/planetlab/ping_experiment.py
index 3576579..4a693fd 100755 (executable)
--- a/examples/planetlab/ping_experiment.py
+++ b/examples/planetlab/ping_experiment.py
@@ -23,53 +23,6 @@ from nepi.execution.resource import ResourceAction, ResourceState
 
 import os
 
-def create_node(ec, username, pl_user, pl_password, hostname=None, country=None,
-                operatingSystem=None, minBandwidth=None, minCpu=None):
-
-    node = ec.register_resource("PlanetlabNode")
-
-    if username:
-        ec.set(node, "username", username)
-    if pl_user:
-        ec.set(node, "pluser", pl_user)
-    if pl_password:
-        ec.set(node, "plpassword", pl_password)
-
-    if hostname:
-        ec.set(node, "hostname", hostname)
-    if country:
-        ec.set(node, "country", country)
-    if operatingSystem:
-        ec.set(node, "operatingSystem", operatingSystem)
-    if minBandwidth:
-        ec.set(node, "minBandwidth", minBandwidth)
-    if minCpu:
-        ec.set(node, "minCpu", minCpu)
-
-    ec.set(node, "cleanHome", True)
-    ec.set(node, "cleanProcesses", True)
-    
-    return node
-
-def add_app(ec, command, node, sudo=None, video=None, depends=None, forward_x11=None, \
-        env=None):
-    app = ec.register_resource("LinuxApplication")
-    if sudo is not None:
-        ec.set(app, "sudo", sudo)
-    if video is not None:
-        ec.set(app, "sources", video)
-    if depends is not None:
-        ec.set(app, "depends", depends)
-    if forward_x11 is not None:
-        ec.set(app, "forwardX11", forward_x11)
-    if env is not None:
-        ec.set(app, "env", env)
-    ec.set(app, "command", command)
-
-    ec.register_connection(app, node)
-
-    return app
-
 exp_id = "ping_exp"
 
 # Create the entity Experiment Controller:
@@ -86,74 +39,35 @@ username = "inria_sfatest"
 pl_user = "lucia.guevgeozian_odizzio@inria.fr"
 pl_password =  os.environ.get("PL_PASS")
 
-# Choose the PlanetLab nodes for the experiment, in this example 5 nodes are
-# used, and they are picked according to different criterias.
-
-# First node will be the one defined by its hostname.
-hostname = "planetlab2.utt.fr"
-node1 = create_node(ec, username, pl_user, pl_password, hostname=hostname)
-
-# Second node will be any node in France.
-country = "France"
-node2 = create_node(ec, username, pl_user, pl_password, country=country)
-
-# Third node will be a node in France that has Fedora 14 installed.
-operatingSystem = "f14"
-node3 = create_node(ec, username, pl_user, pl_password, country=country,
-                operatingSystem=operatingSystem)
-
-# Forth node will have at least 50% of CPU available
-minCpu=50
-node4 = create_node(ec, username, pl_user, pl_password, minCpu=minCpu)
-
-# Fifth node can be any node, constrains are not important.
-node5 = create_node(ec, username, pl_user, pl_password)
-
-# Register the applications to run in the nodes, in this case just ping to the 
-# first node:
-apps_per_node = dict()
-apps = []
-for node in [node2, node3, node4, node5]:
-    command = "ping -c5 %s > ping%s.txt" % (hostname, node)
-    app = add_app(ec, command, node)
-    apps_per_node[node] = app
-    apps.append(app)
-
-# Register conditions
+# Define a Planetlab Node with no restriction, it can be any node
+node = ec.register_resource('PlanetlabNode')
+ec.set(node, "username", username)
+ec.set(node, "pluser", pl_user)
+ec.set(node, "plpassword", pl_password)
+ec.set(node, "cleanHome", True)
+ec.set(node, "cleanProcesses", True)
 
-# The nodes that are completely identified by their hostnames have to be provisioned 
-# before the rest of the nodes. This assures that no other resource will use the
-# identified node even if the constraints matchs. 
-# In this example node2, node3, node4 and node5, are deployed after node1 is 
-# provisioned. node1 must be the node planetlab2.utt.fr, meanwhile node2, node3,
-# node4 and node5 just need to fulfill certain constraints.
-# Applications are always deployed after nodes, so no need to register conditions
-# for the apps in this example.
+# Define a ping application
+app = ec.register_resource('LinuxApplication')
+ec.set(app, 'command', 'ping -c5 google.com > ping_google.txt')
 
-ec.register_condition(node2, ResourceAction.DEPLOY, node1, ResourceState.PROVISIONED)
-ec.register_condition(node3, ResourceAction.DEPLOY, node1, ResourceState.PROVISIONED)
-ec.register_condition(node4, ResourceAction.DEPLOY, node1, ResourceState.PROVISIONED)
-ec.register_condition(node5, ResourceAction.DEPLOY, node1, ResourceState.PROVISIONED)
+# Connect the application to the node
+ec.register_connection(node, app)
     
 # Deploy the experiment:
 ec.deploy()
 
-# Wait until the applications are finish to retrive the traces:
-ec.wait_finished(apps)
+# Wait until the application is finish to retrive the trace:
+ec.wait_finished(app)
 
-traces = dict() 
-for node, app in apps_per_node.iteritems():
-    ping_string = "ping%s.txt" % node
-    trace = ec.trace(app, ping_string)
-    traces[node]= trace
+trace = ec.trace(app, 'ping_google.txt')
 
 # Choose a directory to store the traces locally, change to a convenient path for you:
 directory = "examples/planetlab/"
-for node, trace in traces.iteritems():
-    trace_file = directory + "ping%s.txt" % node
-    f = open(trace_file, "w")
-    f.write(trace)
-    f.close()
+trace_file = directory + "ping_google.txt"
+f = open(trace_file, "w")
+f.write(trace)
+f.close()
 
 # Do the experiment controller shutdown:
 ec.shutdown()