README moves to markdown

[nepi.git] / src / nepi / resources / omf / omf_resource.py

diff --git a/src/nepi/resources/omf/omf_resource.py b/src/nepi/resources/omf/omf_resource.py
index 632d201..3c104cc 100644 (file)
--- a/src/nepi/resources/omf/omf_resource.py
+++ b/src/nepi/resources/omf/omf_resource.py
@@ -3,9 +3,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
@@ -20,12 +19,16 @@
 
 from nepi.execution.attribute import Attribute, Flags, Types
 from nepi.execution.resource import ResourceManager, clsinit_copy, \
-        ResourceState, reschedule_delay
+        ResourceState
+
 
 class ResourceGateway:
     """
     Dictionary used to set OMF gateway depending on Testbed information.
     """
+    #XXX: A.Q. COMMENT: This looks a bit hardcoded
+    #       SHOULDN'T THIS BE IN A SEPARATED FILE RATHER THAN IN THE 
+    #       BASE CLASS FOR ALL OMF RESOURCES?
     TestbedtoGateway = dict({
         "wilabt" : "ops.wilab2.ilabt.iminds.be",
         "nitos" : "nitlab.inf.uth.gr",
@@ -44,24 +47,28 @@ class OMFResource(ResourceManager):
     Generic resource gathering XMPP credential information and common methods
     for OMF nodes, channels, applications, etc.
     """
-    _rtype = "OMFResource"
+    _rtype = "abstract::omf::Resource"
+    _platform = "omf"
 
     @classmethod
     def _register_attributes(cls):
 
-        xmppSlice = Attribute("xmppSlice","Name of the slice", 
+        xmppServer = Attribute("xmppServer", "Xmpp Server",
             flags = Flags.Credential)
-        xmppHost = Attribute("xmppHost", "Xmpp Server",
+        xmppUser = Attribute("xmppUser","Name of the Xmpp User/Slice", 
             flags = Flags.Credential)
         xmppPort = Attribute("xmppPort", "Xmpp Port",
             flags = Flags.Credential)
         xmppPassword = Attribute("xmppPassword", "Xmpp Password",
                 flags = Flags.Credential)
+        version = Attribute("version", "Version of OMF : Either 5 or 6",
+                default = "6", )
 
-        cls._register_attribute(xmppSlice)
-        cls._register_attribute(xmppHost)
+        cls._register_attribute(xmppUser)
+        cls._register_attribute(xmppServer)
         cls._register_attribute(xmppPort)
         cls._register_attribute(xmppPassword)
+        cls._register_attribute(version)
 
     def __init__(self, ec, guid):
         super(OMFResource, self).__init__(ec, guid)