X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSliceAttributes.py;h=9f0b1fbe58f55a64ba5528606cd19241428ae294;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=7d1283cbe8147c8a205872df75f2578017afad39;hpb=d3caf68dfe082cd1f623550ee78b259ad3b019f0;p=plcapi.git

diff --git a/PLC/SliceAttributes.py b/PLC/SliceAttributes.py
index 7d1283c..9f0b1fb 100644
--- a/PLC/SliceAttributes.py
+++ b/PLC/SliceAttributes.py
@@ -16,13 +16,12 @@ class SliceAttribute(Row):
         'slice_attribute_id': Parameter(int, "Slice attribute identifier"),
         'slice_id': Parameter(int, "Slice identifier"),
         'node_id': Parameter(int, "Node identifier, if a sliver attribute"),
+	'nodegroup_id': Parameter(int, "Nodegroup identifier, if a sliver attribute"),
         'attribute_type_id': SliceAttributeType.fields['attribute_type_id'],
         'name': SliceAttributeType.fields['name'],
         'description': SliceAttributeType.fields['description'],
         'min_role_id': SliceAttributeType.fields['min_role_id'],
-        # XXX Arbitrary max, make configurable
-        'value': Parameter(str, "Slice attribute value", max = 254),
-        'peer_id': Parameter(int, "Peer at which this node is managed", nullok = True),
+        'value': Parameter(str, "Slice attribute value"),
         }
 
 class SliceAttributes(Table):
@@ -42,6 +41,6 @@ class SliceAttributes(Table):
                 slice_attribute_filter = Filter(SliceAttribute.fields, {'slice_attribute_id': slice_attribute_filter})
             elif isinstance(slice_attribute_filter, dict):
                 slice_attribute_filter = Filter(SliceAttribute.fields, slice_attribute_filter)
-            sql += " AND (%s)" % slice_attribute_filter.sql(api)
+            sql += " AND (%s) %s" % slice_attribute_filter.sql(api)
 
         self.selectall(sql)