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
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:
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'])
# sort on priority (lower first)
def module_priority (m):
- return getattr(m,'priority',NodeManager.default_priority)
+ return getattr(m, 'priority', NodeManager.default_priority)
self.loaded_modules.sort(key=module_priority)
logger.log('ordered modules:')
# 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:
+ except Exception as e:
logger.log("nodemanager: Retry Failed. ({}); Waiting..".format(e))
time.sleep(iperiod)
logger.log("nodemanager: Authentication Succeeded!")
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 - sleeping for {} s'
- .format(work_duration,delay))
+ .format(work_duration, delay))
time.sleep(delay)
except SystemExit:
pass