Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

Commit fc4e0fd

Browse files
author
Daniel Belcher
committed
updated group builder methods to include sensor parameters on filters
1 parent 3ba4519 commit fc4e0fd

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

lib/pytan/utils.py

+19
Original file line numberDiff line numberDiff line change
@@ -1237,6 +1237,23 @@ def build_group_obj(q_filter_defs, q_option_defs):
12371237
for d in q_filter_defs:
12381238
# validate/map question filter into a Filter()
12391239
filter_obj = get_filter_obj(d)
1240+
sensor_obj = d['sensor_obj']
1241+
user_params = d.get('params', {})
1242+
param_objlist = build_param_objlist(
1243+
obj=sensor_obj,
1244+
user_params=user_params,
1245+
delim='||',
1246+
derive_def=True,
1247+
empty_ok=True
1248+
)
1249+
# if a parameter is found, we will append it to the group filter object
1250+
if param_objlist:
1251+
filter_obj.sensor.name = d['sensor_obj'].name
1252+
filter_obj.sensor.source_id = d['sensor_obj'].id
1253+
filter_obj.sensor.parameter_definition = d['sensor_obj'].parameter_definition
1254+
filter_obj.sensor.parameters = param_objlist
1255+
else:
1256+
filter_obj.sensor.hash = d['sensor_obj'].hash
12401257

12411258
# update filter_obj with any options
12421259
filter_obj = apply_options_obj(q_option_defs, filter_obj, 'filter')
@@ -1511,6 +1528,8 @@ def get_filter_obj(sensor_def):
15111528
filter_obj : :class:`taniumpy.object_types.filter.Filter`
15121529
* Filter object created from `sensor_def`
15131530
"""
1531+
1532+
# getting sensor
15141533
sensor_obj = sensor_def['sensor_obj']
15151534

15161535
# create our basic filter that is needed no matter what

0 commit comments

Comments
 (0)