X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fresources%2Fomf%2Fomf6_vlc_traces.py;h=7a922d13637d79c67fbb2bd11c6e729709a7b795;hb=1d2350d56f314a6e3de43517a66f7e2f48128d44;hp=e06fa337f93a020ad5861c37a3a38e01cc71d078;hpb=a55b5cf0818ced6ab8dc3e88fad7f6616675e826;p=nepi.git

diff --git a/test/resources/omf/omf6_vlc_traces.py b/test/resources/omf/omf6_vlc_traces.py
index e06fa337..7a922d13 100755
--- a/test/resources/omf/omf6_vlc_traces.py
+++ b/test/resources/omf/omf6_vlc_traces.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
@@ -38,28 +37,28 @@ class OMFPingNormalCase(unittest.TestCase):
     def test_deploy(self):
         ec = ExperimentController(exp_id = "5421" )
 
-        self.node1 = ec.register_resource("OMFNode")
+        self.node1 = ec.register_resource("omf::Node")
         ec.set(self.node1, 'hostname', 'wlab12')
         ec.set(self.node1, 'xmppUser', "nepi")
         ec.set(self.node1, 'xmppServer', "xmpp-plexus.onelab.eu")
         ec.set(self.node1, 'xmppPort', "5222")
         ec.set(self.node1, 'xmppPassword', "1234")
         
-        self.iface1 = ec.register_resource("OMFWifiInterface")
+        self.iface1 = ec.register_resource("omf::WifiInterface")
         ec.set(self.iface1, 'name', "wlan0")
         ec.set(self.iface1, 'mode', "adhoc")
         ec.set(self.iface1, 'hw_mode', "g")
         ec.set(self.iface1, 'essid', "vlcexp")
         ec.set(self.iface1, 'ip', "10.0.0.17/24")
         
-        self.channel = ec.register_resource("OMFChannel")
+        self.channel = ec.register_resource("omf::Channel")
         ec.set(self.channel, 'channel', "6")
         ec.set(self.channel, 'xmppUser', "nepi")
         ec.set(self.channel, 'xmppServer', "xmpp-plexus.onelab.eu")
         ec.set(self.channel, 'xmppPort', "5222")
         ec.set(self.channel, 'xmppPassword', "1234")
         
-        self.app1 = ec.register_resource("OMFApplication")
+        self.app1 = ec.register_resource("omf::Application")
         ec.set(self.app1, 'appid', 'Vlc#1')
         ec.set(self.app1, 'command', "ping -c5 10.0.0.17")
 
@@ -77,34 +76,31 @@ class OMFPingNormalCase(unittest.TestCase):
         stderr_1 = ec.trace(self.app1, "stderr")
 
         if stdout_1:
-            f = open("app1_out.txt", "w")
-            f.write(stdout_1)
-            f.close()
+            with open("app1_out.txt", "w") as f:
+                f.write(stdout_1)
 
         if stderr_1:
-            f = open("app1_err.txt", "w")
-            f.write(stderr_1)
-            f.close()
+            with open("app1_err.txt", "w") as f:
+                f.write(stderr_1)
 
-        self.assertEquals(ec.get_resource(self.node1).state, ResourceState.STARTED)
-        self.assertEquals(ec.get_resource(self.iface1).state, ResourceState.STARTED)
-        self.assertEquals(ec.get_resource(self.channel).state, ResourceState.STARTED)
-        self.assertEquals(ec.get_resource(self.app1).state, ResourceState.STOPPED)
+        self.assertEqual(ec.get_resource(self.node1).state, ResourceState.STARTED)
+        self.assertEqual(ec.get_resource(self.iface1).state, ResourceState.STARTED)
+        self.assertEqual(ec.get_resource(self.channel).state, ResourceState.STARTED)
+        self.assertEqual(ec.get_resource(self.app1).state, ResourceState.STOPPED)
 
         ec.shutdown()
 
-        self.assertEquals(ec.get_resource(self.node1).state, ResourceState.RELEASED)
-        self.assertEquals(ec.get_resource(self.iface1).state, ResourceState.RELEASED)
-        self.assertEquals(ec.get_resource(self.channel).state, ResourceState.RELEASED)
-        self.assertEquals(ec.get_resource(self.app1).state, ResourceState.RELEASED)
+        self.assertEqual(ec.get_resource(self.node1).state, ResourceState.RELEASED)
+        self.assertEqual(ec.get_resource(self.iface1).state, ResourceState.RELEASED)
+        self.assertEqual(ec.get_resource(self.channel).state, ResourceState.RELEASED)
+        self.assertEqual(ec.get_resource(self.app1).state, ResourceState.RELEASED)
 
-        t = open("app1_out.txt", "r")
-        l = t.readlines()
-        self.assertEquals(l[0], "PING 10.0.0.17 (10.0.0.17) 56(84) bytes of data.\n")
-        self.assertIn("5 packets transmitted, 5 received, 0% packet loss, time", l[-2])
-        self.assertIn("rtt min/avg/max/mdev = ", l[-1])
+        with open("app1_out.txt", "r") as t:
+            l = t.readlines()
+            self.assertEqual(l[0], "PING 10.0.0.17 (10.0.0.17) 56(84) bytes of data.\n")
+            self.assertIn("5 packets transmitted, 5 received, 0% packet loss, time", l[-2])
+            self.assertIn("rtt min/avg/max/mdev = ", l[-1])
         
-        t.close()
         os.remove("app1_out.txt")