oops

[plcapi.git] / PLC / SliceAttributes.py

diff --git a/PLC/SliceAttributes.py b/PLC/SliceAttributes.py
index fffb8bb..7ef8e63 100644 (file)
--- a/PLC/SliceAttributes.py
+++ b/PLC/SliceAttributes.py
@@ -1,8 +1,9 @@
+# $Id#
 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
+from PLC.TagTypes import TagType, TagTypes
 
 class SliceAttribute(Row):
     """
@@ -16,12 +17,13 @@ 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"),
-        '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),
+       'nodegroup_id': Parameter(int, "Nodegroup identifier, if a sliver attribute"),
+        'tag_type_id': TagType.fields['tag_type_id'],
+        'tagname': TagType.fields['tagname'],
+        'description': TagType.fields['description'],
+        'category': TagType.fields['category'],
+        'min_role_id': TagType.fields['min_role_id'],
+        'value': Parameter(str, "Slice attribute value"),
         }
 
 class SliceAttributes(Table):
@@ -30,17 +32,17 @@ 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)