vod experiment files

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

diff --git a/examples/planetlab/scalability.py b/examples/planetlab/scalability.py
old mode 100755 (executable)
new mode 100644 (file)
index 4a028b4..466960a
--- a/examples/planetlab/scalability.py
+++ b/examples/planetlab/scalability.py
@@ -24,8 +24,8 @@ from nepi.execution.resource import ResourceAction, ResourceState
 import os
 import time
 
-def create_node(ec, username, pl_user, pl_password, hostname=None, country=None,
-                operatingSystem=None, minBandwidth=None, minCpu=None):
+def create_node(ec, username, pl_user, pl_password, critical=True, hostname=None, 
+                country=None, operatingSystem=None, minBandwidth=None, minCpu=None):
 
     node = ec.register_resource("PlanetlabNode")
 
@@ -46,9 +46,10 @@ def create_node(ec, username, pl_user, pl_password, hostname=None, country=None,
         ec.set(node, "minBandwidth", minBandwidth)
     if minCpu:
         ec.set(node, "minCpu", minCpu)
+    ec.set(node, "critical", critical)
 
-    ec.set(node, "cleanHome", True)
-    ec.set(node, "cleanProcesses", True)
+    #ec.set(node, "cleanHome", True)
+    #ec.set(node, "cleanProcesses", True)
     
     return node
 
@@ -99,18 +100,20 @@ hostnames = ['planetlab2.utt.fr',
 'planetlab1.rutgers.edu']
 
 for hostname in hostnames:
-    node = create_node(ec, username, pl_user, pl_password, hostname=hostname)
+    node = create_node(ec, username, pl_user, pl_password, hostname=hostname,
+            critical=False)
     first_set_nodes.append(node)
 
 # Second set of nodes will be U.S.A. nodes.
 country = "United States"
 for i in range(15):
-    node = create_node(ec, username, pl_user, pl_password, country=country)
+    node = create_node(ec, username, pl_user, pl_password, country=country,
+            critical=False)
     second_set_nodes.append(node)
 
 # Third set of nodes can be any node in Planetlab testbed.
 for i in range(70):
-    node = create_node(ec, username, pl_user, pl_password)
+    node = create_node(ec, username, pl_user, pl_password, critical=False)
     third_set_nodes.append(node)
 
 # Register conditions
@@ -124,7 +127,7 @@ for i in range(70):
 
 ec.register_condition(second_set_nodes, ResourceAction.DEPLOY, first_set_nodes, ResourceState.PROVISIONED)
 ec.register_condition(third_set_nodes, ResourceAction.DEPLOY, second_set_nodes, ResourceState.PROVISIONED)
-    
+ 
 # Deploy the experiment:
 ec.deploy()