-# $Id: SiteTags.py 14587 2009-07-19 13:18:50Z thierry $
-# $URL: http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-27/PLC/SiteTags.py $
#
# Thierry Parmentelat - INRIA
#
-# $Revision: 14587 $
-#
from PLC.Faults import *
from PLC.Parameter import Parameter
from PLC.Filter import Filter
'tagname': TagType.fields['tagname'],
'description': TagType.fields['description'],
'category': TagType.fields['category'],
- 'min_role_id': TagType.fields['min_role_id'],
'value': Parameter(str, "Site setting value"),
- ### relations
-
+ ### relations
+
}
class SiteTags(Table):
", ".join(self.columns)
if site_tag_filter is not None:
- if isinstance(site_tag_filter, (list, tuple, set)):
+ if isinstance(site_tag_filter, (list, tuple, set, int)):
site_tag_filter = Filter(SiteTag.fields, {'site_tag_id': site_tag_filter})
elif isinstance(site_tag_filter, dict):
site_tag_filter = Filter(SiteTag.fields, site_tag_filter)
- elif isinstance(site_tag_filter, int):
- site_tag_filter = Filter(SiteTag.fields, {'site_tag_id': [site_tag_filter]})
else:
- raise PLCInvalidArgument, "Wrong site setting filter %r"%site_tag_filter
+ raise PLCInvalidArgument("Wrong site setting filter %r"%site_tag_filter)
sql += " AND (%s) %s" % site_tag_filter.sql(api)