X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2FxApp_config_test_output.json;h=663e7b3fa65f360f2839717fe29f9b0af4c1eb45;hb=refs%2Fchanges%2F51%2F7051%2F1;hp=fccda3f75ca4fc1709babba7292a3a7992ab1ade;hpb=412df96a23a30a82d2a031556888aeaf9604ada8;p=ric-plt%2Fvespamgr.git

diff --git a/test/xApp_config_test_output.json b/test/xApp_config_test_output.json
old mode 100644
new mode 100755
index fccda3f..663e7b3
--- a/test/xApp_config_test_output.json
+++ b/test/xApp_config_test_output.json
@@ -1,122 +1,7 @@
 [
     {
-        "metadata": {
-            "name": "xApp1",
-            "configName": "xApp1-appconfig",
-            "namespace": "default"
-        },
-        "descriptor": {
-            "$id": "http://example.com/root.json",
-            "$schema": "http://json-schema.org/draft-07/schema#",
-            "definitions": {
-
-            },
-            "properties": {
-                "local": {
-                    "$id": "#/properties/local",
-                    "properties": {
-                        "host": {
-                            "$id": "#/properties/local/properties/host",
-                            "default": "",
-                            "examples": [
-                                ":8080"
-                            ],
-                            "pattern": "^(.*)$",
-                            "title": "The Host Schema",
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "host"
-                    ],
-                    "title": "The Local Schema",
-                    "type": "object"
-                },
-                "logger": {
-                    "$id": "#/properties/logger",
-                    "properties": {
-                        "level": {
-                            "$id": "#/properties/logger/properties/level",
-                            "default": 0,
-                            "examples": [
-                                3
-                            ],
-                            "title": "The Level Schema",
-                            "type": "integer"
-                        }
-                    },
-                    "required": [
-                        "level"
-                    ],
-                    "title": "The Logger Schema",
-                    "type": "object"
-                },
-                "metrics": {
-                    "$id": "#/properties/metrics",
-                    "items": {
-                        "$id": "#/properties/metrics/items",
-                        "properties": {
-                            "description": {
-                                "$id": "#/properties/metrics/items/properties/description",
-                                "default": "",
-                                "examples": [
-                                    "Example counter 1"
-                                ],
-                                "pattern": "^(.*)$",
-                                "title": "The Description Schema",
-                                "type": "string"
-                            },
-                            "enabled": {
-                                "$id": "#/properties/metrics/items/properties/enabled",
-                                "default": false,
-                                "examples": [
-                                    true
-                                ],
-                                "title": "The Enabled Schema",
-                                "type": "boolean"
-                            },
-                            "name": {
-                                "$id": "#/properties/metrics/items/properties/name",
-                                "default": "",
-                                "examples": [
-                                    "App1ExampleCounterOne"
-                                ],
-                                "pattern": "^(.*)$",
-                                "title": "The Name Schema",
-                                "type": "string"
-                            },
-                            "type": {
-                                "$id": "#/properties/metrics/items/properties/type",
-                                "default": "",
-                                "examples": [
-                                    "counter"
-                                ],
-                                "pattern": "^(.*)$",
-                                "title": "The Type Schema",
-                                "type": "string"
-                            }
-                        },
-                        "required": [
-                            "name",
-                            "type",
-                            "enabled",
-                            "description"
-                        ],
-                        "title": "The Items Schema",
-                        "type": "object"
-                    },
-                    "title": "The Metrics Schema",
-                    "type": "array"
-                }
-            },
-            "required": [
-                "local",
-                "logger",
-                "metrics"
-            ],
-            "title": "ANR Descriptor Schema",
-            "type": "object"
-        },
+        "metadata": { },
+        "descriptor": { },
         "config": {
             "local": {
                 "host": ":8080"
@@ -124,144 +9,37 @@
             "logger": {
                 "level": 5
             },
-            "metrics": [
-                {
-                    "description": "Example counter 1",
-                    "enabled": true,
-                    "name": "App1ExampleCounterOne",
-                    "type": "counter",
-                    "objectName": "App1ExampleCounterOneObject",
-                    "objectInstance": "App1ExampleCounterOneObjectInstance"
-                },
+            "measurements": [
                 {
-                    "description": "Example counter 2",
-                    "enabled": true,
-                    "name": "App1ExampleCounterTwo",
-                    "type": "counter",
-                    "objectName": "App1ExampleCounterTwoObject",
-                    "objectInstance": "App1ExampleCounterTwoObjectInstance"
+                    "moId": "SEP-12/XAPP-1",
+                    "measType": "X2",
+                    "measId": "9001",
+                    "measInterval": "60",
+                    "metrics": [
+                        {
+                            "name": "App1ExampleCounterOne",
+                            "objectName": "App1ExampleCounterOneObject",
+                            "objectInstance": "App1ExampleCounterOneObjectInstance",
+                            "counterId": "0011",
+                            "type": "counter",
+                            "description": "Example counter 1"
+                        },
+                        {
+                            "name": "App1ExampleCounterTwo",
+                            "objectName": "App1ExampleCounterTwoObject",
+                            "objectInstance": "App1ExampleCounterTwoObjectInstance",
+                            "counterId": "0012",
+                            "type": "counter",
+                            "description": "Example counter 2"
+                        }
+                    ]
                 }
             ]
         }
     },
     {
-        "metadata": {
-            "name": "xApp2",
-            "configName": "xApp2-appconfig",
-            "namespace": "default"
-        },
-        "descriptor": {
-            "$id": "http://example.com/root.json",
-            "$schema": "http://json-schema.org/draft-07/schema#",
-            "definitions": {
-
-            },
-            "properties": {
-                "local": {
-                    "$id": "#/properties/local",
-                    "properties": {
-                        "host": {
-                            "$id": "#/properties/local/properties/host",
-                            "default": "",
-                            "examples": [
-                                ":8080"
-                            ],
-                            "pattern": "^(.*)$",
-                            "title": "The Host Schema",
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "host"
-                    ],
-                    "title": "The Local Schema",
-                    "type": "object"
-                },
-                "logger": {
-                    "$id": "#/properties/logger",
-                    "properties": {
-                        "level": {
-                            "$id": "#/properties/logger/properties/level",
-                            "default": 0,
-                            "examples": [
-                                3
-                            ],
-                            "title": "The Level Schema",
-                            "type": "integer"
-                        }
-                    },
-                    "required": [
-                        "level"
-                    ],
-                    "title": "The Logger Schema",
-                    "type": "object"
-                },
-                "metrics": {
-                    "$id": "#/properties/metrics",
-                    "items": {
-                        "$id": "#/properties/metrics/items",
-                        "properties": {
-                            "description": {
-                                "$id": "#/properties/metrics/items/properties/description",
-                                "default": "",
-                                "examples": [
-                                    ""
-                                ],
-                                "pattern": "^(.*)$",
-                                "title": "The Description Schema",
-                                "type": "string"
-                            },
-                            "enabled": {
-                                "$id": "#/properties/metrics/items/properties/enabled",
-                                "default": false,
-                                "examples": [
-                                    true
-                                ],
-                                "title": "The Enabled Schema",
-                                "type": "boolean"
-                            },
-                            "name": {
-                                "$id": "#/properties/metrics/items/properties/name",
-                                "default": "",
-                                "examples": [
-                                    "UEContextCreated"
-                                ],
-                                "pattern": "^(.*)$",
-                                "title": "The Name Schema",
-                                "type": "string"
-                            },
-                            "type": {
-                                "$id": "#/properties/metrics/items/properties/type",
-                                "default": "",
-                                "examples": [
-                                    "counter"
-                                ],
-                                "pattern": "^(.*)$",
-                                "title": "The Type Schema",
-                                "type": "string"
-                            }
-                        },
-                        "required": [
-                            "name",
-                            "type",
-                            "enabled",
-                            "description"
-                        ],
-                        "title": "The Items Schema",
-                        "type": "object"
-                    },
-                    "title": "The Metrics Schema",
-                    "type": "array"
-                }
-            },
-            "required": [
-                "local",
-                "logger",
-                "metrics"
-            ],
-            "title": "The Root Schema",
-            "type": "object"
-        },
+        "metadata": {},
+        "descriptor": {},
         "config": {
             "local": {
                 "host": ":8080"
@@ -269,22 +47,30 @@
             "logger": {
                 "level": 3
             },
-            "metrics": [
-                {
-                    "description": "Example counter",
-                    "enabled": true,
-                    "name": "App2ExampleCounterOne",
-                    "type": "counter",
-                    "objectName": "App2ExampleCounterOneObject",
-                    "objectInstance": "App2ExampleCounterOneObjectInstance"
-                },
+            "measurements": [
                 {
-                    "description": "Another example counter",
-                    "enabled": true,
-                    "name": "App2ExampleCounterTwo",
-                    "type": "counter",
-                    "objectName": "App2ExampleCounterTwoObject",
-                    "objectInstance": "App2ExampleCounterTwoObjectInstance"
+                    "moId": "SEP-12/XAPP-2",
+                    "measType": "X2",
+                    "measId": "9002",
+                    "measInterval": "60",
+                    "metrics": [
+                        {
+                            "name": "App2ExampleCounterOne",
+                            "objectName": "App2ExampleCounterOneObject",
+                            "objectInstance": "App2ExampleCounterOneObjectInstance",
+                            "counterId": "0021",
+                            "type": "counter",
+                            "description": "Example counter 1"
+                        },
+                        {
+                            "name": "App2ExampleCounterTwo",
+                            "objectName": "App2ExampleCounterTwoObject",
+                            "objectInstance": "App2ExampleCounterTwoObjectInstance",
+                            "counterId": "0022",
+                            "type": "counter",
+                            "description": "Example counter 2"
+                        }
+                    ]
                 }
             ]
         }