From 255235644c8c302e1e92c41c13be3f3ad5973b16 Mon Sep 17 00:00:00 2001
From: JoeOLeary <joseph.o.leary@est.tech>
Date: Tue, 14 Jan 2020 10:54:59 +0000
Subject: Add support for TS 28.550/28.532

Issue-ID: DCAEGEN2-1912
Change-Id: If05c3673a240e6ea5e3d1caca3ff5bf5828590d3
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>
---
 .../test_data/invalid/no_file_header.xml           | 22 ------------------
 .../test_data/invalid/no_managed_element.xml       | 27 ----------------------
 .../test_data/lte/no_file_header/test.xml          | 22 ++++++++++++++++++
 .../test_data/lte/no_file_header/validity.props    |  1 +
 .../test_data/lte/no_managed_element/test.xml      | 27 ++++++++++++++++++++++
 .../lte/no_managed_element/validity.props          |  1 +
 .../test_data/lte/no_measdata/test.xml             | 10 ++++++++
 .../test_data/lte/no_measdata/validity.props       |  1 +
 .../test_data/nr/no_file_header/test.xml           | 22 ++++++++++++++++++
 .../test_data/nr/no_file_header/validity.props     |  1 +
 .../test_data/nr/no_measdata/test.xml              | 10 ++++++++
 .../test_data/nr/no_measdata/validity.props        |  1 +
 .../test_data/nr/no_measured_entity/test.xml       | 27 ++++++++++++++++++++++
 .../test_data/nr/no_measured_entity/validity.props |  1 +
 .../test_data/valid/no_measdata.xml                | 10 --------
 15 files changed, 124 insertions(+), 59 deletions(-)
 delete mode 100644 src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml
 delete mode 100644 src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml
 create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml
 create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_file_header/validity.props
 create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml
 create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_managed_element/validity.props
 create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml
 create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_measdata/validity.props
 create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml
 create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_file_header/validity.props
 create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml
 create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_measdata/validity.props
 create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml
 create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/validity.props
 delete mode 100644 src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml

(limited to 'src/test/resources/xml_validator_test')

diff --git a/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml b/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml
deleted file mode 100644
index 8e5669f..0000000
--- a/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
-    <measData>
-        <managedElement swVersion="r0.1" localDn="Dublin"/>
-        <measInfo measInfoId="some meas info id">
-            <job jobId="some jobId"/>
-            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
-            <repPeriod duration="PT900S"/>
-            <measType p="1">a</measType>
-            <measType p="2">b</measType>
-            <measType p="3">c</measType>
-            <measValue measObjLdn="some measObjLdn">
-                <r p="1">86</r>
-                <r p="2">67</r>
-                <r p="3">14</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/xml_validator_test/test_data/invalid/no_managed_element.xml b/src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml
deleted file mode 100644
index b1b3d68..0000000
--- a/src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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>
-        <measInfo measInfoId="some measInfoId">
-            <job jobId="some job Id"/>
-            <granPeriod endTime="2018-10-02T12:15:00Z" duration="some duration"/>
-            <repPeriod duration="PT900S"/>
-            <measType p="1">a</measType>
-            <measType p="2">b</measType>
-            <measType p="3">c</measType>
-            <measValue measObjLdn="some measObjLdn">
-                <r p="1">86</r>
-                <r p="2">67</r>
-                <r p="3">14</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/xml_validator_test/test_data/lte/no_file_header/test.xml b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml
new file mode 100644
index 0000000..8e5669f
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml
@@ -0,0 +1,22 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <measData>
+        <managedElement swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="some meas info id">
+            <job jobId="some jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">a</measType>
+            <measType p="2">b</measType>
+            <measType p="3">c</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">86</r>
+                <r p="2">67</r>
+                <r p="3">14</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/xml_validator_test/test_data/lte/no_file_header/validity.props b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/validity.props
new file mode 100644
index 0000000..80da24e
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/validity.props
@@ -0,0 +1 @@
+valid=false
\ No newline at end of file
diff --git a/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml
new file mode 100644
index 0000000..b1b3d68
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml
@@ -0,0 +1,27 @@
+<?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>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="some job Id"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="some duration"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">a</measType>
+            <measType p="2">b</measType>
+            <measType p="3">c</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">86</r>
+                <r p="2">67</r>
+                <r p="3">14</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/xml_validator_test/test_data/lte/no_managed_element/validity.props b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/validity.props
new file mode 100644
index 0000000..80da24e
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/validity.props
@@ -0,0 +1 @@
+valid=false
\ No newline at end of file
diff --git a/src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml
new file mode 100644
index 0000000..5b8eb5a
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml
@@ -0,0 +1,10 @@
+<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>
+    <fileFooter>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
diff --git a/src/test/resources/xml_validator_test/test_data/lte/no_measdata/validity.props b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/validity.props
new file mode 100644
index 0000000..6e5af27
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/validity.props
@@ -0,0 +1 @@
+valid=true
\ No newline at end of file
diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml
new file mode 100644
index 0000000..3450b98
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml
@@ -0,0 +1,22 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <measData>
+        <measuredEntity swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="some meas info id">
+            <job jobId="some jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">a</measType>
+            <measType p="2">b</measType>
+            <measType p="3">c</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">86</r>
+                <r p="2">67</r>
+                <r p="3">14</r>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_file_header/validity.props b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/validity.props
new file mode 100644
index 0000000..80da24e
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/validity.props
@@ -0,0 +1 @@
+valid=false
\ No newline at end of file
diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml
new file mode 100644
index 0000000..fb141ad
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml
@@ -0,0 +1,10 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="32.435 V10.0">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_measdata/validity.props b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/validity.props
new file mode 100644
index 0000000..6e5af27
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/validity.props
@@ -0,0 +1 @@
+valid=true
\ No newline at end of file
diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml
new file mode 100644
index 0000000..0d4216e
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="32.435 V10.0">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="some job Id"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="some duration"/>
+            <repPeriod duration="PT900S"/>
+            <measType p="1">a</measType>
+            <measType p="2">b</measType>
+            <measType p="3">c</measType>
+            <measValue measObjLdn="some measObjLdn">
+                <r p="1">86</r>
+                <r p="2">67</r>
+                <r p="3">14</r>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/validity.props b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/validity.props
new file mode 100644
index 0000000..80da24e
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/validity.props
@@ -0,0 +1 @@
+valid=false
\ No newline at end of file
diff --git a/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml b/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml
deleted file mode 100644
index 5b8eb5a..0000000
--- a/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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>
-    <fileFooter>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
-- 
cgit 1.2.3-korg