Changing reschedule_delay internals
[nepi.git] / src / nepi / resources / omf / node.py
index 156ba86..048da19 100644 (file)
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 #         Julien Tribino <julien.tribino@inria.fr>
 
-
-from nepi.execution.resource import ResourceManager, clsinit, ResourceState
+from nepi.util.timefuncs import tnow
+from nepi.execution.resource import ResourceManager, clsinit_copy, \
+        ResourceState
 from nepi.execution.attribute import Attribute, Flags 
-
-from nepi.resources.omf.omf_api import OMFAPIFactory
+from nepi.resources.omf.omf_resource import ResourceGateway, OMFResource
+from nepi.resources.omf.omf_api_factory import OMFAPIFactory
 
 import time
 
-reschedule_delay = "0.5s"
+reschedule_check = "1s"
+confirmation_counter = 3600
 
-@clsinit
-class OMFNode(ResourceManager):
+@clsinit_copy
+class OMFNode(OMFResource):
     """
     .. class:: Class Args :
       
@@ -40,10 +42,6 @@ class OMFNode(ResourceManager):
         :param creds: Credentials to communicate with the rm (XmppClient for OMF)
         :type creds: dict
 
-    .. note::
-
-       This class is used only by the Experiment Controller through the Resource Factory
-
     """
     _rtype = "OMFNode"
     _authorized_connections = ["OMFApplication" , "OMFWifiInterface"]
@@ -54,38 +52,8 @@ class OMFNode(ResourceManager):
 
         """
         hostname = Attribute("hostname", "Hostname of the machine")
-        cpu = Attribute("cpu", "CPU of the node")
-        ram = Attribute("ram", "RAM of the node")
-        xmppSlice = Attribute("xmppSlice","Name of the slice",
-                flags = Flags.Credential)
-        xmppHost = Attribute("xmppHost", "Xmpp Server",
-                flags = Flags.Credential)
-        xmppPort = Attribute("xmppPort", "Xmpp Port",
-                flags = Flags.Credential)
-        xmppPassword = Attribute("xmppPassword", "Xmpp Port",
-                flags = Flags.Credential)
-
-        host = Attribute("host", "Hostname of the machine",
-                flags = Flags.Filter)
-        gateway = Attribute("gateway", "Gateway",
-                flags = Flags.Filter)
-        granularity = Attribute("granularity", "Granularity of the reservation time",
-                flags = Flags.Filter)
-        hardware_type = Attribute("hardware_type", "Hardware type of the machine",
-                flags = Flags.Filter)
 
         cls._register_attribute(hostname)
-        cls._register_attribute(ram)
-        cls._register_attribute(cpu)
-        cls._register_attribute(xmppSlice)
-        cls._register_attribute(xmppHost)
-        cls._register_attribute(xmppPort)
-        cls._register_attribute(xmppPassword)
-
-        cls._register_attribute(host)
-        cls._register_attribute(gateway)
-        cls._register_attribute(granularity)
-        cls._register_attribute(hardware_type)
 
     # XXX: We don't necessary need to have the credentials at the 
     # moment we create the RM
@@ -101,8 +69,18 @@ class OMFNode(ResourceManager):
 
         self._omf_api = None 
 
+        # For performance tests
+        self.perf = True
+        self.begin_deploy_time = None
+
+
+    @property
+    def exp_id(self):
+        return self.ec.exp_id
+
     def valid_connection(self, guid):
-        """Check if the connection with the guid in parameter is possible. Only meaningful connections are allowed.
+        """ Check if the connection with the guid in parameter is possible. 
+        Only meaningful connections are allowed.
 
         :param guid: Guid of the current RM
         :type guid: int
@@ -110,67 +88,90 @@ class OMFNode(ResourceManager):
 
         """
         rm = self.ec.get_resource(guid)
-        if rm.rtype() in self._authorized_connections:
-            msg = "Connection between %s %s and %s %s accepted" % (self.rtype(), self._guid, rm.rtype(), guid)
+        if rm.get_rtype() in self._authorized_connections:
+            msg = "Connection between %s %s and %s %s accepted" % (
+                    self.get_rtype(), self._guid, rm.get_rtype(), guid)
             self.debug(msg)
             return True
-        msg = "Connection between %s %s and %s %s refused" % (self.rtype(), self._guid, rm.rtype(), guid)
-        self.debug(msg)
-        return False
-
-    def deploy(self):
-        """Deploy the RM. It means : Send Xmpp Message Using OMF protocol to enroll the node into the experiment
-           It becomes DEPLOYED after sending messages to enroll the node
 
-        """ 
-        if not self._omf_api :
-            self._omf_api = OMFAPIFactory.get_api(self.get('xmppSlice'), 
-               self.get('xmppHost'), self.get('xmppPort'), self.get('xmppPassword'))
+        msg = "Connection between %s %s and %s %s refused" % (
+                self.get_rtype(), self._guid, rm.get_rtype(), guid)
+        self.error(msg)
 
-        if self.get('hostname') :
-            try:
-                self._omf_api.enroll_host(self.get('hostname'))
-            except AttributeError:
-                self._state = ResourceState.FAILED
-                msg = "Credentials are not initialzed. XMPP Connections impossible"
-                self.debug(msg)
-                return
-
-        super(OMFNode, self).deploy()
-
-    def discover(self):
-        """ Discover the availables nodes
-
-        """
-        pass
-     
-    def provision(self):
-        """ Provision some availables nodes
+        return False
 
-        """
-        pass
+    def do_deploy(self):
+        """ Deploy the RM. It means : Send Xmpp Message Using OMF protocol 
+            to enroll the node into the experiment.
 
-     def start(self):
-        """Start the RM. It means nothing special for an interface for now
-           It becomes STARTED as soon as this method starts.
+        """ 
+      ## For performance test
+        if self.perf:
+            self.begin_deploy_time = tnow()
+            self.perf = False
+
+        if not self.get('xmppServer'):
+            msg = "XmppServer is not initialzed. XMPP Connections impossible"
+            self.error(msg)
+            raise RuntimeError, msg
+
+        if not self.get('version'):
+            msg = "Version of OMF is not indicated"
+            self.error(msg)
+            raise RuntimeError, msg
+
+        if not (self.get('xmppUser') or self.get('xmppPort') 
+                   or self.get('xmppPassword')):
+            msg = "Credentials are not all initialzed. Default values will be used"
+            self.warn(msg)
 
-        """
+        if not self._omf_api :
+            self._omf_api = OMFAPIFactory.get_api(self.get('version'), 
+              self.get('xmppServer'), self.get('xmppUser'), self.get('xmppPort'),
+               self.get('xmppPassword'), exp_id = self.exp_id)
 
-        super(OMFNode, self).start()
+        if not self.get('hostname') :
+            msg = "Hostname's value is not initialized"
+            self.error(msg)
+            raise RuntimeError, msg
 
-    def stop(self):
-        """Stop the RM. It means nothing special for an interface for now
-           It becomes STOPPED as soon as this method stops
+        if self.get('version') == "5":
+            self._omf_api.enroll_host(self.get('hostname'))
+        else:
+            self._omf_api.enroll_topic(self.get('hostname'))
 
-        """
-        super(OMFNode, self).stop()
+        super(OMFNode, self).do_deploy()
 
-    def release(self):
-        """Clean the RM at the end of the experiment
+    def do_release(self):
+        """ Clean the RM at the end of the experiment by unenrolling
+        the node from the topic
 
         """
-        if self._omf_api :
-            self._omf_api.release(self.get('hostname'))
-            OMFAPIFactory.release_api(self.get('xmppSlice'), 
-                self.get('xmppHost'), self.get('xmppPort'), self.get('xmppPassword'))
+        from nepi.resources.omf.application import OMFApplication
+        rm_list = self.get_connected(OMFApplication.get_rtype())
+        if rm_list:
+            for rm in rm_list:
+                if rm.state < ResourceState.RELEASED:
+                    self.ec.schedule(self.reschedule_delay, self.release)
+                    return 
+
+        from nepi.resources.omf.interface import OMFWifiInterface
+        rm_list = self.get_connected(OMFWifiInterface.get_rtype())
+        if rm_list:
+            for rm in rm_list:
+                if rm.state < ResourceState.RELEASED:
+                    self.ec.schedule(self.reschedule_delay, self.release)
+                    return 
+
+        if self._omf_api:
+            if self.get('version') == "5":
+                self._omf_api.release(self.get('hostname'))
+            else:
+                self._omf_api.unenroll_topic(self.get('hostname'))
+
+            OMFAPIFactory.release_api(self.get('version'), 
+              self.get('xmppServer'), self.get('xmppUser'), self.get('xmppPort'),
+               self.get('xmppPassword'), exp_id = self.exp_id)
+
+        super(OMFNode, self).do_release()