6.1.2

[nepi.git] / examples / omf / testing / nepi_omf5_nitos_vlc_tribino.py

diff --git a/examples/omf/testing/nepi_omf5_nitos_vlc_tribino.py b/examples/omf/testing/nepi_omf5_nitos_vlc_tribino.py
index e1eabf5..eb1b6f6 100644 (file)
--- a/examples/omf/testing/nepi_omf5_nitos_vlc_tribino.py
+++ b/examples/omf/testing/nepi_omf5_nitos_vlc_tribino.py
@@ -1,22 +1,24 @@
-"""
-    NEPI, a framework to manage network experiments
-    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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#!/usr/bin/env python
+#
+#    NEPI, a framework to manage network experiments
+#    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 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
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
+#         Julien Tribino <julien.tribino@inria.fr>
 
-    Author: Alina Quereilhac <alina.quereilhac@inria.fr>
-            Julien Tribino <julien.tribino@inria.fr>
+"""
 
     Example :
       - Testbed : Nitos
@@ -41,7 +43,6 @@
 
 """
 
-#!/usr/bin/env python
 from nepi.execution.resource import ResourceFactory, ResourceAction, ResourceState
 from nepi.execution.ec import ExperimentController
 
@@ -49,7 +50,7 @@ from nepi.execution.ec import ExperimentController
 ec = ExperimentController()
 
 # Create and Configure the Nodes
-node1 = ec.register_resource("OMFNode")
+node1 = ec.register_resource("omf::Node")
 ec.set(node1, 'hostname', 'omf.nitos.node025')
 ec.set(node1, 'xmppServer', "tribino")
 ec.set(node1, 'xmppUser', "nitlab.inf.uth.gr")
@@ -57,7 +58,7 @@ ec.set(node1, 'xmppPort', "5222")
 ec.set(node1, 'xmppPassword', "1234")
 ec.set(node1, 'version', "5")
 
-node2 = ec.register_resource("OMFNode")
+node2 = ec.register_resource("omf::Node")
 ec.set(node2, 'hostname', "omf.nitos.node028")
 ec.set(node2, 'xmppServer', "tribino")
 ec.set(node2, 'xmppUser', "nitlab.inf.uth.gr")
@@ -66,7 +67,7 @@ ec.set(node2, 'xmppPassword', "1234")
 ec.set(node2, 'version', "5")
 
 # Create and Configure the Interfaces
-iface1 = ec.register_resource("OMFWifiInterface")
+iface1 = ec.register_resource("omf::WifiInterface")
 ec.set(iface1, 'name', "wlan0")
 ec.set(iface1, 'mode', "adhoc")
 ec.set(iface1, 'hw_mode', "g")
@@ -74,7 +75,7 @@ ec.set(iface1, 'essid', "vlcexp")
 ec.set(iface1, 'ip', "192.168.0.25/24")
 ec.set(iface1, 'version', "5")
 
-iface2 = ec.register_resource("OMFWifiInterface")
+iface2 = ec.register_resource("omf::WifiInterface")
 ec.set(iface2, 'name', "wlan0")
 ec.set(iface2, 'mode', "adhoc")
 ec.set(iface2, 'hw_mode', 'g')
@@ -83,7 +84,7 @@ ec.set(iface2, 'ip', "192.168.0.28/24")
 ec.set(iface2, 'version', "5")
 
 # Create and Configure the Channel
-channel = ec.register_resource("OMFChannel")
+channel = ec.register_resource("omf::Channel")
 ec.set(channel, 'channel', "6")
 ec.set(channel, 'xmppServer', "tribino")
 ec.set(channel, 'xmppUser', "nitlab.inf.uth.gr")
@@ -92,25 +93,25 @@ ec.set(channel, 'xmppPassword', "1234")
 ec.set(channel, 'version', "5")
 
 # Create and Configure the Application
-app1 = ec.register_resource("OMFApplication")
+app1 = ec.register_resource("omf::Application")
 ec.set(app1, 'appid', 'Vlc#1')
 ec.set(app1, 'command', "/root/vlc/vlc-1.1.13/cvlc /root/10-by-p0d.avi --sout '#rtp{dst=192.168.0.28,port=1234,mux=ts}'")
 ec.set(app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority")
 ec.set(app1, 'version', "5")
 
-app2 = ec.register_resource("OMFApplication")
+app2 = ec.register_resource("omf::Application")
 ec.set(app2, 'appid', 'Vlc#2')
 ec.set(app2, 'command', "/root/vlc/vlc-1.1.13/cvlc rtp://192.168.0.28:1234")
 ec.set(app2, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority")
 ec.set(app2, 'version', "5")
 
-app3 = ec.register_resource("OMFApplication")
+app3 = ec.register_resource("omf::Application")
 ec.set(app3, 'appid', 'Kill#2')
 ec.set(app3, 'command', "/usr/bin/killall vlc_app")
 ec.set(app3, 'env', " ")
 ec.set(app3, 'version', "5")
 
-app4 = ec.register_resource("OMFApplication")
+app4 = ec.register_resource("omf::Application")
 ec.set(app4, 'appid', 'Kill#1')
 ec.set(app4, 'command', "/usr/bin/killall vlc_app")
 ec.set(app4, 'env', " ")