|
13 | 13 | # See the License for the specific language governing permissions and |
14 | 14 | # limitations under the License. |
15 | 15 | # |
| 16 | +import json |
16 | 17 | import logging |
17 | 18 | import pytest |
18 | 19 | import re |
@@ -50,7 +51,15 @@ def compare(self, keyValueSPL, keyValueXML, escapedKeyValue): |
50 | 51 | for key, value in keyValueXML.items(): |
51 | 52 | res = key in keyValueprocessedSPL and value == keyValueprocessedSPL[key] |
52 | 53 | if (not res) and (key not in escapedKeyValue): |
53 | | - dict_missing_key_value.update({key: value}) |
| 54 | + valueinsplunk = None |
| 55 | + if key in keyValueSPL.keys(): |
| 56 | + valueinsplunk = keyValueSPL[key] |
| 57 | + dict_missing_key_value.update( |
| 58 | + { |
| 59 | + "Key value in requirement file: " + key: value, |
| 60 | + "Key value extracted by Splunk: " + key: valueinsplunk, |
| 61 | + } |
| 62 | + ) |
54 | 63 | flag = False |
55 | 64 | return flag, dict_missing_key_value |
56 | 65 |
|
@@ -193,19 +202,13 @@ def test_requirement_params( |
193 | 202 | keyValue_dict_SPL, key_values_xml, exceptions_dict |
194 | 203 | ) |
195 | 204 | self.logger.info(f"Field mapping check: {field_extraction_check}") |
196 | | - mismapped_key_value_pair = {} |
197 | | - for key, value in missing_key_value.items(): |
198 | | - if key in keyValue_dict_SPL.keys(): |
199 | | - valueInSplunk = keyValue_dict_SPL[key] |
200 | | - mismapped_key_value_pair.update({key: valueInSplunk}) |
201 | 205 |
|
202 | 206 | assert datamodel_check and field_extraction_check, ( |
203 | 207 | f" Issue with either field extraction or data model.\nsearch={search}\n" |
204 | 208 | f" data model check: {datamodel_check} \n" |
205 | 209 | f" data model in requirement file {model_datalist}\n " |
206 | 210 | f" data model extracted by TA {list(datamodel_based_on_tag.keys())}\n" |
207 | 211 | f" Field_extraction_check: {field_extraction_check} \n" |
208 | | - f" Key value not extracted by TA: {missing_key_value} \n" |
209 | | - f" Mismatched key value: {mismapped_key_value_pair}\n" |
| 212 | + f" Field extraction errors: {json.dumps(missing_key_value, indent=4)}q \n" |
210 | 213 | f" sourcetype of ingested event: {sourcetype} \n" |
211 | 214 | ) |
0 commit comments