From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Fri, 19 Nov 2010 14:38:20 +0000 (+0100)
Subject: manage hmac slice tag only if slice has enable_hmac tag set
X-Git-Tag: nodemanager-2.0-22~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=19cafbf5fcf1b1275b6184b9e076412f5fc1d035;p=nodemanager.git

manage hmac slice tag only if slice has enable_hmac tag set
---

diff --git a/plugins/sliverauth.py b/plugins/sliverauth.py
index b58492f..9e872c5 100644
--- a/plugins/sliverauth.py
+++ b/plugins/sliverauth.py
@@ -46,12 +46,11 @@ def GetSlivers(data, config, plc):
                 logger.log("sliverauth: plc-instantiated slice %s does not yet exist. IGNORING!" % sliver['name'])
             continue
 
-        manage_hmac (plc, sliver)
-
         for chunk in sliver['attributes']:
-            if chunk['tagname']=='omf_control':
+            if chunk['tagname']=='enable_hmac':
+                manage_hmac (plc, sliver)
+            elif chunk['tagname']=='omf_control':
                 manage_sshkey (plc, sliver)
-                break
 
 
 def SetSliverTag(plc, slice, tagname, value):