From ba384eeb3cc007ff1d48db04fecc9356069456c5 Mon Sep 17 00:00:00 2001
From: marcinrzepeckiwroc <marcin.rzepecki@nokia.com>
Date: Wed, 15 Jul 2020 13:26:51 +0200
Subject: implement regex support in PM Mapper filtering mechanism

Issue-ID: DCAEGEN2-2347
Signed-off-by: marcinrzepeckiwroc <marcin.rzepecki@nokia.com>
Change-Id: I3fdbae33ae318800ccc2758a191604fe79c2aaf4
---
 .../lte/meas_results_manyinfo_regex/expected.xml   | 42 ++++++++++++++++
 .../lte/meas_results_manyinfo_regex/test.xml       | 44 +++++++++++++++++
 .../meas_type_and_r_manyinfo_regex/expected.xml    | 48 +++++++++++++++++++
 .../lte/meas_type_and_r_manyinfo_regex/test.xml    | 56 ++++++++++++++++++++++
 4 files changed, 190 insertions(+)
 create mode 100644 src/test/resources/filter_test/lte/meas_results_manyinfo_regex/expected.xml
 create mode 100644 src/test/resources/filter_test/lte/meas_results_manyinfo_regex/test.xml
 create mode 100644 src/test/resources/filter_test/lte/meas_type_and_r_manyinfo_regex/expected.xml
 create mode 100644 src/test/resources/filter_test/lte/meas_type_and_r_manyinfo_regex/test.xml

(limited to 'src/test/resources')

diff --git a/src/test/resources/filter_test/lte/meas_results_manyinfo_regex/expected.xml b/src/test/resources/filter_test/lte/meas_results_manyinfo_regex/expected.xml
new file mode 100644
index 0000000..d1044ad
--- /dev/null
+++ b/src/test/resources/filter_test/lte/meas_results_manyinfo_regex/expected.xml
@@ -0,0 +1,42 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement localDn="Dublin" swVersion="r0.1"/>
+        <measInfo measInfoId="this will be filtered out">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>zz3</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>27</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>a b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>1 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="some measInfoId2">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>aab1 b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>1 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
diff --git a/src/test/resources/filter_test/lte/meas_results_manyinfo_regex/test.xml b/src/test/resources/filter_test/lte/meas_results_manyinfo_regex/test.xml
new file mode 100644
index 0000000..890fee4
--- /dev/null
+++ b/src/test/resources/filter_test/lte/meas_results_manyinfo_regex/test.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="32.435 V10.0">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="this will be filtered out">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>z aa zz3 bb</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>99 1 27 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>z a zz b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>99 1 27 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="some measInfoId2">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>z aab1 zz b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>99 1 27 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
diff --git a/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo_regex/expected.xml b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo_regex/expected.xml
new file mode 100644
index 0000000..2a2a967
--- /dev/null
+++ b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo_regex/expected.xml
@@ -0,0 +1,48 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement localDn="Dublin" swVersion="r0.1"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">aab1</measType>
+            <measType p="2">aab2</measType>
+            <measType p="4">b</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">1</r>
+                <r p="2">99</r>
+                <r p="4">2</r>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="filter will disregard this measInfo">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">aab1</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">1</r>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="some measInfoId2">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">aab1</measType>
+            <measType p="3">bb3</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">1</r>
+                <r p="3">2</r>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
diff --git a/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo_regex/test.xml b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo_regex/test.xml
new file mode 100644
index 0000000..9aa668e
--- /dev/null
+++ b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo_regex/test.xml
@@ -0,0 +1,56 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement localDn="Dublin" swVersion="r0.1"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">aab1</measType>
+            <measType p="2">aab2</measType>
+            <measType p="3">z</measType>
+            <measType p="4">b</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">1</r>
+                <r p="2">99</r>
+                <r p="3">3</r>
+                <r p="4">2</r>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="filter will disregard this measInfo">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">aab1</measType>
+            <measType p="2">z</measType>
+            <measType p="3">bb</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">1</r>
+                <r p="2">99</r>
+                <r p="3">2</r>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="some measInfoId2">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">aab1</measType>
+            <measType p="2">z</measType>
+            <measType p="3">bb3</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">1</r>
+                <r p="2">99</r>
+                <r p="3">2</r>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
-- 
cgit 1.2.3-korg