use print() - import print_function - should be fine for both py2 and py3

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

diff --git a/test/resources/linux/ns3/ns3fdnetdevice.py b/test/resources/linux/ns3/ns3fdnetdevice.py
index 326ac45..6723629 100755 (executable)
--- a/test/resources/linux/ns3/ns3fdnetdevice.py
+++ b/test/resources/linux/ns3/ns3fdnetdevice.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
@@ -18,6 +17,8 @@
 #
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
+from __future__ import print_function
+
 from nepi.execution.ec import ExperimentController 
 from nepi.execution.trace import TraceAttr
 
@@ -51,9 +52,6 @@ def add_fd_device(ec, node, ip, prefix):
     ec.set(dev, "prefix", prefix)
     ec.register_connection(node, dev)
 
-    #queue = ec.register_resource("ns3::DropTailQueue")
-    #ec.register_connection(dev, queue)
-
     return dev
 
 class LinuxNS3FdNetDeviceTest(unittest.TestCase):
@@ -66,7 +64,7 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase):
     def t_dummy(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-ns3-fd-dummy")
         
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         if host == "localhost":
             ec.set(node, "hostname", "localhost")
         else:
@@ -77,7 +75,7 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase):
         ec.set(node, "cleanProcesses", True)
         #ec.set(node, "cleanExperiment", True)
 
-        simu = ec.register_resource("LinuxNS3Simulation")
+        simu = ec.register_resource("linux::ns3::Simulation")
         ec.set(simu, "simulatorImplementationType", "ns3::RealtimeSimulatorImpl")
         ec.set(simu, "checksumEnabled", True)
         ec.set(simu, "verbose", True)
@@ -108,7 +106,7 @@ class LinuxNS3FdNetDeviceTest(unittest.TestCase):
 
         stdout = ec.trace(simu, "stdout") 
 
-        print stdout
+        print(stdout)
 
         expected = "20 packets transmitted, 20 received, 0% packet loss"
         self.assertTrue(stdout.find(expected) > -1)