X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fns3%2Fns3wrapper.py;h=2051fdddc9e2dd2bc666991d26ab58ce99f25ecb;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=70bf970e3b38bec392e1091401b8849c81f347f9;hpb=fdbe8428159db491e9498449443be4d093cd9b8a;p=nepi.git

diff --git a/test/resources/ns3/ns3wrapper.py b/test/resources/ns3/ns3wrapper.py
index 70bf970e..2051fddd 100755
--- a/test/resources/ns3/ns3wrapper.py
+++ b/test/resources/ns3/ns3wrapper.py
@@ -4,9 +4,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,10 +28,13 @@
 #
 #  node n0 sends IGMP traffic to node n3
 
+from __future__ import print_function
 
 from nepi.resources.ns3.ns3wrapper import NS3Wrapper
 
+import StringIO
 import subprocess
+import sys
 import time
 import unittest
 
@@ -179,10 +181,10 @@ class NS3WrapperTest(unittest.TestCase):
         wrapper.invoke(csma, "EnableAsciiAll", "/tmp/csma-ping-ascii")
  
         def SinkRx(packet, address):
-            print packet
+            print(packet)
 
         def PingRtt(context, rtt):
-            print context, rtt
+            print(context, rtt)
       
         # XXX: No biding for MakeCallback
         #Config::ConnectWithoutContext ("/NodeList/3/ApplicationList/0/$ns3::PacketSink/Rx", 
@@ -212,12 +214,13 @@ class NS3WrapperTest(unittest.TestCase):
                 stderr = subprocess.PIPE, shell = True)
         (out, err) = p.communicate()
 
-        self.assertEquals(int(out), 8)
+        self.assertEqual(int(out), 8)
 
         p = subprocess.Popen("rm /tmp/csma-ping-*",  shell = True)
         p.communicate()
 
     def test_start(self):
+        # Instantiate ns-3
         wrapper = NS3Wrapper()
 
         ### create 2  nodes
@@ -291,6 +294,8 @@ class NS3WrapperTest(unittest.TestCase):
         # wait until simulation is over
         wrapper.shutdown()
 
+        # TODO: Add assertions !!
+
     def test_runtime_attr_modify(self):
         wrapper = NS3Wrapper()
        
@@ -360,7 +365,7 @@ class NS3WrapperTest(unittest.TestCase):
         wrapper.invoke(ipv41, "SetUp", ifindex1)
 
         # Enable collection of Ascii format to a specific file
-        filepath1 = "trace-p2p-1.tr"
+        filepath1 = "/tmp/trace-p2p-1.tr"
         stream1 = wrapper.invoke(asciiHelper, "CreateFileStream", filepath1)
         wrapper.invoke(p2pHelper, "EnableAscii", stream1, p1)
        
@@ -380,7 +385,7 @@ class NS3WrapperTest(unittest.TestCase):
         wrapper.invoke(ipv42, "SetUp", ifindex2)
 
         # Enable collection of Ascii format to a specific file
-        filepath2 = "trace-p2p-2.tr"
+        filepath2 = "/tmp/trace-p2p-2.tr"
         stream2 = wrapper.invoke(asciiHelper, "CreateFileStream", filepath2)
         wrapper.invoke(p2pHelper, "EnableAscii", stream2, p2)
 
@@ -414,6 +419,11 @@ class NS3WrapperTest(unittest.TestCase):
         # wait until simulation is over
         wrapper.shutdown()
 
+        p = subprocess.Popen("rm /tmp/trace-p2p-*",  shell = True)
+        p.communicate()
+        
+        # TODO: Add assertions !!
+
 if __name__ == '__main__':
     unittest.main()