From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 2 Feb 2011 15:24:35 +0000 (+0100)
Subject: remove an ugly hack that had GetSliceFamily set the slice vref to omf
X-Git-Tag: plcapi-5.0-27~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b9b8ba17171d7d5abe9eb6d8008a1e7e94153ba5;p=plcapi.git

remove an ugly hack that had GetSliceFamily set the slice vref to omf
---

diff --git a/PLC/Methods/GetSliceFamily.py b/PLC/Methods/GetSliceFamily.py
index 79bcdd49..2a6e8307 100644
--- a/PLC/Methods/GetSliceFamily.py
+++ b/PLC/Methods/GetSliceFamily.py
@@ -50,13 +50,12 @@ class GetSliceFamily(Method):
         vref = GetSliceVref (self.api,self.caller).call(auth,slice_id)
 
         # omf-control'ed slivers need the omf vserver reference image
-        # this is to avoid asking users to set both tags 'omf_control' and 'vref'
-        # protect against failure 
-        try:
-            if not vref and GetSliceOmfControl(self.api,self.caller).call(auth,slice_id):
-                SetSliceVref (self.api) (auth,slice_id,'omf')
-                vref='omf'
-        except: pass
+        # we used to issue SetSliceVref (self.api) (auth,slice_id,'omf')
+        # to avoid asking users to set both tags 'omf_control' and 'vref'
+        # however we can't use SetSliceVref here because a node is only allowed 
+        # to set a sliver tag, not a slice tag
+        # and this somehow gets called from GetSlivers
+        # anyways it was a bad idea, let's have the UI do that instead
 
         # xxx would make sense to check the corresponding vserver rpms are available
         # in all node-families yum repos (and yumgroups, btw)