Metadata for ns3 v 3.9.rc3

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

diff --git a/src/nepi/testbeds/netns/metadata_v01.py b/src/nepi/testbeds/netns/metadata_v01.py
index 2006245..ee9a44f 100644 (file)
--- a/src/nepi/testbeds/netns/metadata_v01.py
+++ b/src/nepi/testbeds/netns/metadata_v01.py
@@ -37,7 +37,8 @@ def connect_fd_local(testbed_instance, tap, fdnd):
 
 ### Creation functions ###
 
-def create_node(testbed_instance, guid, parameters, factory_parameters):
+def create_node(testbed_instance, guid):
+    parameters = testbed_instance._get_parameters(guid)
     forward_X11 = False
     if "forward_X11" in parameters:
         forward_X11 = parameters["forward_X11"]
@@ -45,7 +46,7 @@ def create_node(testbed_instance, guid, parameters, factory_parameters):
     element = testbed_instance.netns.Node(forward_X11 = forward_X11)
     testbed_instance.elements[guid] = element
 
-def create_p2piface(testbed_instance, guid, parameters, factory_parameters):
+def create_p2piface(testbed_instance, guid):
     if guid in testbed_instance.elements:
         # The interface pair was already instantiated
         return
@@ -71,7 +72,7 @@ def create_p2piface(testbed_instance, guid, parameters, factory_parameters):
     testbed_instance.elements[guid] = element1
     testbed_instance.elements[guid2] = element2
 
-def create_tapiface(testbed_instance, guid, parameters, factory_parameters):
+def create_tapiface(testbed_instance, guid):
     node_guid = testbed_instance.get_connected(guid, "node", "devs")
     if len(node_guid) == 0:
         raise RuntimeError("Can't instantiate interface %d outside netns \
@@ -80,7 +81,7 @@ def create_tapiface(testbed_instance, guid, parameters, factory_parameters):
     element = node.add_tap()
     testbed_instance.elements[guid] = element
 
-def create_nodeiface(testbed_instance, guid, parameters, factory_parameters):
+def create_nodeiface(testbed_instance, guid):
     node_guid = testbed_instance.get_connected(guid, "node", "devs")
     if len(node_guid) == 0:
         raise RuntimeError("Can't instantiate interface %d outside netns \
@@ -89,16 +90,18 @@ def create_nodeiface(testbed_instance, guid, parameters, factory_parameters):
     element = node.add_if()
     testbed_instance.elements[guid] = element
 
-def create_switch(testbed_instance, guid, parameters, factory_parameters):
+def create_switch(testbed_instance, guid):
     element = testbed_instance.netns.Switch()
     testbed_instance.elements[guid] = element
 
-def create_application(testbed_instance, guid, parameters, factory_parameters):
+def create_application(testbed_instance, guid):
     testbed_instance.elements[guid] = None # Delayed construction 
 
 ### Start/Stop functions ###
 
-def start_application(testbed_instance, guid, parameters, traces):
+def start_application(testbed_instance, guid):
+    parameters = testbed_instance._get_parameters(guid)
+    traces = testbed_instance._get_traces(guid)
     user = parameters["user"]
     command = parameters["command"]
     stdout = stderr = None
@@ -122,7 +125,7 @@ def start_application(testbed_instance, guid, parameters, traces):
 
 ### Status functions ###
 
-def status_application(testbed_instance, guid, parameters, traces):
+def status_application(testbed_instance, guid):
     if guid not in testbed_instance.elements.keys():
         return STATUS_NOT_STARTED
     app = testbed_instance.elements[guid]