X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=nodemanager.py;h=c0a565625168cacf7b4a030de66365b3652be17a;hp=d0bd7fbc87e7ba5af9540eb7e06aae2bb12a5732;hb=9e596e6eb3c871ab25837903b0ed30f165d9d688;hpb=44e352eb6f5b0e1706234df9ade2f475fc75d9b7 diff --git a/nodemanager.py b/nodemanager.py index d0bd7fb..c0a5656 100755 --- a/nodemanager.py +++ b/nodemanager.py @@ -53,9 +53,11 @@ class NodeManager: parser.add_option('-k', '--session', action='store', dest='session', default='/etc/planetlab/session', help='API session key (or file)') parser.add_option('-p', '--period', action='store', dest='period', default=NodeManager.default_period, - help='Polling interval (sec) - default %d'%NodeManager.default_period) + help='Polling interval (sec) - default {}' + .format(NodeManager.default_period)) parser.add_option('-r', '--random', action='store', dest='random', default=NodeManager.default_random, - help='Range for additional random polling interval (sec) -- default %d'%NodeManager.default_random) + help='Range for additional random polling interval (sec) -- default {}' + .format(NodeManager.default_random)) parser.add_option('-v', '--verbose', action='store_true', dest='verbose', default=False, help='more verbose log') parser.add_option('-P', '--path', action='store', dest='path', default=NodeManager.PLUGIN_PATH, @@ -82,7 +84,7 @@ class NodeManager: if self.options.user_module: assert self.options.user_module in self.modules self.modules = [self.options.user_module] - logger.verbose('nodemanager: Running single module %s'%self.options.user_module) + logger.verbose('nodemanager: Running single module {}'.format(self.options.user_module)) def GetSlivers(self, config, plc): @@ -110,7 +112,7 @@ class NodeManager: last_data = self.loadSlivers() # Invoke GetSlivers() functions from the callback modules for module in self.loaded_modules: - logger.verbose('nodemanager: triggering %s.GetSlivers'%module.__name__) + logger.verbose('nodemanager: triggering {}.GetSlivers'.format(module.__name__)) try: callback = getattr(module, 'GetSlivers') module_data = data @@ -120,7 +122,8 @@ class NodeManager: except SystemExit as e: sys.exit(e) except: - logger.log_exc("nodemanager: GetSlivers failed to run callback for module %r"%module) + logger.log_exc("nodemanager: GetSlivers failed to run callback for module {}" + .format(module)) def getPLCDefaults(self, data, config): @@ -132,7 +135,7 @@ class NodeManager: attr_dict = {} for attr in slice.get('attributes'): attr_dict[attr['tagname']] = attr['value'] if len(attr_dict): - logger.verbose("nodemanager: Found default slice overrides.\n %s" % attr_dict) + logger.verbose("nodemanager: Found default slice overrides.\n {}".format(attr_dict)) config.OVERRIDES = attr_dict return # NOTE: if an _default slice existed, it would have been found above and @@ -161,19 +164,19 @@ class NodeManager: def dumpSlivers (self, slivers): f = open(NodeManager.DB_FILE, "w") - logger.log ("nodemanager: saving successfully fetched GetSlivers in %s" % NodeManager.DB_FILE) + logger.log ("nodemanager: saving successfully fetched GetSlivers in {}".format(NodeManager.DB_FILE)) pickle.dump(slivers, f) f.close() def loadSlivers (self): try: f = open(NodeManager.DB_FILE, "r+") - logger.log("nodemanager: restoring latest known GetSlivers from %s" % NodeManager.DB_FILE) + logger.log("nodemanager: restoring latest known GetSlivers from {}".format(NodeManager.DB_FILE)) slivers = pickle.load(f) f.close() return slivers except: - logger.log("Could not restore GetSlivers from %s" % NodeManager.DB_FILE) + logger.log("Could not restore GetSlivers from {}".format(NodeManager.DB_FILE)) return {} def run(self): @@ -195,8 +198,8 @@ class NodeManager: try: other_pid = tools.pid_file() if other_pid != None: - print """There might be another instance of the node manager running as pid %d. -If this is not the case, please remove the pid file %s. -- exiting""" % (other_pid, tools.PID_FILE) + print """There might be another instance of the node manager running as pid {}. +If this is not the case, please remove the pid file {}. -- exiting""".format(other_pid, tools.PID_FILE) return except OSError, err: print "Warning while writing PID file:", err @@ -206,25 +209,26 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p for module in self.modules: try: m = __import__(module) - logger.verbose("nodemanager: triggering %s.start" % m.__name__) + logger.verbose("nodemanager: triggering {}.start".format(m.__name__)) try: m.start() - except: logger.log("WARNING: module %s did not start") + except: logger.log("WARNING: module {} did not start".format(m.__name__)) self.loaded_modules.append(m) except: if module not in NodeManager.core_modules: - logger.log_exc ("ERROR while loading module %s - skipped" % module) + logger.log_exc ("ERROR while loading module {} - skipped".format(module)) else: - logger.log("FATAL : failed to start core module %s"%module) + logger.log("FATAL : failed to start core module {}".format(module)) sys.exit(1) # sort on priority (lower first) - def sort_module_priority (m1, m2): - return getattr(m1,'priority',NodeManager.default_priority) - getattr(m2,'priority',NodeManager.default_priority) - self.loaded_modules.sort(sort_module_priority) + def module_priority (m): + return getattr(m,'priority',NodeManager.default_priority) + self.loaded_modules.sort(key=module_priority) logger.log('ordered modules:') for module in self.loaded_modules: - logger.log ('%s: %s'%(getattr(module,'priority',NodeManager.default_priority),module.__name__)) + logger.log ('{}: {}'.format(getattr(module, 'priority', NodeManager.default_priority), + module.__name__)) # Load /etc/planetlab/session if os.path.exists(self.options.session): @@ -247,7 +251,7 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p plc.update_session() logger.log("nodemanager: Authentication Failure. Retrying") except Exception,e: - logger.log("nodemanager: Retry Failed. (%r); Waiting.."%e) + logger.log("nodemanager: Retry Failed. ({}); Waiting..".format(e)) time.sleep(iperiod) logger.log("nodemanager: Authentication Succeeded!") @@ -255,12 +259,14 @@ If this is not the case, please remove the pid file %s. -- exiting""" % (other_p while True: # Main nodemanager Loop work_beg = time.time() - logger.log('nodemanager: mainloop - calling GetSlivers - period=%d random=%d'%(iperiod,irandom)) + logger.log('nodemanager: mainloop - calling GetSlivers - period={} random={}' + .format(iperiod, irandom)) self.GetSlivers(config, plc) delay = iperiod + random.randrange(0,irandom) work_end = time.time() work_duration = int(work_end-work_beg) - logger.log('nodemanager: mainloop has worked for %s s - sleeping for %d s'%(work_duration,delay)) + logger.log('nodemanager: mainloop has worked for {} s - sleeping for {} s' + .format(work_duration,delay)) time.sleep(delay) except SystemExit: pass