'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):
database.
"""
- def __init__(self, api, slice_attribute_filter = None):
- Table.__init__(self, api, SliceAttribute)
+ def __init__(self, api, slice_attribute_filter = None, columns = None):
+ Table.__init__(self, api, SliceAttribute, columns)
sql = "SELECT %s FROM view_slice_attributes WHERE True" % \
- ", ".join(SliceAttribute.fields)
+ ", ".join(self.columns)
if slice_attribute_filter is not None:
if isinstance(slice_attribute_filter, (list, tuple, set)):
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)