Fixing wrong license

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

diff --git a/examples/omf/testing/nepi_omf5_plexus_ccncat_linear.py b/examples/omf/testing/nepi_omf5_plexus_ccncat_linear.py
index 2280be5..7e37435 100644 (file)
--- a/examples/omf/testing/nepi_omf5_plexus_ccncat_linear.py
+++ b/examples/omf/testing/nepi_omf5_plexus_ccncat_linear.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
@@ -37,7 +39,6 @@
 
 """
 
-#!/usr/bin/env python
 from nepi.execution.resource import ResourceFactory, ResourceAction, ResourceState
 from nepi.execution.ec import ExperimentController
 
@@ -45,7 +46,7 @@ from optparse import OptionParser, SUPPRESS_HELP
 
 ###  Define OMF Method to simplify definition of resources ###
 def add_node(ec, hostname, xmppServer, xmppUser, xmppPort = "5222", xmppPassword = "1234"):
-    node = ec.register_resource("OMFNode")
+    node = ec.register_resource("omf::Node")
     ec.set(node, 'hostname', hostname)
     ec.set(node, 'xmppServer', xmppServer)
     ec.set(node, 'xmppUser', xmppUser)
@@ -56,7 +57,7 @@ def add_node(ec, hostname, xmppServer, xmppUser, xmppPort = "5222", xmppPassword
 
 def add_interface(ec, ip, xmppServer, xmppUser, essid = "ccn", name = "wlan0", mode = "adhoc",
                  typ = "g", xmppPort = "5222", xmppPassword = "1234"):
-    iface = ec.register_resource("OMFWifiInterface")
+    iface = ec.register_resource("omf::WifiInterface")
     ec.set(iface, 'name', name)
     ec.set(iface, 'mode', mode)
     ec.set(iface, 'hw_mode', typ)
@@ -66,7 +67,7 @@ def add_interface(ec, ip, xmppServer, xmppUser, essid = "ccn", name = "wlan0", m
     return iface
 
 def add_channel(ec, channel, xmppServer, xmppUser, xmppPort = "5222", xmppPassword = "1234"):
-    chan = ec.register_resource("OMFChannel")
+    chan = ec.register_resource("omf::Channel")
     ec.set(chan, 'channel', channel)
     ec.set(chan, 'xmppServer', xmppServer)
     ec.set(chan, 'xmppUser', xmppUser)
@@ -77,7 +78,7 @@ def add_channel(ec, channel, xmppServer, xmppUser, xmppPort = "5222", xmppPasswo
 
 def add_app(ec, host,  appid, command, env, xmppServer, xmppUser, 
                 xmppPort = "5222", xmppPassword = "1234"):
-    app = ec.register_resource("OMFApplication")
+    app = ec.register_resource("omf::Application")
     ec.set(app, 'appid', appid)
     ec.set(app, 'command', command)
     ec.set(app, 'env', env)