Fix TunChannel: wait_tuniface must be assigned to prestart

diff --git a/src/nepi/testbeds/netns/metadata_v01.py b/src/nepi/testbeds/netns/metadata_v01.py
index 2d88b02..240f504 100644 (file)
--- a/src/nepi/testbeds/netns/metadata_v01.py
+++ b/src/nepi/testbeds/netns/metadata_v01.py
@@ -527,7 +527,7 @@ factories_info = dict({
         "create_function": create_tunchannel,
         "preconfigure_function": preconfigure_tunchannel,
         "configure_function": postconfigure_tunchannel,
-        "start_function": wait_tunchannel,
+        "prestart_function": wait_tunchannel,
         "help": "Channel to forward "+TAPIFACE+" data to "
                 "other TAP interfaces supporting the NEPI tunneling protocol.",
         "connector_types": ["->fd", "udp", "tcp"],

diff --git a/src/nepi/testbeds/ns3/factories_metadata_v3_9.py b/src/nepi/testbeds/ns3/factories_metadata_v3_9.py
index 4a2f929..8c43a96 100644 (file)
--- a/src/nepi/testbeds/ns3/factories_metadata_v3_9.py
+++ b/src/nepi/testbeds/ns3/factories_metadata_v3_9.py
@@ -1048,7 +1048,7 @@ factories_info = dict({
         "create_function": create_tunchannel,
         "preconfigure_function": preconfigure_tunchannel,
         "configure_function": postconfigure_tunchannel,
-        "start_function": wait_tunchannel,
+        "prestart_function": wait_tunchannel,
         "help": "Channel to forward FileDescriptorNetDevice data to "
                 "other TAP interfaces supporting the NEPI tunneling protocol.",
         "connector_types": ["fd->", "udp", "tcp"],

diff --git a/src/nepi/util/tunchannel_impl.py b/src/nepi/util/tunchannel_impl.py
index 14a34f4..bfc0ce5 100644 (file)
--- a/src/nepi/util/tunchannel_impl.py
+++ b/src/nepi/util/tunchannel_impl.py
@@ -371,7 +371,7 @@ def wait_tunchannel(testbed_instance, guid):
     """
     Wait for the channel forwarder to be up and running.
     
-    Useful as a start function to assure proper startup synchronization,
+    Useful as a pre-start function to assure proper startup synchronization,
     be certain to start TunChannels before applications that might require them.
     """
     element = testbed_instance.elements[guid]