X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Fomf%2Fapplication.py;h=8384024db51e04c615dd31413adc2e0cfe7dff8d;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=7a87d2a01ea8548a49f6e50b6e74e2746fbc6dbc;hpb=a55b5cf0818ced6ab8dc3e88fad7f6616675e826;p=nepi.git diff --git a/src/nepi/resources/omf/application.py b/src/nepi/resources/omf/application.py index 7a87d2a0..8384024d 100644 --- a/src/nepi/resources/omf/application.py +++ b/src/nepi/resources/omf/application.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 @@ -18,11 +17,13 @@ # Author: Alina Quereilhac # Julien Tribino +from __future__ import print_function + import os from nepi.util.timefuncs import tnow from nepi.execution.resource import ResourceManager, clsinit_copy, \ - ResourceState, reschedule_delay + ResourceState from nepi.execution.trace import Trace, TraceAttr from nepi.execution.attribute import Attribute, Flags from nepi.resources.omf.omf_resource import ResourceGateway, OMFResource @@ -42,8 +43,8 @@ class OMFApplication(OMFResource): :type guid: int """ - _rtype = "OMFApplication" - _authorized_connections = ["OMFNode", "WilabtSfaNode"] + _rtype = "omf::Application" + _authorized_connections = ["omf::Node", "wilabt::sfa::Node"] @classmethod def _register_attributes(cls): @@ -182,7 +183,7 @@ class OMFApplication(OMFResource): if not self.node or self.node.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state ) - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) return ## For performance test @@ -287,7 +288,7 @@ class OMFApplication(OMFResource): try: f = open(trace_path ,'r') except IOError: - print "File with traces has not been found" + print("File with traces has not been found") return False out = f.read() f.close()