merged ex_shutdown into nepi-3-dev

[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 ddd4ad7..f1bb40c 100644 (file)
--- a/src/nepi/resources/omf/omf_resource.py
+++ b/src/nepi/resources/omf/omf_resource.py
@@ -19,13 +19,17 @@
 #         Lucia Guevgeozian <lucia.guevgeozian_odizzio@inria.fr>
 
 from nepi.execution.attribute import Attribute, Flags, Types
-from nepi.execution.resource import ResourceManager, clsinit, ResourceState, \
-        reschedule_delay
+from nepi.execution.resource import ResourceManager, clsinit_copy, \
+        ResourceState, reschedule_delay
+
 
 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",
@@ -33,7 +37,13 @@ class ResourceGateway:
 
     })
 
-@clsinit
+    AMtoGateway = dict({
+        "am.wilab2.ilabt.iminds.be" : "ops.wilab2.ilabt.iminds.be",
+        "nitlab.inf.uth.gr" : "nitlab.inf.uth.gr",
+        "nicta" : "??.??.??",
+    })
+
+@clsinit_copy
 class OMFResource(ResourceManager):
     """
     Generic resource gathering XMPP credential information and common methods