git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- turn net.py into a NM plugin and move to plugin directory
[nodemanager.git]
/
nm.py
diff --git
a/nm.py
b/nm.py
index
05eaee7
..
83a78f2
100755
(executable)
--- a/
nm.py
+++ b/
nm.py
@@
-24,7
+24,6
@@
import tools
from config import Config
from plcapi import PLCAPI
import random
from config import Config
from plcapi import PLCAPI
import random
-import net
id="$Id$"
savedargv = sys.argv[:]
id="$Id$"
savedargv = sys.argv[:]
@@
-55,22
+54,18
@@
def GetSlivers(plc, config):
try:
logger.log("Syncing w/ PLC")
data = plc.GetSlivers()
try:
logger.log("Syncing w/ PLC")
data = plc.GetSlivers()
- getPLCDefaults(data, config)
if (options.verbose): logger.log_slivers(data)
if (options.verbose): logger.log_slivers(data)
+ getPLCDefaults(data, config)
except:
logger.log_exc()
# XXX So some modules can at least boostrap.
logger.log("nm: Can't contact PLC to GetSlivers(). Continuing.")
data = {}
except:
logger.log_exc()
# XXX So some modules can at least boostrap.
logger.log("nm: Can't contact PLC to GetSlivers(). Continuing.")
data = {}
- # Set i2 ip list for nodes in I2 nodegroup
- # and init network interfaces (unless overridden)
- try: net.GetSlivers(plc, data, config) # TODO - num of args needs to be unified across mods.
- except: logger.log_exc()
- # All other callback modules
+ # Invoke GetSlivers() functions from the callback modules
for module in modules:
try:
callback = getattr(module, 'GetSlivers')
for module in modules:
try:
callback = getattr(module, 'GetSlivers')
- callback(
data
)
+ callback(
plc, data, config
)
except: logger.log_exc()
except: logger.log_exc()
@@
-81,7
+76,7
@@
def getPLCDefaults(data, config):
for slice in data.get('slivers'):
if slice['name'] == config.PLC_SLICE_PREFIX+"_default":
attr_dict = {}
for slice in data.get('slivers'):
if slice['name'] == config.PLC_SLICE_PREFIX+"_default":
attr_dict = {}
- for attr in slice.get('attributes'): attr_dict[attr['name']] = attr['value']
+ for attr in slice.get('attributes'): attr_dict[attr['
tag
name']] = attr['value']
if len(attr_dict):
logger.verbose("Found default slice overrides.\n %s" % attr_dict)
config.OVERRIDES = attr_dict
if len(attr_dict):
logger.verbose("Found default slice overrides.\n %s" % attr_dict)
config.OVERRIDES = attr_dict