6.1.2

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

diff --git a/examples/omf/testing/nepi_omf5_plexus_stdin.py b/examples/omf/testing/nepi_omf5_plexus_stdin.py
index f856c1b..6436d39 100644 (file)
--- a/examples/omf/testing/nepi_omf5_plexus_stdin.py
+++ b/examples/omf/testing/nepi_omf5_plexus_stdin.py
@@ -1,21 +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.
+#!/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: Julien Tribino <julien.tribino@inria.fr>
 
-    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: Julien Tribino <julien.tribino@inria.fr>
+"""
 
     Example :
       - Testbed : Plexus
@@ -38,7 +41,6 @@
 
 """
 
-#!/usr/bin/env python
 from nepi.execution.resource import ResourceFactory, ResourceAction, ResourceState
 from nepi.execution.ec import ExperimentController
 
@@ -48,7 +50,7 @@ import time
 ec = ExperimentController()
 
 # Create and Configure the Nodes
-node1 = ec.register_resource("OMFNode")
+node1 = ec.register_resource("omf::Node")
 ec.set(node1, 'hostname', 'omf.plexus.wlab17')
 ec.set(node1, 'xmppServer', "nepi")
 ec.set(node1, 'xmppUser', "xmpp-plexus.onelab.eu")
@@ -57,7 +59,7 @@ ec.set(node1, 'xmppPassword', "1234")
 ec.set(node1, 'version', "5")
 
 # Create and Configure the Application
-app1 = ec.register_resource("OMFApplication")
+app1 = ec.register_resource("omf::Application")
 ec.set(app1, 'appid', "robot")
 ec.set(app1, 'command', "/root/CTRL_test.rb coord.csv")
 ec.set(app1, 'env', "DISPLAY=localhost:10.0 XAUTHORITY=/root/.Xauthority")