various formatting, including mixes of tab and spaces detected in py3

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

diff --git a/test/resources/linux/ns3/ns3dceping.py b/test/resources/linux/ns3/ns3dceping.py
index 3e111ac..d43ea31 100755 (executable)
--- a/test/resources/linux/ns3/ns3dceping.py
+++ b/test/resources/linux/ns3/ns3dceping.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
@@ -70,7 +69,7 @@ class LinuxNS3PingDceApplicationTest(unittest.TestCase):
     def t_dce_ping(self, host, user = None, identity = None):
         ec = ExperimentController(exp_id = "test-dce-ping-app")
 
-        node = ec.register_resource("LinuxNode")
+        node = ec.register_resource("linux::Node")
         if host == "localhost":
             ec.set(node, "hostname", host)
         else:
@@ -81,7 +80,7 @@ class LinuxNS3PingDceApplicationTest(unittest.TestCase):
         ec.set(node, "cleanProcesses", True)
         #ec.set(node, "cleanHome", True)
 
-        simu = ec.register_resource("LinuxNS3Simulation")
+        simu = ec.register_resource("linux::ns3::Simulation")
         ec.set(simu, "verbose", True)
         ec.set(simu, "buildMode", "debug")
         ec.set(simu, "nsLog", "DceApplication")
@@ -103,7 +102,7 @@ class LinuxNS3PingDceApplicationTest(unittest.TestCase):
         ec.register_connection(chan, p2p2)
 
         ### create applications
-        ping = ec.register_resource("ns3::LinuxDcePing")
+        ping = ec.register_resource("linux::ns3::dce::Ping")
         ec.set (ping, "stackSize", 1<<20)
         ec.set (ping, "target", "10.0.0.2")
         ec.set (ping, "count", "10")