From c1b5c67f788ec8c937859b9e16cbfe9488589e3f Mon Sep 17 00:00:00 2001
From: malar <malarvizhi.44@wipro.com>
Date: Wed, 13 Jul 2022 05:41:41 +0000
Subject: Enhancements to KPI Computation MS for Kohn Release

- Changes to support two types of PM XML schema
- Throw an exception for Ratio and SumRatio computation when
  minimum operand size is not satisfied

Issue-ID: DCAEGEN2-3193
Signed-off-by: Malarvizhi Paramasivam <malarvizhi.44@wipro.com>
Change-Id: Ie9672bb11a5e98aa681bd1c7c7db59ea2be46112
---
 .../src/test/resources/kpi/RAN.xml                 | 117 +++++++++
 .../src/test/resources/kpi/kpi_config_slicing.json |  17 ++
 .../test/resources/kpi/ves_message_slicing.json    | 270 +++++++++++++++++++++
 3 files changed, 404 insertions(+)
 create mode 100644 components/kpi-computation-ms/src/test/resources/kpi/RAN.xml
 create mode 100644 components/kpi-computation-ms/src/test/resources/kpi/kpi_config_slicing.json
 create mode 100644 components/kpi-computation-ms/src/test/resources/kpi/ves_message_slicing.json

(limited to 'components/kpi-computation-ms/src/test/resources/kpi')

diff --git a/components/kpi-computation-ms/src/test/resources/kpi/RAN.xml b/components/kpi-computation-ms/src/test/resources/kpi/RAN.xml
new file mode 100644
index 00000000..9b8da644
--- /dev/null
+++ b/components/kpi-computation-ms/src/test/resources/kpi/RAN.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ ============LICENSE_START=======================================================
+~ Copyright (c) 2022 Wipro Limited. All rights reserved.
+~ ================================================================================ 
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~ http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+~ ============LICENSE_END=========================================================
+-->
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+  <fileHeader dnPrefix="Prefix" fileFormatVersion="32.435 V10.0" vendorName="Acme Ltd">
+    <fileSender localDn="cucpserver2"/>
+    <measCollec beginTime="2021-01-15T05:46:30.387"/>
+  </fileHeader>
+  <measData>
+    <managedElement localDn="cucpserver2" swVersion="r0.1"/>
+    <measInfo measInfoId="measInfoIsVal">
+      <job jobId="7836"/>
+      <granPeriod duration="PT900S" endTime="2021-01-15T05:46:30.387"/>
+      <repPeriod duration="PT900S"/>
+      <measType p="1">SM.PduSessionCreationSucc.0011-0010</measType>
+      <measType p="2">SM.PduSessionCreationReq.0011-0010</measType>
+      <measType p="3">SM.PduSessionCreationFail.0</measType>
+      <measValue measObjLdn="10896">
+        <r p="1">5813.0</r>
+        <r p="2">3679.0</r>
+        <r p="3">1333.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="10897">
+        <r p="1">5637.0</r>
+        <r p="2">3406.0</r>
+        <r p="3">1333.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="11561">
+        <r p="1">5130.0</r>
+        <r p="2">3083.0</r>
+        <r p="3">1333.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="11562">
+        <r p="1">6020.0</r>
+        <r p="2">3956.0</r>
+        <r p="3">1333.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="11568">
+        <r p="1">5527.0</r>
+        <r p="2">4117.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="11569">
+        <r p="1">5086.0</r>
+        <r p="2">3206.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="13905">
+        <r p="1">1655.0</r>
+        <r p="2">1183.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="13910">
+        <r p="1">2587.0</r>
+        <r p="2">1900.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="14427">
+        <r p="1">1668.0</r>
+        <r p="2">1217.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="14655">
+        <r p="1">4904.0</r>
+        <r p="2">3155.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="14656">
+        <r p="1">5357.0</r>
+        <r p="2">3577.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="15360">
+        <r p="1">2177.0</r>
+        <r p="2">1438.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="15361">
+        <r p="1">2480.0</r>
+        <r p="2">1615.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="15548">
+        <r p="1">1730.0</r>
+        <r p="2">1174.0</r>
+        <suspect>false</suspect>
+      </measValue>
+      <measValue measObjLdn="15549">
+        <r p="1">2227.0</r>
+        <r p="2">1341.0</r>
+        <suspect>false</suspect>
+      </measValue>
+    </measInfo>
+  </measData>
+  <fileFooter>
+    <measCollec endTime="2021-01-15T05:46:30.387"/>
+  </fileFooter>
+</measCollecFile>
diff --git a/components/kpi-computation-ms/src/test/resources/kpi/kpi_config_slicing.json b/components/kpi-computation-ms/src/test/resources/kpi/kpi_config_slicing.json
new file mode 100644
index 00000000..bbc7fb2a
--- /dev/null
+++ b/components/kpi-computation-ms/src/test/resources/kpi/kpi_config_slicing.json
@@ -0,0 +1,17 @@
+{
+    "domain": "measurementsForKpi",
+    "methodForKpi": [{
+            "eventName": "perf3gpp_CORE-cucpserver2_pmMeasResult",
+            "controlLoopSchemaType": "SLICE",
+            "policyScope": "resource=networkSlice;type=configuration",
+            "policyName": "configuration.dcae.microservice.pm-mapper.xml",
+            "policyVersion": "v0.0.1",
+            "kpis": [{
+                    "measType": "PDUSessionEstSR",
+                    "operation": "RATIO",
+                    "operands": ["SM.PduSessionCreationSucc","SM.PduSessionCreationReq"]
+                }
+            ]
+        }
+    ]
+}
diff --git a/components/kpi-computation-ms/src/test/resources/kpi/ves_message_slicing.json b/components/kpi-computation-ms/src/test/resources/kpi/ves_message_slicing.json
new file mode 100644
index 00000000..41a8f91c
--- /dev/null
+++ b/components/kpi-computation-ms/src/test/resources/kpi/ves_message_slicing.json
@@ -0,0 +1,270 @@
+{
+   "event": {
+      "commonEventHeader": {
+    "domain": "perf3gpp",
+    "eventId": "243f63f4-bb54-4f65-8aab-d254cd5b026d",
+    "sequence": 0,
+    "eventName": "perf3gpp_CORE-cucpserver2_pmMeasResult",
+    "sourceName": "oteNB5309",
+    "reportingEntityName": "",
+    "priority": "Normal",
+    "startEpochMicrosec": 1610689590387,
+    "lastEpochMicrosec": 1610689590387,
+    "version": "4.0",
+    "vesEventListenerVersion": "7.1",
+    "timeZoneOffset": "UTC+05:00"
+      },
+      "perf3gppFields": {
+        "perf3gppFieldsVersion": "1.0",
+        "measDataCollection": {
+      "granularityPeriod": 900,
+      "measuredEntityUserName": "",
+      "measuredEntityDn": "cucpserver2",
+      "measuredEntitySoftwareVersion": "r0.1",
+      "measInfoList": [
+        {
+          "measInfoId": {
+      "sMeasInfoId": "measInfoIsVal"
+          },
+          "measTypes": {
+      "sMeasTypesList": [
+        "SM.PduSessionCreationSucc.0011-0010",
+        "SM.PduSessionCreationReq.0011-0010",
+        "SM.PduSessionCreationFail.0"
+      ]
+          },
+          "measValuesList": [
+       {
+         "measObjInstId": "10896",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+         "p": 1,
+         "sValue": "5813.0"
+           },
+           {
+         "p": 2,
+         "sValue": "3679.0"
+           },
+           {
+         "p": 3,
+         "sValue": "1333.0"
+           }
+         ]
+       },
+       {
+                     "measObjInstId": "10897",
+         "suspectFlag": "false",
+         "measResults": [
+                 {
+             "p": 1,
+             "sValue": "5637.0"
+           },
+           {
+             "p": 2,
+             "sValue": "3406.0"
+           },
+           {
+             "p": 3,
+             "sValue": "1333.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "11561",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "5130.0"
+           },
+           {
+             "p": 2,
+             "sValue": "3083.0"
+           },
+           {
+             "p": 3,
+             "sValue": "1333.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "11562",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "6020.0"
+           },
+           {
+             "p": 2,
+             "sValue": "3956.0"
+           },
+           {
+             "p": 3,
+             "sValue": "1333.0"
+           }
+      
+         ]   
+       },
+       {
+         "measObjInstId": "11568",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "5527.0"
+           },
+           {
+             "p": 2,
+             "sValue": "4117.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "11569",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "5086.0"
+           },
+           {
+             "p": 2,
+             "sValue": "3206.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "13905",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "1655.0"
+           },
+           {
+             "p": 2,
+             "sValue": "1183.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "13910",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "2587.0"
+           },
+           {
+             "p": 2,
+             "sValue": "1900.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "14427",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "1668.0"
+           },
+           {
+             "p": 2,
+             "sValue": "1217.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "14655",
+         "suspectFlag": "false",
+         "measResults": [
+                 {
+             "p": 1,
+             "sValue": "4904.0"
+           },
+           {
+             "p": 2,
+             "sValue": "3155.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "14656",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "5357.0"
+           },
+           {
+             "p": 2,
+             "sValue": "3577.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "15360",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "2177.0"
+           },
+           {
+             "p": 2,
+             "sValue": "1438.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "15361",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "2480.0"
+                 },
+           {
+             "p": 2,
+             "sValue": "1615.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "15548",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,
+             "sValue": "1730.0"
+           },
+           {
+             "p": 2,
+             "sValue": "1174.0"
+           }
+         ]
+       },
+       {
+         "measObjInstId": "15549",
+         "suspectFlag": "false",
+         "measResults": [
+           {
+             "p": 1,                          
+                    "sValue": "2227.0"
+           },
+           {
+             "p": 2,
+             "sValue": "1341.0"
+           }
+         ]
+       }
+         ]
+        }
+          ]
+        }
+      }
+   }
+}
-- 
cgit 1.2.3-korg