commit 070b3653202d9db994834cbdc175044a80e8278a
author Mohamed Abukar <abukar.mohamed@nokia.com> Thu Oct 22 19:31:01 2020 +0300
committer Mohamed Abukar <abukar.mohamed@nokia.com> Thu Oct 22 23:04:17 2020 +0300
tree e6de39b13fa93e73cb8ebf1448e70092db1b7063
parent c2a5c58870dc4d520a9b7cfb516245f92f8ea9bf

Additions to measurements

Change-Id: Idba0234209e57ed02c93b8aa027f90c6c6d5ddfb
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>

test/xApp_config_test_output.json

diff --git a/test/xApp_config_test_output.json b/test/xApp_config_test_output.json
index c74bac9..204398b 100755
--- a/test/xApp_config_test_output.json
+++ b/test/xApp_config_test_output.json
@@ -126,24 +126,26 @@
             },
             "measurements": [
                 {
-                    "measId": "M9001",
-                    "object": "XAPP-xApp1",
+                    "moId": "SEP-12/XAPP-1",
+                    "measType": "X2",
+                    "measId": "9001",
+                    "measInterval": "60",
                     "metrics": [
                         {
-                            "description": "Example counter 1",
-                            "enabled": true,
                             "name": "App1ExampleCounterOne",
-                            "type": "counter",
                             "objectName": "App1ExampleCounterOneObject",
-                            "objectInstance": "App1ExampleCounterOneObjectInstance"
+                            "objectInstance": "App1ExampleCounterOneObjectInstance",
+                            "counterId": "0011",
+                            "type": "counter",
+                            "description": "Example counter 1"
                         },
                         {
-                            "description": "Example counter 2",
-                            "enabled": true,
                             "name": "App1ExampleCounterTwo",
-                            "type": "counter",
                             "objectName": "App1ExampleCounterTwoObject",
-                            "objectInstance": "App1ExampleCounterTwoObjectInstance"
+                            "objectInstance": "App1ExampleCounterTwoObjectInstance",
+                            "counterId": "0012",
+                            "type": "counter",
+                            "description": "Example counter 2"
                         }
                     ]
                 }
@@ -277,24 +279,26 @@
             },
             "measurements": [
                 {
-                    "measId": "M9001",
-                    "object": "XAPP-xApp2",
+                    "moId": "SEP-12/XAPP-2",
+                    "measType": "X2",
+                    "measId": "9002",
+                    "measInterval": "60",
                     "metrics": [
                         {
-                            "description": "Example counter",
-                            "enabled": true,
                             "name": "App2ExampleCounterOne",
-                            "type": "counter",
                             "objectName": "App2ExampleCounterOneObject",
-                            "objectInstance": "App2ExampleCounterOneObjectInstance"
+                            "objectInstance": "App2ExampleCounterOneObjectInstance",
+                            "counterId": "0021",
+                            "type": "counter",
+                            "description": "Example counter 1"
                         },
                         {
-                            "description": "Another example counter",
-                            "enabled": true,
                             "name": "App2ExampleCounterTwo",
-                            "type": "counter",
                             "objectName": "App2ExampleCounterTwoObject",
-                            "objectInstance": "App2ExampleCounterTwoObjectInstance"
+                            "objectInstance": "App2ExampleCounterTwoObjectInstance",
+                            "counterId": "0022",
+                            "type": "counter",
+                            "description": "Example counter 2"
                         }
                     ]
                 }