merge changes from head

[plcapi.git] / PLC / SliceAttributes.py

diff --git a/PLC/SliceAttributes.py b/PLC/SliceAttributes.py
index 1354444..71b47e6 100644 (file)
--- a/PLC/SliceAttributes.py
+++ b/PLC/SliceAttributes.py
@@ -20,8 +20,7 @@ class SliceAttribute(Row):
         '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):
@@ -30,14 +29,14 @@ 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):
+            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)