fix tag types

[plcapi.git] / PLC / TagTypes.py

diff --git a/PLC/TagTypes.py b/PLC/TagTypes.py
index d4d4cd7..78cc56f 100644 (file)
--- a/PLC/TagTypes.py
+++ b/PLC/TagTypes.py
@@ -1,6 +1,3 @@
-# $Id$
-# $Id$
-# $URL$
 #
 # Thierry Parmentelat - INRIA
 #
@@ -9,29 +6,29 @@ 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.Storage.AlchemyObject import AlchemyObj
 from PLC.Roles import Role, Roles
 
 # xxx todo : deleting a tag type should delete the related nodegroup(s)
 
-class TagType (Row):
+class TagType (AlchemyObj):
 
     """
     Representation of a row in the tag_types table.
     """
 
-    table_name = 'tag_types'
-    primary_key = 'tag_type_id'
-    join_tables = ['node_tag', 'interface_tag', 'slice_tag', 'site_tag', 'person_tag' ]
+    tablename = 'tag_types'
+    join_tables = ['tag_type_role', 'node_tag', 'interface_tag', 'slice_tag', 'site_tag', 'person_tag' ]
     fields = {
-        'tag_type_id': Parameter(int, "Node tag type identifier"),
+        'tag_type_id': Parameter(int, "Node tag type identifier", primary_key=True),
         'tagname': Parameter(str, "Node tag type name", max = 100),
         'description': Parameter(str, "Node tag type description", max = 254),
         'category' : Parameter (str, "Node tag category", max=64, optional=True),
-        'min_role_id': Parameter(int, "Minimum (least powerful) role that can set or change this attribute"),
+        'role_ids': Parameter([int], "List of role identifiers", joined=True),
+        'roles': Parameter([str], "List of roles", joined=True),
         }
 
-    def validate_name(self, name):
+    def validate_tagname(self, name):
         if not len(name):
             raise PLCInvalidArgument, "tag type name must be set"
 
@@ -43,42 +40,42 @@ class TagType (Row):
 
         return name
 
-    def validate_min_role_id(self, role_id):
-        roles = [row['role_id'] for row in Roles(self.api)]
-        if role_id not in roles:
-            raise PLCInvalidArgument, "Invalid role"
+    #add_role = Row.add_object(Role, 'tag_type_role')
+    #remove_role = Row.remove_object(Role, 'tag_type_role')
 
-        return role_id
+    def sync(self, insert=False, validate=True):
+        AlchemyObj.sync(self, insert, validate)
+        if insert == True or 'tag_type_id' not in self:
+            AlchemyObj.insert(self, dict(self))
+            tag_type = AlchemyObj.select(self, filter={'tagname': self['tagname']})
+            self['tag_type_id'] = tag_type['tag_type_id']
+        else:
+            AlchemyObj.update(self, dict(self))
 
-class TagTypes(Table):
+    def delete(self, commit=True):
+        AlchemyObj.delete(self, filter={'tag_type_id': self['tag_type_id']})
+class TagTypes(list):
     """
     Representation of row(s) from the tag_types table
     in the database.
     """
 
     def __init__(self, api, tag_type_filter = None, columns = None):
-        Table.__init__(self, api, TagType, columns)
 
-        sql = "SELECT %s FROM tag_types WHERE True" % \
-              ", ".join(self.columns)
+        if not tag_type_filter:
+            tag_types = TagType().select()
+        elif isinstance(tag_type_filter, (list, tuple, set)):
+            ints = filter(lambda x: isinstance(x, (int, long)), tag_type_filter)
+            strs = filter(lambda x: isinstance(x, StringTypes), tag_type_filter)
+            tag_types = TagType().select(filter={'tag_type_id': ints, 'tagname': strs})
+        elif isinstance(tag_type_filter, dict):
+            tag_types = TagType().select(filter=tag_type_filter)
+        elif isinstance(tag_type_filter, (int, long)):
+            tag_types = TagType().select(filter={'tag_type_id': tag_type_filter})
+        elif isinstance(tag_type_filter, StringTypes):
+            tag_types = TagType().select(filter={'tagname': tag_type_filter})
+        else:
+            raise PLCInvalidArgument, "Wrong tag type filter %r"%tag_type_filter
 
-        if tag_type_filter is not None:
-            if isinstance(tag_type_filter, (list, tuple, set)):
-                # Separate the list into integers and strings
-                ints = filter(lambda x: isinstance(x, (int, long)), tag_type_filter)
-                strs = filter(lambda x: isinstance(x, StringTypes), tag_type_filter)
-                tag_type_filter = Filter(TagType.fields, {'tag_type_id': ints, 'tagname': strs})
-                sql += " AND (%s) %s" % tag_type_filter.sql(api, "OR")
-            elif isinstance(tag_type_filter, dict):
-                tag_type_filter = Filter(TagType.fields, tag_type_filter)
-                sql += " AND (%s) %s" % tag_type_filter.sql(api, "AND")
-            elif isinstance(tag_type_filter, (int, long)):
-                tag_type_filter = Filter(TagType.fields, {'tag_type_id':tag_type_filter})
-                sql += " AND (%s) %s" % tag_type_filter.sql(api, "AND")
-            elif isinstance(tag_type_filter, StringTypes):
-                tag_type_filter = Filter(TagType.fields, {'tagname':tag_type_filter})
-                sql += " AND (%s) %s" % tag_type_filter.sql(api, "AND")
-            else:
-                raise PLCInvalidArgument, "Wrong tag type filter %r"%tag_type_filter
-
-        self.selectall(sql)
+        for tag_type in tag_types:
+            self.append(TagType(api, object=tag_type, columns=columns))