Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / SliceAttributes.py

diff --git a/PLC/SliceAttributes.py b/PLC/SliceAttributes.py
index 71b47e6..9f0b1fb 100644 (file)
--- a/PLC/SliceAttributes.py
+++ b/PLC/SliceAttributes.py
@@ -16,6 +16,7 @@ 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'],
@@ -40,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)