#
# 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.LinkTypes import LinkType, LinkTypes
+from PLC.TagTypes import TagType, TagTypes
class Ilink(Row):
"""
primary_key = 'ilink_id'
fields = {
'ilink_id': Parameter(int, "ilink identifier"),
- 'link_type_id': LinkType.fields['link_type_id'],
+ '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"),
", ".join(self.columns)
if ilink_filter is not None:
- if isinstance(ilink_filter, (list, tuple, set)):
+ if isinstance(ilink_filter, (list, tuple, set, int)):
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
+ raise PLCInvalidArgument("Wrong ilink filter %r"%ilink_filter)
sql += " AND (%s) %s" % ilink_filter.sql(api)