@@ -116,13 +116,15 @@ def tokenize(self, conf_name):
116
116
if self .metadata .get ("expected_event_count" ) is None :
117
117
breaker = self .metadata .get ("breaker" )
118
118
if breaker is not None :
119
+ raise_warning ("'breaker' parameter is obsolete; use 'expected_event_count' parameter instead." )
119
120
expected_events = 0
120
121
for each_event in bulk_event :
121
122
expected_events += len (
122
123
list (filter (lambda x : x , self .break_events (each_event .event )))
123
124
)
124
125
else :
125
126
expected_events = len (bulk_event )
127
+ raise_warning ("'expected_event_count' parameter is missing." )
126
128
self .metadata .update (expected_event_count = expected_events )
127
129
for each in bulk_event :
128
130
each .metadata .update (expected_event_count = expected_events )
@@ -202,7 +204,7 @@ def _parse_meta(self, psa_data_params):
202
204
)
203
205
metadata .update (timestamp_type = "plugin" )
204
206
if metadata .get ("timezone" ) not in ["local" , "0000" , None ] and not re .match (
205
- TIMEZONE_REX , metadata .get ("timezone" )
207
+ TIMEZONE_REX , metadata .get ("timezone" )
206
208
):
207
209
raise_warning (
208
210
"Invalid value for timezone: '{}' using timezone = 0000." .format (
@@ -219,8 +221,8 @@ def _parse_meta(self, psa_data_params):
219
221
)
220
222
metadata .update (timestamp_type = "plugin" )
221
223
if (
222
- metadata .get ("sample_count" )
223
- and not metadata .get ("sample_count" ).isnumeric ()
224
+ metadata .get ("sample_count" )
225
+ and not metadata .get ("sample_count" ).isnumeric ()
224
226
):
225
227
raise_warning (
226
228
"Invalid value for sample_count: '{}' using sample_count = 1." .format (
@@ -229,8 +231,8 @@ def _parse_meta(self, psa_data_params):
229
231
)
230
232
metadata .update (sample_count = "1" )
231
233
if (
232
- metadata .get ("expected_event_count" )
233
- and not metadata .get ("expected_event_count" ).isnumeric ()
234
+ metadata .get ("expected_event_count" )
235
+ and not metadata .get ("expected_event_count" ).isnumeric ()
234
236
):
235
237
raise_warning (
236
238
"Invalid value for expected_event_count: '{}' using expected_event_count = 1." .format (
@@ -310,6 +312,8 @@ def _get_raw_sample(self):
310
312
event , event_metadata , self .sample_name , requirement_test_data
311
313
)
312
314
elif self .metadata .get ("breaker" ):
315
+ raise_warning ("'breaker' variable is obsolete. "
316
+ "Use of 'breaker' variable is discouraged since event-breaking shall be executed by add-on." )
313
317
for each_event in self .break_events (sample_raw ):
314
318
if each_event :
315
319
event_metadata = self .get_eventmetadata ()
@@ -356,10 +360,10 @@ def break_events(self, sample_raw):
356
360
match_obj = next (sample_match )
357
361
event_list = list ()
358
362
if match_obj .start () != 0 :
359
- event_list .append (sample_raw [pos : match_obj .start ()].strip ())
363
+ event_list .append (sample_raw [pos : match_obj .start ()].strip ())
360
364
pos = match_obj .start ()
361
365
for _ , match in enumerate (sample_match ):
362
- event_list .append (sample_raw [pos : match .start ()].strip ())
366
+ event_list .append (sample_raw [pos : match .start ()].strip ())
363
367
pos = match .start ()
364
368
event_list .append (sample_raw [pos :].strip ())
365
369
return event_list
@@ -413,7 +417,7 @@ def populate_requirement_test_data(event):
413
417
missing_recommended_fields = cim .get ("missing_recommended_fields" ) or []
414
418
if missing_recommended_fields :
415
419
missing_recommended_fields = (
416
- missing_recommended_fields .get ("field" ) or []
420
+ missing_recommended_fields .get ("field" ) or []
417
421
)
418
422
if type (missing_recommended_fields ) != list :
419
423
missing_recommended_fields = [missing_recommended_fields ]
0 commit comments