[DCAEGEN2] Improvements to kpi-computation-ms Microservice

Issue-ID: DCAEGEN2-2972
Change-Id: If2eb842a1d75b0770cd14f4e0c571c7a721327fa
Signed-off-by: Venkata Molluru <venkatamuralimohanreddy.molluru@techmahindra.com>

4 files changed, 25 insertions, 8 deletions

diff --git a/components/kpi-computation-ms/src/test/resources/kpi/cbs_config1.json b/components/kpi-computation-ms/src/test/resources/kpi/cbs_config1.json
index bb763db1..9dea5012 100644
--- a/components/kpi-computation-ms/src/test/resources/kpi/cbs_config1.json
+++ b/components/kpi-computation-ms/src/test/resources/kpi/cbs_config1.json
@@ -32,7 +32,7 @@
             }
         },
         "aafPassword": "demo123456!",
-        "kpi.policy": "{\"domain\":\"measurementsForKpi\",\"methodForKpi\":[{\"eventName\":\"perf3gpp_CORE-AMF_pmMeasResult\",\"controlLoopSchemaType\":\"SLICE\",\"policyScope\":\"resource=networkSlice;type=configuration\",\"policyName\":\"configuration.dcae.microservice.pm-mapper.xml\",\"policyVersion\":\"v0.0.1\",\"kpis\":[{\"measType\":\"AMFRegNbr\",\"operation\":\"SUM\",\"operands\":\"RM.RegisteredSubNbrMean\"}]},{\"eventName\":\"perf3gpp_AcmeNode-Acme_pmMeasResult\",\"controlLoopSchemaType\":\"SLICE\",\"policyScope\":\"resource=networkSlice;type=configuration\",\"policyName\":\"configuration.dcae.microservice.pm-mapper.xml\",\"policyVersion\":\"v0.0.1\",\"kpis\":[{\"measType\":\"UpstreamThr\",\"operation\":\"SUM\",\"operands\":\"GTP.InDataOctN3UPF\"},{\"measType\":\"DownstreamThr\",\"operation\":\"SUM\",\"operands\":\"GTP.OutDataOctN3UPF\"}]}]}",
+        "kpi.policy": "{\"domain\":\"measurementsForKpi\",\"methodForKpi\":[{\"eventName\":\"perf3gpp_CORE-AMF_pmMeasResult\",\"controlLoopSchemaType\":\"SLICE\",\"policyScope\":\"resource=networkSlice;type=configuration\",\"policyName\":\"configuration.dcae.microservice.pm-mapper.xml\",\"policyVersion\":\"v0.0.1\",\"kpis\":[{\"measType\":\"AMFRegNbr\",\"operation\":\"SUM\",\"operands\":[\"RM.RegisteredSubNbrMean\"]}]},{\"eventName\":\"perf3gpp_AcmeNode-Acme_pmMeasResult\",\"controlLoopSchemaType\":\"SLICE\",\"policyScope\":\"resource=networkSlice;type=configuration\",\"policyName\":\"configuration.dcae.microservice.pm-mapper.xml\",\"policyVersion\":\"v0.0.1\",\"kpis\":[{\"measType\":\"UpstreamThr\",\"operation\":\"SUM\",\"operands\":[\"GTP.InDataOctN3UPF\"]},{\"measType\":\"DownstreamThr\",\"operation\":\"SUM\",\"operands\":[\"GTP.OutDataOctN3UPF\"]}]}]}",
         "dmaap.server": ["message-router"]
     }
-}
\ No newline at end of file
+}
diff --git a/components/kpi-computation-ms/src/test/resources/kpi/cbs_config2.json b/components/kpi-computation-ms/src/test/resources/kpi/cbs_config2.json
index bb763db1..d69c89c4 100644
--- a/components/kpi-computation-ms/src/test/resources/kpi/cbs_config2.json
+++ b/components/kpi-computation-ms/src/test/resources/kpi/cbs_config2.json
@@ -32,7 +32,7 @@
             }
         },
         "aafPassword": "demo123456!",
-        "kpi.policy": "{\"domain\":\"measurementsForKpi\",\"methodForKpi\":[{\"eventName\":\"perf3gpp_CORE-AMF_pmMeasResult\",\"controlLoopSchemaType\":\"SLICE\",\"policyScope\":\"resource=networkSlice;type=configuration\",\"policyName\":\"configuration.dcae.microservice.pm-mapper.xml\",\"policyVersion\":\"v0.0.1\",\"kpis\":[{\"measType\":\"AMFRegNbr\",\"operation\":\"SUM\",\"operands\":\"RM.RegisteredSubNbrMean\"}]},{\"eventName\":\"perf3gpp_AcmeNode-Acme_pmMeasResult\",\"controlLoopSchemaType\":\"SLICE\",\"policyScope\":\"resource=networkSlice;type=configuration\",\"policyName\":\"configuration.dcae.microservice.pm-mapper.xml\",\"policyVersion\":\"v0.0.1\",\"kpis\":[{\"measType\":\"UpstreamThr\",\"operation\":\"SUM\",\"operands\":\"GTP.InDataOctN3UPF\"},{\"measType\":\"DownstreamThr\",\"operation\":\"SUM\",\"operands\":\"GTP.OutDataOctN3UPF\"}]}]}",
+        "kpi.policy": "{\"domain\":\"measurementsForKpi\",\"methodForKpi\":[{\"eventName\":\"perf3gpp_CORE-AMF_pmMeasResult\",\"controlLoopSchemaType\":\"SLICE\",\"policyScope\":\"resource=networkSlice;type=configuration\",\"policyName\":\"configuration.dcae.microservice.pm-mapper.xml\",\"policyVersion\":\"v0.0.1\",\"kpis\":[{\"measType\":\"AMFRegNbr\",\"operation\":\"SUM\",\"operands\":[\"RM.RegisteredSubNbrMean\"]}]},{\"eventName\":\"perf3gpp_AcmeNode-Acme_pmMeasResult\",\"controlLoopSchemaType\":\"SLICE\",\"policyScope\":\"resource=networkSlice;type=configuration\",\"policyName\":\"configuration.dcae.microservice.pm-mapper.xml\",\"policyVersion\":\"v0.0.1\",\"kpis\":[{\"measType\":\"RatioUpstreamDownStream\",\"operation\":\"RATIO\",\"operands\":[\"GTP.InDataOctN3UPF\",\"GTP.OutDataOctN3UPF\"]}]}]}",
         "dmaap.server": ["message-router"]
     }
-}
\ No newline at end of file
+}
diff --git a/components/kpi-computation-ms/src/test/resources/kpi/kpi_config.json b/components/kpi-computation-ms/src/test/resources/kpi/kpi_config.json
index 64e426cf..85487cb5 100644
--- a/components/kpi-computation-ms/src/test/resources/kpi/kpi_config.json
+++ b/components/kpi-computation-ms/src/test/resources/kpi/kpi_config.json
@@ -9,7 +9,7 @@
             "kpis": [{
                 "measType": "AMFRegNbr",
                 "operation": "SUM",
-                "operands": "RM.RegisteredSubNbrMean"
+                "operands": ["RM.RegisteredSubNbrMean"]
             }]
         },
         {
@@ -21,15 +21,15 @@
             "kpis": [{
                     "measType": "UpstreamThr",
                     "operation": "SUM",
-                    "operands": "GTP.InDataOctN3UPF"
+                    "operands": ["GTP.InDataOctN3UPF"]
 
                 },
                 {
                     "measType": "DownstreamThr",
                     "operation": "SUM",
-                    "operands": "GTP.OutDataOctN3UPF"
+                    "operands": ["GTP.OutDataOctN3UPF"]
                 }
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/components/kpi-computation-ms/src/test/resources/kpi/kpi_config_ratio.json b/components/kpi-computation-ms/src/test/resources/kpi/kpi_config_ratio.json
new file mode 100644
index 00000000..3f6828a9
--- /dev/null
+++ b/components/kpi-computation-ms/src/test/resources/kpi/kpi_config_ratio.json
@@ -0,0 +1,17 @@
+{
+    "domain": "measurementsForKpi",
+    "methodForKpi": [{
+            "eventName": "perf3gpp_AcmeNode-Acme_pmMeasResult",
+            "controlLoopSchemaType": "SLICE",
+            "policyScope": "resource=networkSlice;type=configuration",
+            "policyName": "configuration.dcae.microservice.pm-mapper.xml",
+            "policyVersion": "v0.0.1",
+            "kpis": [{
+                    "measType": "RatioUpstreamDownstream",
+                    "operation": "RATIO",
+                    "operands": ["GTP.InDataOctN3UPF","GTP.OutDataOctN3UPF"]
+                }
+            ]
+        }
+    ]
+}