support validating ipv6 addresses

[plcapi.git] / PLC / InterfaceTags.py

diff --git a/PLC/InterfaceTags.py b/PLC/InterfaceTags.py
index 87e2226..4dcb531 100644 (file)
--- a/PLC/InterfaceTags.py
+++ b/PLC/InterfaceTags.py
@@ -28,7 +28,6 @@ class InterfaceTag(Row):
         'tagname': TagType.fields['tagname'],
         'description': TagType.fields['description'],
         'category': TagType.fields['category'],
-        'min_role_id': TagType.fields['min_role_id'],
         'value': Parameter(str, "Interface setting value"),
         ### relations
 
@@ -47,12 +46,10 @@ class InterfaceTags(Table):
               ", ".join(self.columns)
 
         if interface_tag_filter is not None:
-            if isinstance(interface_tag_filter, (list, tuple, set)):
+            if isinstance(interface_tag_filter, (list, tuple, set, int, long)):
                 interface_tag_filter = Filter(InterfaceTag.fields, {'interface_tag_id': interface_tag_filter})
             elif isinstance(interface_tag_filter, dict):
                 interface_tag_filter = Filter(InterfaceTag.fields, interface_tag_filter)
-            elif isinstance(interface_tag_filter, int):
-                interface_tag_filter = Filter(InterfaceTag.fields, {'interface_tag_id': [interface_tag_filter]})
             else:
                 raise PLCInvalidArgument, "Wrong interface setting filter %r"%interface_tag_filter
             sql += " AND (%s) %s" % interface_tag_filter.sql(api)