import optparse
import time
-import xmlrpclib
+import xmlrpc.client
import socket
import os
import sys
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,
if os.path.exists(self.options.path):
sys.path.append(self.options.path)
plugins = [ os.path.split(os.path.splitext(x)[0])[1]
- for x in glob.glob( os.path.join(self.options.path,'*.py') )
+ for x in glob.glob( os.path.join(self.options.path, '*.py') )
if not x.endswith("/__init__.py")
]
self.modules += plugins
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):
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
- if getattr(module,'persistent_data',False):
+ if getattr(module, 'persistent_data', False):
module_data = last_data
callback(data, config, plc)
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):
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
if att['tagname'] == 'vref':
att['value'] = slicefamily
continue
- sliver['attributes'].append({ 'tagname':'vref','value':slicefamily})
+ sliver['attributes'].append({ 'tagname':'vref', 'value':slicefamily})
except:
logger.log_exc("nodemanager: Could not overwrite 'vref' attribute from 'GetSliceFamily'",
name=sliver['name'])
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):
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
+ except OSError as err:
+ print("Warning while writing PID file:", err)
# load modules
self.loaded_modules = []
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):
- session = file(self.options.session).read().strip()
+ with open(self.options.session) as f:
+ session = f.read().strip()
else:
session = None
try:
plc.update_session()
logger.log("nodemanager: Authentication Failure. Retrying")
- except Exception,e:
- logger.log("nodemanager: Retry Failed. (%r); Waiting.."%e)
+ except Exception as e:
+ logger.log("nodemanager: Retry Failed. ({}); Waiting..".format(e))
time.sleep(iperiod)
logger.log("nodemanager: Authentication Succeeded!")
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)
+ 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
git://git.onelab.eu / nodemanager.git / blobdiff