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
- clean up how vserver specific slice attributes are added to sm.py
[nodemanager.git]
/
nm.py
diff --git
a/nm.py
b/nm.py
index
6e56501
..
46f23f5
100644
(file)
--- a/
nm.py
+++ b/
nm.py
@@
-14,8
+14,8
@@
import logger
import tools
from config import Config
import tools
from config import Config
-from plcapi import PLCAPI
-
+from plcapi import PLCAPI
+import random
savedargv = sys.argv[:]
savedargv = sys.argv[:]
@@
-31,9
+31,13
@@
modules = []
def GetSlivers(plc):
data = plc.GetSlivers()
def GetSlivers(plc):
data = plc.GetSlivers()
+ # net needs access to API for i2 nodes.
for module in modules:
for module in modules:
- callback = getattr(module, 'GetSlivers')
- callback(data)
+ if module.__name__ == 'net':
+ module.GetSlivers(plc, data)
+ else:
+ callback = getattr(module, 'GetSlivers')
+ callback(data)
def run():
try:
def run():
try:
@@
-71,7
+75,7
@@
def run():
while True:
try: GetSlivers(plc)
except: logger.log_exc()
while True:
try: GetSlivers(plc)
except: logger.log_exc()
- time.sleep(options.period)
+ time.sleep(options.period
+ random.randrange(0,301)
)
except: logger.log_exc()
except: logger.log_exc()