X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSliceAttributes.py;h=9f0b1fbe58f55a64ba5528606cd19241428ae294;hb=11e405851a7d84e4488df165b8c310222135585a;hp=2788b72adb18dc277a4824b7e5083f1d1c273daa;hpb=6d076341d97539c09d289dcfbced6406c255ccc3;p=plcapi.git diff --git a/PLC/SliceAttributes.py b/PLC/SliceAttributes.py index 2788b72..9f0b1fb 100644 --- a/PLC/SliceAttributes.py +++ b/PLC/SliceAttributes.py @@ -16,12 +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), + 'value': Parameter(str, "Slice attribute value"), } class SliceAttributes(Table): @@ -41,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)