X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fccn%2Fccnr.py;h=53e4ccd577a5a2b530867a55d6219508dd9717f5;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=ac10840ff20cbcbd3e5d7163adaf6a4403554272;hpb=bd01c32d68ab642b6220a210fa6d534a0c7bd420;p=nepi.git diff --git a/src/nepi/resources/linux/ccn/ccnr.py b/src/nepi/resources/linux/ccn/ccnr.py index ac10840f..53e4ccd5 100644 --- a/src/nepi/resources/linux/ccn/ccnr.py +++ b/src/nepi/resources/linux/ccn/ccnr.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,7 +19,7 @@ from nepi.execution.attribute import Attribute, Flags, Types from nepi.execution.trace import Trace, TraceAttr from nepi.execution.resource import clsinit_copy, ResourceState, \ - ResourceAction, reschedule_delay + ResourceAction from nepi.resources.linux.application import LinuxApplication from nepi.resources.linux.ccn.ccnd import LinuxCCND from nepi.util.timefuncs import tnow @@ -29,29 +28,29 @@ import os @clsinit_copy class LinuxCCNR(LinuxApplication): - _rtype = "LinuxCCNR" + _rtype = "linux::CCNR" @classmethod def _register_attributes(cls): max_fanout = Attribute("maxFanout", "Sets the CCNR_BTREE_MAX_FANOUT environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) max_leaf_entries = Attribute("maxLeafEntries", "Sets the CCNR_BTREE_MAX_LEAF_ENTRIES environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) max_node_bytes = Attribute("maxNodeBytes", "Sets the CCNR_BTREE_MAX_NODE_BYTES environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) max_node_pool = Attribute("maxNodePool", "Sets the CCNR_BTREE_MAX_NODE_POOL environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) content_cache = Attribute("contentCache", "Sets the CCNR_CONTENT_CACHE environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) debug = Attribute("debug", "Sets the CCNR_DEBUG environmental variable. " @@ -64,92 +63,92 @@ class LinuxCCNR(LinuxApplication): "WARNING", "INFO", "FINE, FINER, FINEST"], - flags = Flags.ExecReadOnly) + flags = Flags.Design) directory = Attribute("directory", "Sets the CCNR_DIRECTORY environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) global_prefix = Attribute("globalPrefix", "Sets the CCNR_GLOBAL_PREFIX environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) listen_on = Attribute("listenOn", "Sets the CCNR_LISTEN_ON environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) min_send_bufsize = Attribute("minSendBufsize", "Sets the CCNR_MIN_SEND_BUFSIZE environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) proto = Attribute("proto", "Sets the CCNR_PROTO environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) status_port = Attribute("statusPort", "Sets the CCNR_STATUS_PORT environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) start_write_scope_limit = Attribute("startWriteScopeLimit", "Sets the CCNR_START_WRITE_SCOPE_LIMIT environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_debug = Attribute("ccnsDebug", "Sets the CCNS_DEBUG environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_enable = Attribute("ccnsEnable", "Sets the CCNS_ENABLE environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_faux_error = Attribute("ccnsFauxError", "Sets the CCNS_FAUX_ERROR environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_heartbeat_micros = Attribute("ccnsHeartBeatMicros", "Sets the CCNS_HEART_BEAT_MICROS environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_max_compares_busy = Attribute("ccnsMaxComparesBusy", "Sets the CCNS_MAX_COMPARES_BUSY environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_max_fetch_busy = Attribute("ccnsMaxFetchBusy", "Sets the CCNS_MAX_FETCH_BUSY environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_node_fetch_lifetime = Attribute("ccnsNodeFetchLifetime", "Sets the CCNS_NODE_FETCH_LIFETIME environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_note_err = Attribute("ccnsNoteErr", "Sets the CCNS_NOTE_ERR environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_repo_store = Attribute("ccnsRepoStore", "Sets the CCNS_REPO_STORE environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_root_advise_fresh = Attribute("ccnsRootAdviseFresh", "Sets the CCNS_ROOT_ADVISE_FRESH environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_root_advise_lifetime = Attribute("ccnsRootAdviseLifetime", "Sets the CCNS_ROOT_ADVISE_LIFETIME environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_stable_enabled = Attribute("ccnsStableEnabled", "Sets the CCNS_STABLE_ENABLED environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) ccns_sync_scope = Attribute("ccnsSyncScope", "Sets the CCNS_SYNC_SCOPE environmental variable. ", - flags = Flags.ExecReadOnly) + flags = Flags.Design) repo_file = Attribute("repoFile1", "The Repository uses $CCNR_DIRECTORY/repoFile1 for " "persistent storage of CCN Content Objects", - flags = Flags.ExecReadOnly) + flags = Flags.Design) cls._register_attribute(max_fanout) cls._register_attribute(max_leaf_entries) @@ -191,7 +190,7 @@ class LinuxCCNR(LinuxApplication): @property def ccnd(self): - ccnd = self.get_connected(LinuxCCND.rtype()) + ccnd = self.get_connected(LinuxCCND.get_rtype()) if ccnd: return ccnd[0] return None @@ -200,33 +199,27 @@ class LinuxCCNR(LinuxApplication): if self.ccnd: return self.ccnd.node return None - def deploy(self): + def do_deploy(self): if not self.ccnd or self.ccnd.state < ResourceState.READY: self.debug("---- RESCHEDULING DEPLOY ---- CCND state %s " % self.ccnd.state ) # ccnr needs to wait until ccnd is deployed and running - self.ec.schedule(reschedule_delay, self.deploy) + self.ec.schedule(self.reschedule_delay, self.deploy) else: - try: - if not self.get("command"): - self.set("command", self._start_command) + if not self.get("command"): + self.set("command", self._start_command) - if not self.get("env"): - self.set("env", self._environment) + if not self.get("env"): + self.set("env", self._environment) - command = self.get("command") + command = self.get("command") + + self.info("Deploying command '%s' " % command) - self.info("Deploying command '%s' " % command) + self.do_discover() + self.do_provision() - self.discover() - self.provision() - except: - self.fail() - raise - - self.debug("----- READY ---- ") - self._ready_time = tnow() - self._state = ResourceState.READY + self.set_ready() def upload_start_command(self): command = self.get("command") @@ -253,21 +246,18 @@ class LinuxCCNR(LinuxApplication): self.node.run_and_wait(command, self.run_home, shfile = shfile, overwrite = False, - env = env, - raise_on_error = True) + env = env) - def start(self): - if self._state == ResourceState.READY: + def do_start(self): + if self.state == ResourceState.READY: command = self.get("command") self.info("Starting command '%s'" % command) - self._start_time = tnow() - self._state = ResourceState.STARTED + self.set_started() else: msg = " Failed to execute command '%s'" % command self.error(msg, out, err) - self._state = ResourceState.FAILED - raise RuntimeError, msg + raise RuntimeError(msg) @property def _start_command(self):