From fb002d754908edf9b3dbc11c2cd9111220cf402c Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Mon, 15 Dec 2014 11:41:06 +0100 Subject: [PATCH] Simple cross ping experiment between linux and ns3 --- test/resources/linux/ns3/cross_ns3_linux.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/test/resources/linux/ns3/cross_ns3_linux.py b/test/resources/linux/ns3/cross_ns3_linux.py index 8221ea7b..e7fc1966 100755 --- a/test/resources/linux/ns3/cross_ns3_linux.py +++ b/test/resources/linux/ns3/cross_ns3_linux.py @@ -100,7 +100,7 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase): nsnode2 = add_ns3_node(ec, simu) dev2 = add_point2point_device(ec, nsnode2, "10.0.0.2", "30") - # Add routes - n1 - n6 + # Add routes on the NS3 side r1 = ec.register_resource("ns3::Route") ec.set(r1, "network", "10.0.1.0") ec.set(r1, "prefix", "30") @@ -113,17 +113,6 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase): ec.register_connection(chan, dev1) ec.register_connection(chan, dev2) - # enable traces - """ - ec.enable_trace(dev1, "pcap") - ec.enable_trace(dev1, "promiscPcap") - ec.enable_trace(dev1, "ascii") - - ec.enable_trace(dev2, "pcap") - ec.enable_trace(dev2, "promiscPcap") - ec.enable_trace(dev2, "ascii") - """ - fddev = add_fd_device(ec, nsnode1, "10.0.1.2", "30") ec.enable_trace(fddev, "pcap") ec.enable_trace(fddev, "promiscPcap") @@ -138,6 +127,7 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase): ec.register_connection(crosslink, tap) ec.register_connection(crosslink, fddev) + # Add routes on the localhost side r2 = ec.register_resource("linux::Route") ec.set(r2, "network", "10.0.0.0") ec.set(r2, "prefix", "30") -- 2.43.0