From: Andy Bavier <acb@cs.princeton.edu>
Date: Wed, 27 Jun 2012 15:16:08 +0000 (-0400)
Subject: Fixed bug with slice tag handling for nodegroups
X-Git-Tag: plcapi-5.1-2~1
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=f6e2997a8396699281cb7c4e64160e648d29ace8

Fixed bug with slice tag handling for nodegroups
---

diff --git a/PLC/Methods/GetSlivers.py b/PLC/Methods/GetSlivers.py
index 45fcacb..1f65e1e 100644
--- a/PLC/Methods/GetSlivers.py
+++ b/PLC/Methods/GetSlivers.py
@@ -91,11 +91,12 @@ def get_slivers(api, caller, auth, slice_filter, node = None):
                 # Do not set any nodegroup slice attributes for
                 # which there is at least one sliver attribute
                 # already set.
-                if slice_tag not in slice_tags:
+                if slice_tag['tagname'] not in sliver_attributes:
+                    sliver_attributes.append(slice_tag['tagname'])
                     attributes.append({'tagname': slice_tag['tagname'],
-                                   'value': slice_tag['value']})
+                                       'value': slice_tag['value']})
 
-        for slice_tag in [ a for a in slice_tags if a['node_id'] is None ]:
+        for slice_tag in [ a for a in slice_tags if a['node_id'] is None and a['nodegroup_id'] is None ]:
             # Do not set any global slice attributes for
             # which there is at least one sliver attribute
             # already set.