added create_network(), delete_network(), create_subnet(), delete_subnet(), process_t...

[plcapi.git] / PLC / Ilinks.py

diff --git a/PLC/Ilinks.py b/PLC/Ilinks.py
index 28c95e2..9ccaf60 100644 (file)
--- a/PLC/Ilinks.py
+++ b/PLC/Ilinks.py
@@ -1,53 +1,53 @@
 #
 # Thierry Parmentelat - INRIA
 #
-# $Revision: 9423 $
-#
 from PLC.Faults import *
 from PLC.Parameter import Parameter
-from PLC.Filter import Filter
-from PLC.Table import Row, Table
 from PLC.Interfaces import Interface, Interfaces
 from PLC.TagTypes import TagType, TagTypes
+from PLC.Storage.AlchemyObject import AlchemyObj
 
-class Ilink(Row):
+class Ilink(AlchemyObj):
     """
     Representation of a row in the ilink table.
     To use, instantiate with a dict of values.
     """
 
-    table_name = 'ilink'
-    primary_key = 'ilink_id'
+    tablename = 'ilink'
     fields = {
-        'ilink_id': Parameter(int, "ilink identifier"),
+        'ilink_id': Parameter(int, "ilink identifier", primary_key=True),
         'tag_type_id': TagType.fields['tag_type_id'],
         'src_interface_id': Parameter(int, "source interface identifier"),
         'dst_interface_id': Parameter(int, "destination interface identifier"),
         'value': Parameter( str, "optional ilink value"),
         }
 
-class Ilinks(Table):
+    def sync(self, insert=False, validate=True):
+        AlchemyObj.sync(self, commit, validate)
+        if 'ilink_id' in self:
+            AlchemyObj.insert(self, dict(self))
+        else:
+            AlchemyObj.update(self, {'ilink_id': self['ilink_id']}, dict(self))
+
+    def delete(self, commit=True):
+        assert 'ilink_id' in self
+        AlchemyObj.delete(self, dict(self))
+
+class Ilinks(list):
     """
     Representation of row(s) from the ilink table in the
     database.
     """
 
     def __init__(self, api, ilink_filter = None, columns = None):
-        Table.__init__(self, api, Ilink, columns)
-
-        sql = "SELECT %s FROM view_ilinks WHERE True" % \
-              ", ".join(self.columns)
-
-        if ilink_filter is not None:
-            if isinstance(ilink_filter, (list, tuple, set)):
-                ilink_filter = Filter(Ilink.fields, {'ilink_id': ilink_filter})
-            elif isinstance(ilink_filter, dict):
-                ilink_filter = Filter(Ilink.fields, ilink_filter)
-            elif isinstance(ilink_filter, int):
-                ilink_filter = Filter(Ilink.fields, {'ilink_id': [ilink_filter]})
-            else:
-                raise PLCInvalidArgument, "Wrong ilink filter %r"%ilink_filter
-            sql += " AND (%s) %s" % ilink_filter.sql(api)
-
-
-        self.selectall(sql)
+        if not ilink_filter:
+            ilinks = Ilink().select()
+        elif isinstance(ilink_filter, (list, tuple, set, int, long)):
+            ilinks = Ilink().select(filter={'ilink_id': ilink_filter})
+        elif isinstance(ilink_filter, dict):
+            ilink_filter = Ilink().select(filter=ilink_filter)
+        else:
+            raise PLCInvalidArgument, "Wrong ilink filter %r"%ilink_filter
+
+        for ilink in ilinks:
+            self.append(ilink)