From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 2 Jun 2010 10:01:22 +0000 (+0000)
Subject: cosmetic: protect drl against void getslivers
X-Git-Tag: NodeManager-2.0-9~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=72c59bbf519f1e941b51ec1e5649e1b2faffe302;p=nodemanager.git

cosmetic: protect drl against void getslivers
---

diff --git a/nodemanager.py b/nodemanager.py
index 0cf1dc6..ee328c9 100755
--- a/nodemanager.py
+++ b/nodemanager.py
@@ -188,8 +188,6 @@ def run():
         logger.log("nodemanager: Checking Auth.")
         while plc.check_authentication() != True:
             try:
-#                import pdb
-#               pdb.set_trace()
                 plc.update_session()
                 logger.log("nodemanager: Authentication Failure. Retrying")
             except Exception,e:
diff --git a/plugins/drl.py b/plugins/drl.py
index 65eb0f6..a82ca78 100644
--- a/plugins/drl.py
+++ b/plugins/drl.py
@@ -66,6 +66,10 @@ def GetSlivers(data, conf = None, plc = None):
 	HAVE_DRL = 0
 	node_id = tools.node_id()
 
+	if 'slivers' not in data:
+		logger.log_missing_data("drl.GetSlivers",'slivers')
+		return
+
 	for sliver in data['slivers']:
 		for attribute in sliver['attributes']:
             		tag = attribute['tagname']