- Merge with head

[nepi.git] / src / nepi / testbeds / planetlab / metadata_v01.py

diff --git a/src/nepi/testbeds/planetlab/metadata_v01.py b/src/nepi/testbeds/planetlab/metadata_v01.py
index 396c920..9c85c04 100644 (file)
--- a/src/nepi/testbeds/planetlab/metadata_v01.py
+++ b/src/nepi/testbeds/planetlab/metadata_v01.py
@@ -20,6 +20,7 @@ TUNIFACE = "TunInterface"
 APPLICATION = "Application"
 DEPENDENCY = "Dependency"
 NEPIDEPENDENCY = "NepiDependency"
+NS3DEPENDENCY = "NS3Dependency"
 INTERNET = "Internet"
 NETPIPE = "NetPipe"
 
@@ -114,6 +115,11 @@ def connect_dep(testbed_instance, node_guid, app_guid):
     if app.add_to_path:
         if app.home_path and app.home_path not in node.pythonpath:
             node.pythonpath.append(app.home_path)
+    
+    if app.env:
+        for envkey, envval in app.env.iteritems():
+            envval = app._replace_paths(envval)
+            node.env[envkey].append(envval)
 
 def connect_node_netpipe(testbed_instance, node_guid, netpipe_guid):
     node = testbed_instance._elements[node_guid]
@@ -178,6 +184,15 @@ def create_nepi_dependency(testbed_instance, guid):
     
     testbed_instance.elements[guid] = element
 
+def create_ns3_dependency(testbed_instance, guid):
+    parameters = testbed_instance._get_parameters(guid)
+    element = testbed_instance._make_ns3_dependency(parameters)
+    
+    # Just inject configuration stuff
+    element.home_path = "nepi-ns3-%s" % (guid,)
+    
+    testbed_instance.elements[guid] = element
+
 def create_internet(testbed_instance, guid):
     parameters = testbed_instance._get_parameters(guid)
     element = testbed_instance._make_internet(parameters)
@@ -424,6 +439,12 @@ connections = [
         "init_code": connect_dep,
         "can_cross": False
     }),
+    dict({
+        "from": (TESTBED_ID, NODE, "deps"),
+        "to":   (TESTBED_ID, NS3DEPENDENCY, "node"),
+        "init_code": connect_dep,
+        "can_cross": False
+    }),
     dict({
         "from": (TESTBED_ID, NODE, "pipes"),
         "to":   (TESTBED_ID, NETPIPE, "node"),
@@ -749,9 +770,9 @@ traces = dict({
               }),
     })
 
-create_order = [ INTERNET, NODE, NODEIFACE, TUNIFACE, NETPIPE, NEPIDEPENDENCY, DEPENDENCY, APPLICATION ]
+create_order = [ INTERNET, NODE, NODEIFACE, TUNIFACE, NETPIPE, NEPIDEPENDENCY, NS3DEPENDENCY, DEPENDENCY, APPLICATION ]
 
-configure_order = [ INTERNET, NODE, NODEIFACE, TUNIFACE, NETPIPE, NEPIDEPENDENCY, DEPENDENCY, APPLICATION ]
+configure_order = [ INTERNET, NODE, NODEIFACE, TUNIFACE, NETPIPE, NEPIDEPENDENCY, NS3DEPENDENCY, DEPENDENCY, APPLICATION ]
 
 factories_info = dict({
     NODE: dict({
@@ -830,6 +851,15 @@ factories_info = dict({
             "connector_types": ["node"],
             "traces": ["buildlog"]
         }),
+    NS3DEPENDENCY: dict({
+            "help": "Requirement for NS3 inside NEPI - required to run NS3 testbed instances inside a node. It also needs NepiDependency.",
+            "category": "applications",
+            "create_function": create_ns3_dependency,
+            "configure_function": configure_dependency,
+            "box_attributes": [ ],
+            "connector_types": ["node"],
+            "traces": ["buildlog"]
+        }),
     INTERNET: dict({
             "help": "Internet routing",
             "category": "topology",