Tunnel between 2 ns-3s in remote PL hosts:q

[nepi.git] / src / nepi / resources / linux / ns3 / p2pfdudptunnel.py

diff --git a/src/nepi/resources/linux/ns3/p2pfdudptunnel.py b/src/nepi/resources/linux/ns3/p2pfdudptunnel.py
index e968ea3..72662b1 100644 (file)
--- a/src/nepi/resources/linux/ns3/p2pfdudptunnel.py
+++ b/src/nepi/resources/linux/ns3/p2pfdudptunnel.py
@@ -31,7 +31,8 @@ import time
 @clsinit_copy
 class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
     _rtype = "linux::ns3::FdUdpTunnel"
-    _help = "Constructs a tunnel between two Linux FileDescriptorNetdevices using a UDP connection "
+    _help = "Constructs a tunnel between two Ns-3 FdNetdevices " \
+            "located in remote Linux nodes using a UDP connection "
     _platform = "linux::ns3"
 
     @classmethod
@@ -157,7 +158,15 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
                 "linux-ns3-fd-udp-connect.py")
 
         scripts.append(linux_passfd)
-        
+       
+        # tunnel creation python script
+        tunchannel = os.path.join(os.path.dirname(__file__), 
+                "..", 
+                "scripts", 
+                "tunchannel.py")
+
+        scripts.append(tunchannel)
+
         # Upload scripts
         scripts = ";".join(scripts)
 
@@ -327,7 +336,6 @@ class LinuxNs3FdUdpTunnel(LinuxUdpTunnel):
         address = base64.b64encode(address)
         
         command = [""]
-        # Use pl-vid-udp-connect.py to stablish the tunnel between endpoints
         command.append("PYTHONPATH=$PYTHONPATH:${SRC}")
         command.append("python ${SRC}/linux-ns3-fd-udp-connect.py")
         command.append("-a %s" % address)