Changed the endpoint_ip and endpoint_prefix attributes of TAP/TUN endpoints for ip...

[nepi.git] / test / resources / linux / ns3 / cross_ns3_linux_ping.py

diff --git a/test/resources/linux/ns3/cross_ns3_linux.py b/test/resources/linux/ns3/cross_ns3_linux_ping.py
similarity index 95%
rename from test/resources/linux/ns3/cross_ns3_linux.py
rename to test/resources/linux/ns3/cross_ns3_linux_ping.py
index e7fc196..9c84930 100755 (executable)
--- a/test/resources/linux/ns3/cross_ns3_linux.py
+++ b/test/resources/linux/ns3/cross_ns3_linux_ping.py
@@ -54,6 +54,14 @@ def add_fd_device(ec, node, ip, prefix):
 
     return dev
 
+def add_tap_device(ec, node, ip, prefix):
+    dev = ec.register_resource("linux::Tap")
+    ec.set(dev, "ip", ip)
+    ec.set(dev, "prefix", prefix)
+    ec.register_connection(node, dev)
+    
+    return dev
+
 def add_point2point_device(ec, node, ip, prefix):
     dev = ec.register_resource("ns3::PointToPointNetDevice")
     ec.set(dev, "ip", ip)
@@ -118,10 +126,7 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase):
         ec.enable_trace(fddev, "promiscPcap")
         ec.enable_trace(fddev, "ascii")
 
-        tap = ec.register_resource("linux::Tap")
-        ec.set(tap, "endpoint_ip", "10.0.1.1")
-        ec.set(tap, "endpoint_prefix", 30)
-        ec.register_connection(tap, node)
+        tap = add_tap_device(ec, node, "10.0.1.1", "30")
 
         crosslink = ec.register_resource("linux::ns3::TapFdLink")
         ec.register_connection(crosslink, tap)