Merge from head.

[plcapi.git] / PLC / SliceAttributes.py

diff --git a/PLC/SliceAttributes.py b/PLC/SliceAttributes.py
index f7c3499..cfc0298 100644 (file)
--- a/PLC/SliceAttributes.py
+++ b/PLC/SliceAttributes.py
@@ -1,7 +1,6 @@
-from types import StringTypes
-
 from PLC.Faults import *
 from PLC.Parameter import Parameter
+from PLC.Filter import Filter
 from PLC.Table import Row, Table
 from PLC.SliceAttributeTypes import SliceAttributeType, SliceAttributeTypes
 
@@ -17,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):
@@ -31,16 +30,17 @@ class SliceAttributes(Table):
     database.
     """
 
-    def __init__(self, api, slice_attribute_id_list = None):
-       self.api = api
+    def __init__(self, api, slice_attribute_filter = None, columns = None):
+        Table.__init__(self, api, SliceAttribute, columns)
 
-        sql = "SELECT %s FROM view_slice_attributes" % \
-              ", ".join(SliceAttribute.fields)
+        sql = "SELECT %s FROM view_slice_attributes WHERE True" % \
+              ", ".join(self.columns)
 
-        if slice_attribute_id_list:
-            sql += " WHERE slice_attribute_id IN (%s)" % ", ".join(map(str, slice_attribute_id_list))
+        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)
 
-        rows = self.api.db.selectall(sql)
- 
-        for row in rows:
-            self[row['slice_attribute_id']] = SliceAttribute(api, row)
+        self.selectall(sql)