X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Flinux%2Fns3%2Fcross_ns3_linux_ping.py;fp=test%2Fresources%2Flinux%2Fns3%2Fcross_ns3_linux_ping.py;h=6c7a07d62373817a9f73ee21afc5cd48a50ecea5;hb=76ec8fbc6c987d4208dd6d987de55a2ca543962f;hp=9c84930c2f715b0189e8e4e69c86d405fd33e61b;hpb=52e9a80764b98226727f1362d7c1f6246c06f92e;p=nepi.git

diff --git a/test/resources/linux/ns3/cross_ns3_linux_ping.py b/test/resources/linux/ns3/cross_ns3_linux_ping.py
index 9c84930c..6c7a07d6 100755
--- a/test/resources/linux/ns3/cross_ns3_linux_ping.py
+++ b/test/resources/linux/ns3/cross_ns3_linux_ping.py
@@ -30,8 +30,10 @@ import unittest
 
 def add_ns3_node(ec, simu):
     node = ec.register_resource("ns3::Node")
+    ec.set(node, "enableStack", True)
     ec.register_connection(node, simu)
 
+    """
     ipv4 = ec.register_resource("ns3::Ipv4L3Protocol")
     ec.register_connection(node, ipv4)
 
@@ -43,6 +45,7 @@ def add_ns3_node(ec, simu):
 
     udp = ec.register_resource("ns3::UdpL4Protocol")
     ec.register_connection(node, udp)
+    """
 
     return node
 
@@ -79,6 +82,10 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase):
         self.fedora_user = "inria_nepi"
         self.fedora_identity = "%s/.ssh/id_rsa_planetlab" % (os.environ['HOME'])
 
+        self.ubuntu_host = "roseval.pl.sophia.inria.fr"
+        self.ubuntu_user = "inria_nepi"
+        self.ubuntu_identity = "%s/.ssh/id_rsa" % (os.environ['HOME'])
+
     @skipIfNotAlive
     def t_cross_ping(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-linux-ns3-tap-fd")
@@ -128,7 +135,7 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase):
 
         tap = add_tap_device(ec, node, "10.0.1.1", "30")
 
-        crosslink = ec.register_resource("linux::ns3::TapFdLink")
+        crosslink = ec.register_resource("linux::ns3::TunTapFdLink")
         ec.register_connection(crosslink, tap)
         ec.register_connection(crosslink, fddev)
 
@@ -151,6 +158,7 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase):
         ec.wait_finished([app])
 
         stdout = ec.trace(app, "stdout")
+        print stdout
         expected = "3 packets transmitted, 3 received, 0% packet loss"
         self.assertTrue(stdout.find(expected) > -1)
 
@@ -164,6 +172,9 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase):
     def ztest_cross_ping_fedora(self):
         self.t_cross_ping(self.fedora_host, self.fedora_user, self.fedora_identity)
 
+    def ztest_cross_ping_ubuntu(self):
+        self.t_cross_ping(self.ubuntu_host, self.ubuntu_user, self.ubuntu_identity)
+
     def test_cross_ping_local(self):
         self.t_cross_ping("localhost")