X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSliceAttributes.py;h=2788b72adb18dc277a4824b7e5083f1d1c273daa;hb=34e1a55391f712d24f3932b98c7f26fcbd84baea;hp=135444457b7c24c5d3bc857f9e89e2ade68b7cf6;hpb=0cde91a55d0148022ac83bc4219cdefc66a56510;p=plcapi.git diff --git a/PLC/SliceAttributes.py b/PLC/SliceAttributes.py index 1354444..2788b72 100644 --- a/PLC/SliceAttributes.py +++ b/PLC/SliceAttributes.py @@ -30,14 +30,14 @@ class SliceAttributes(Table): database. """ - def __init__(self, api, slice_attribute_filter = None): - Table.__init__(self, api, SliceAttribute) + def __init__(self, api, slice_attribute_filter = None, columns = None): + Table.__init__(self, api, SliceAttribute, columns) sql = "SELECT %s FROM view_slice_attributes WHERE True" % \ - ", ".join(SliceAttribute.fields) + ", ".join(self.columns) if slice_attribute_filter is not None: - if isinstance(slice_attribute_filter, list): + if isinstance(slice_attribute_filter, (list, tuple, set)): slice_attribute_filter = Filter(SliceAttribute.fields, {'slice_attribute_id': slice_attribute_filter}) elif isinstance(slice_attribute_filter, dict): slice_attribute_filter = Filter(SliceAttribute.fields, slice_attribute_filter)