Fix policy type json files as per new model

As per updated model, policy type & data type are represented as Map
directly instead of List of Map earlier. Updating the json files to
adapt to this change.

Issue-ID: POLICY-2047
Change-Id: Id46b6d20f3c1cb727909b0825066e4763120e46a
Signed-off-by: ramverma <ram.krishna.verma@est.tech>

3 files changed, 635 insertions, 673 deletions

diff --git a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.json b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.json
index 8795b132..810d970d 100644
--- a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.json
+++ b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.json
@@ -1,284 +1,266 @@
 {
   "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
-  "policy_types": [
-    {
-      "onap.policies.controlloop.operational.Apex": {
-        "version": "1.0.0",
-        "description": "Operational Policy for Control Loops using the APEX PDP",
-        "properties": {
-          "engine_service": {
-            "type": "onap.datatypes.policies.controlloop.operational.apex.EngineService",
-            "description": "APEX Engine Service Parameters"
-          },
-          "inputs": {
-            "type": "map",
-            "description": "Inputs for handling events coming into the APEX engine",
-            "entry_schema": {
-              "type": "onap.datatypes.policies.controlloop.operational.apex.EventHandler"
-            }
-          },
-          "outputs": {
-            "type": "map",
-            "description": "Outputs for handling events going out of the APEX engine",
-            "entry_schema": {
-              "type": "onap.datatypes.policies.controlloop.operational.apex.EventHandler"
-            }
-          },
-          "environment": {
-            "type": "list",
-            "description": "Envioronmental parameters for the APEX engine",
-            "entry_schema": {
-              "type": "onap.datatypes.policies.controlloop.operational.apex.Environment"
-            }
+  "policy_types": {
+    "onap.policies.controlloop.operational.Apex": {
+      "version": "1.0.0",
+      "description": "Operational Policy for Control Loops using the APEX PDP",
+      "properties": {
+        "engine_service": {
+          "type": "onap.datatypes.policies.controlloop.operational.apex.EngineService",
+          "description": "APEX Engine Service Parameters"
+        },
+        "inputs": {
+          "type": "map",
+          "description": "Inputs for handling events coming into the APEX engine",
+          "entry_schema": {
+            "type": "onap.datatypes.policies.controlloop.operational.apex.EventHandler"
+          }
+        },
+        "outputs": {
+          "type": "map",
+          "description": "Outputs for handling events going out of the APEX engine",
+          "entry_schema": {
+            "type": "onap.datatypes.policies.controlloop.operational.apex.EventHandler"
+          }
+        },
+        "environment": {
+          "type": "list",
+          "description": "Envioronmental parameters for the APEX engine",
+          "entry_schema": {
+            "type": "onap.datatypes.policies.controlloop.operational.apex.Environment"
           }
         }
       }
     }
-  ],
-  "data_types": [
-    {
-      "onap.datatypes.policies.controlloop.operational.apex.EngineService": {
-        "derived_from": "tosca.datatypes.Root",
-        "properties": {
-          "name": {
-            "type": "string",
-            "description": "Specifies the engine name",
-            "required": false,
-            "default": "ApexEngineService"
-          },
-          "version": {
-            "type": "string",
-            "description": "Specifies the engine version in double dotted format",
-            "required": false,
-            "default": "1.0.0"
-          },
-          "id": {
-            "type": "int",
-            "description": "Specifies the engine id",
-            "required": true
-          },
-          "instance_count": {
-            "type": "int",
-            "description": "Specifies the number of engine threads that should be run",
-            "required": true
-          },
-          "deployment_port": {
-            "type": "int",
-            "description": "Specifies the port to connect to for engine administration",
-            "required": false,
-            "default": 1
-          },
-          "policy_model_file_name": {
-            "type": "string",
-            "description": "The name of the file from which to read the APEX policy model",
-            "required": false,
-            "default": ""
-          },
-          "policy_type_impl": {
-            "type": "string",
-            "description": "The policy type implementation from which to read the APEX policy model",
-            "required": false,
-            "default": ""
-          },
-          "periodic_event_period": {
-            "type": "string",
-            "description": "The time interval in milliseconds for the periodic scanning event, 0 means \"don't scan\"",
-            "required": false,
-            "default": 0
-          },
-          "engine": {
-            "type": "onap.datatypes.policies.controlloop.operational.apex.engineservice.Engine",
-            "description": "The parameters for all engines in the APEX engine service",
-            "required": true
-          }
+  },
+  "data_types": {
+    "onap.datatypes.policies.controlloop.operational.apex.EngineService": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Specifies the engine name",
+          "required": false,
+          "default": "ApexEngineService"
+        },
+        "version": {
+          "type": "string",
+          "description": "Specifies the engine version in double dotted format",
+          "required": false,
+          "default": "1.0.0"
+        },
+        "id": {
+          "type": "int",
+          "description": "Specifies the engine id",
+          "required": true
+        },
+        "instance_count": {
+          "type": "int",
+          "description": "Specifies the number of engine threads that should be run",
+          "required": true
+        },
+        "deployment_port": {
+          "type": "int",
+          "description": "Specifies the port to connect to for engine administration",
+          "required": false,
+          "default": 1
+        },
+        "policy_model_file_name": {
+          "type": "string",
+          "description": "The name of the file from which to read the APEX policy model",
+          "required": false,
+          "default": ""
+        },
+        "policy_type_impl": {
+          "type": "string",
+          "description": "The policy type implementation from which to read the APEX policy model",
+          "required": false,
+          "default": ""
+        },
+        "periodic_event_period": {
+          "type": "string",
+          "description": "The time interval in milliseconds for the periodic scanning event, 0 means \"don't scan\"",
+          "required": false,
+          "default": 0
+        },
+        "engine": {
+          "type": "onap.datatypes.policies.controlloop.operational.apex.engineservice.Engine",
+          "description": "The parameters for all engines in the APEX engine service",
+          "required": true
         }
       }
     },
-    {
-      "onap.datatypes.policies.controlloop.operational.apex.EventHandler": {
-        "derived_from": "tosca.datatypes.Root",
-        "properties": {
-          "name": {
-            "type": "string",
-            "description": "Specifies the event handler name, if not specified this is set to the key name",
-            "required": false
-          },
-          "carrier_technology": {
-            "type": "onap.datatypes.policies.controlloop.operational.apex.CarrierTechnology",
-            "description": "Specifies the carrier technology of the event handler (such as REST/Web Socket/Kafka)",
-            "required": true
-          },
-          "event_protocol": {
-            "type": "onap.datatypes.policies.controlloop.operational.apex.EventProtocol",
-            "description": "Specifies the event protocol of events for the event handler (such as Yaml/JSON/XML/POJO)",
-            "required": true
-          },
-          "event_name": {
-            "type": "string",
-            "description": "Specifies the event name for events on this event handler, if not specified, the event name is read from or written to the event being received or sent",
-            "required": false
-          },
-          "event_name_filter": {
-            "type": "string",
-            "description": "Specifies a filter as a regular expression, events that do not match the filter are dropped, the default is to let all events through",
-            "required": false
-          },
-          "synchronous_mode": {
-            "type": "bool",
-            "description": "Specifies the event handler is syncronous (receive event and send response)",
-            "required": false,
-            "default": false
-          },
-          "synchronous_peer": {
-            "type": "string",
-            "description": "The peer event handler (output for input or input for output) of this event handler in synchronous mode, this parameter is mandatory if the event handler is in synchronous mode",
-            "required": false,
-            "default": ""
-          },
-          "synchronous_timeout": {
-            "type": "int",
-            "description": "The timeout in milliseconds for responses to be issued by APEX torequests, this parameter is mandatory if the event handler is in synchronous mode",
-            "required": false,
-            "default": ""
-          },
-          "requestor_mode": {
-            "type": "bool",
-            "description": "Specifies the event handler is in requestor mode (send event and wait for response mode)",
-            "required": false,
-            "default": false
-          },
-          "requestor_peer": {
-            "type": "string",
-            "description": "The peer event handler (output for input or input for output) of this event handler in requestor mode, this parameter is mandatory if the event handler is in requestor mode",
-            "required": false,
-            "default": ""
-          },
-          "requestor_timeout": {
-            "type": "int",
-            "description": "The timeout in milliseconds for wait for responses to requests, this parameter is mandatory if the event handler is in requestor mode",
-            "required": false,
-            "default": ""
-          }
+    "onap.datatypes.policies.controlloop.operational.apex.EventHandler": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Specifies the event handler name, if not specified this is set to the key name",
+          "required": false
+        },
+        "carrier_technology": {
+          "type": "onap.datatypes.policies.controlloop.operational.apex.CarrierTechnology",
+          "description": "Specifies the carrier technology of the event handler (such as REST/Web Socket/Kafka)",
+          "required": true
+        },
+        "event_protocol": {
+          "type": "onap.datatypes.policies.controlloop.operational.apex.EventProtocol",
+          "description": "Specifies the event protocol of events for the event handler (such as Yaml/JSON/XML/POJO)",
+          "required": true
+        },
+        "event_name": {
+          "type": "string",
+          "description": "Specifies the event name for events on this event handler, if not specified, the event name is read from or written to the event being received or sent",
+          "required": false
+        },
+        "event_name_filter": {
+          "type": "string",
+          "description": "Specifies a filter as a regular expression, events that do not match the filter are dropped, the default is to let all events through",
+          "required": false
+        },
+        "synchronous_mode": {
+          "type": "bool",
+          "description": "Specifies the event handler is syncronous (receive event and send response)",
+          "required": false,
+          "default": false
+        },
+        "synchronous_peer": {
+          "type": "string",
+          "description": "The peer event handler (output for input or input for output) of this event handler in synchronous mode, this parameter is mandatory if the event handler is in synchronous mode",
+          "required": false,
+          "default": ""
+        },
+        "synchronous_timeout": {
+          "type": "int",
+          "description": "The timeout in milliseconds for responses to be issued by APEX torequests, this parameter is mandatory if the event handler is in synchronous mode",
+          "required": false,
+          "default": ""
+        },
+        "requestor_mode": {
+          "type": "bool",
+          "description": "Specifies the event handler is in requestor mode (send event and wait for response mode)",
+          "required": false,
+          "default": false
+        },
+        "requestor_peer": {
+          "type": "string",
+          "description": "The peer event handler (output for input or input for output) of this event handler in requestor mode, this parameter is mandatory if the event handler is in requestor mode",
+          "required": false,
+          "default": ""
+        },
+        "requestor_timeout": {
+          "type": "int",
+          "description": "The timeout in milliseconds for wait for responses to requests, this parameter is mandatory if the event handler is in requestor mode",
+          "required": false,
+          "default": ""
         }
       }
     },
-    {
-      "onap.datatypes.policies.controlloop.operational.apex.CarrierTechnology": {
-        "derived_from": "tosca.datatypes.Root",
-        "properties": {
-          "label": {
-            "type": "string",
-            "description": "The label (name) of the carrier technology (such as REST, Kafka, WebSocket)",
-            "required": true
-          },
-          "plugin_parameter_class_name": {
-            "type": "string",
-            "description": "The class name of the class that overrides default handling of event input or output for this carrier technology, defaults to the supplied input or output class",
-            "required": false
-          }
+    "onap.datatypes.policies.controlloop.operational.apex.CarrierTechnology": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "label": {
+          "type": "string",
+          "description": "The label (name) of the carrier technology (such as REST, Kafka, WebSocket)",
+          "required": true
+        },
+        "plugin_parameter_class_name": {
+          "type": "string",
+          "description": "The class name of the class that overrides default handling of event input or output for this carrier technology, defaults to the supplied input or output class",
+          "required": false
         }
       }
     },
-    {
-      "onap.datatypes.policies.controlloop.operational.apex.EventProtocol": {
-        "derived_from": "tosca.datatypes.Root",
-        "properties": {
-          "label": {
-            "type": "string",
-            "description": "The label (name) of the event protocol (such as Yaml, JSON, XML, or POJO)",
-            "required": true
-          },
-          "event_protocol_plugin_class": {
-            "type": "string",
-            "description": "The class name of the class that overrides default handling of the event protocol for this carrier technology, defaults to the supplied event protocol class",
-            "required": false
-          }
+    "onap.datatypes.policies.controlloop.operational.apex.EventProtocol": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "label": {
+          "type": "string",
+          "description": "The label (name) of the event protocol (such as Yaml, JSON, XML, or POJO)",
+          "required": true
+        },
+        "event_protocol_plugin_class": {
+          "type": "string",
+          "description": "The class name of the class that overrides default handling of the event protocol for this carrier technology, defaults to the supplied event protocol class",
+          "required": false
         }
       }
     },
-    {
-      "onap.datatypes.policies.controlloop.operational.apex.Environmental": {
-        "derived_from": "tosca.datatypes.Root",
-        "properties": {
-          "name": {
-            "type": "string",
-            "description": "The name of the environment variable",
-            "required": true
-          },
-          "value": {
-            "type": "string",
-            "description": "The value of the environment variable",
-            "required": true
-          }
+    "onap.datatypes.policies.controlloop.operational.apex.Environmental": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of the environment variable",
+          "required": true
+        },
+        "value": {
+          "type": "string",
+          "description": "The value of the environment variable",
+          "required": true
         }
       }
     },
-    {
-      "onap.datatypes.policies.controlloop.operational.apex.engineservice.Engine": {
-        "derived_from": "tosca.datatypes.Root",
-        "properties": {
-          "context": {
-            "type": "onap.datatypes.policies.controlloop.operational.apex.engineservice.engine.Context",
-            "description": "The properties for handling context in APEX engines, defaults to using Java maps for context",
-            "required": false
-          },
-          "executors": {
-            "type": "map",
-            "description": "The plugins for policy executors used in engines such as javascript, MVEL, Jython",
-            "required": true,
-            "entry_schema": {
-              "description": "The plugin class path for this policy executor",
-              "type": "string"
-            }
+    "onap.datatypes.policies.controlloop.operational.apex.engineservice.Engine": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "context": {
+          "type": "onap.datatypes.policies.controlloop.operational.apex.engineservice.engine.Context",
+          "description": "The properties for handling context in APEX engines, defaults to using Java maps for context",
+          "required": false
+        },
+        "executors": {
+          "type": "map",
+          "description": "The plugins for policy executors used in engines such as javascript, MVEL, Jython",
+          "required": true,
+          "entry_schema": {
+            "description": "The plugin class path for this policy executor",
+            "type": "string"
           }
         }
       }
     },
-    {
-      "onap.datatypes.policies.controlloop.operational.apex.engineservice.engine.Context": {
-        "derived_from": "tosca.datatypes.Root",
-        "properties": {
-          "distributor": {
-            "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin",
-            "description": "The plugin to be used for distributing context between APEX PDPs at runtime",
-            "required": false
-          },
-          "schemas": {
-            "type": "map",
-            "description": "The plugins for context schemas available in APEX PDPs such as Java and Avro",
-            "required": false,
-            "entry_schema": {
-              "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin"
-            }
-          },
-          "locking": {
-            "type": "onap.datatypes.policies.controlloop.operational.apex.plugin",
-            "description": "The plugin to be used for locking context in and between APEX PDPs at runtime",
-            "required": false
-          },
-          "persistence": {
-            "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin",
-            "description": "The plugin to be used for persisting context for APEX PDPs at runtime",
-            "required": false
+    "onap.datatypes.policies.controlloop.operational.apex.engineservice.engine.Context": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "distributor": {
+          "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin",
+          "description": "The plugin to be used for distributing context between APEX PDPs at runtime",
+          "required": false
+        },
+        "schemas": {
+          "type": "map",
+          "description": "The plugins for context schemas available in APEX PDPs such as Java and Avro",
+          "required": false,
+          "entry_schema": {
+            "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin"
           }
+        },
+        "locking": {
+          "type": "onap.datatypes.policies.controlloop.operational.apex.plugin",
+          "description": "The plugin to be used for locking context in and between APEX PDPs at runtime",
+          "required": false
+        },
+        "persistence": {
+          "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin",
+          "description": "The plugin to be used for persisting context for APEX PDPs at runtime",
+          "required": false
         }
       }
     },
-    {
-      "onap.datatypes.policies.controlloop.operational.apex.Plugin": {
-        "derived_from": "tosca.datatypes.Root",
-        "properties": {
-          "name": {
-            "type": "string",
-            "description": "The name of the executor such as Javascript, Jython or MVEL",
-            "required": true
-          },
-          "plugin_class_name": {
-            "type": "string",
-            "description": "The class path of the plugin class for this executor"
-          }
+    "onap.datatypes.policies.controlloop.operational.apex.Plugin": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of the executor such as Javascript, Jython or MVEL",
+          "required": true
+        },
+        "plugin_class_name": {
+          "type": "string",
+          "description": "The class path of the plugin class for this executor"
         }
       }
     }
-  ]
+  }
 }
\ No newline at end of file
diff --git a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.json b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.json
index 1d1a4d64..f06247d7 100644
--- a/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.json
+++ b/tests/policy/api/data/onap.policy.monitoring.cdap.tca.hi.lo.app.json
@@ -1,223 +1,213 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
-    "policy_types": [
-        {
-            "onap.policies.Monitoring": {
-                "derived_from": "tosca.policies.Root",
-                "description": "a base policy type for all policies that governs monitoring provisioning"
+  "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+  "policy_types": {
+    "onap.policies.Monitoring": {
+      "derived_from": "tosca.policies.Root",
+      "description": "a base policy type for all policies that governs monitoring provisioning"
+    },
+    "onap.policies.monitoring.cdap.tca.hi.lo.app": {
+      "derived_from": "onap.policies.Monitoring",
+      "version": "1.0.0",
+      "properties": {
+        "tca_policy": {
+          "type": "map",
+          "description": "TCA Policy JSON",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.tca_policy"
+          }
+        }
+      }
+    }
+  },
+  "data_types": {
+    "onap.datatypes.monitoring.metricsPerEventName": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "controlLoopSchemaType": {
+          "type": "string",
+          "required": true,
+          "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
+          "constraints": [
+            {
+              "valid_values": [
+                "VM",
+                "VNF"
+              ]
             }
+          ]
+        },
+        "eventName": {
+          "type": "string",
+          "required": true,
+          "description": "Event name to which thresholds need to be applied"
+        },
+        "policyName": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope Name"
         },
-        {
-            "onap.policies.monitoring.cdap.tca.hi.lo.app": {
-                "derived_from": "onap.policies.Monitoring",
-                "version": "1.0.0",
-                "properties": {
-                    "tca_policy": {
-                        "type": "map",
-                        "description": "TCA Policy JSON",
-                        "entry_schema": {
-                            "type": "onap.datatypes.monitoring.tca_policy"
-                        }
-                    }
-                }
+        "policyScope": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope"
+        },
+        "policyVersion": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope Version"
+        },
+        "thresholds": {
+          "type": "list",
+          "required": true,
+          "description": "Thresholds associated with eventName",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.thresholds"
+          }
+        }
+      }
+    },
+    "onap.datatypes.monitoring.tca_policy": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "domain": {
+          "type": "string",
+          "required": true,
+          "description": "Domain name to which TCA needs to be applied",
+          "default": "measurementsForVfScaling",
+          "constraints": [
+            {
+              "equal": "measurementsForVfScaling"
             }
+          ]
+        },
+        "metricsPerEventName": {
+          "type": "list",
+          "required": true,
+          "description": "Contains eventName and threshold details that need to be applied to given eventName",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.metricsPerEventName"
+          }
         }
-    ],
-    "data_types": [
-        {
-            "onap.datatypes.monitoring.metricsPerEventName": {
-                "derived_from": "tosca.datatypes.Root",
-                "properties": {
-                    "controlLoopSchemaType": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "VM",
-                                    "VNF"
-                                ]
-                            }
-                        ]
-                    },
-                    "eventName": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Event name to which thresholds need to be applied"
-                    },
-                    "policyName": {
-                        "type": "string",
-                        "required": true,
-                        "description": "TCA Policy Scope Name"
-                    },
-                    "policyScope": {
-                        "type": "string",
-                        "required": true,
-                        "description": "TCA Policy Scope"
-                    },
-                    "policyVersion": {
-                        "type": "string",
-                        "required": true,
-                        "description": "TCA Policy Scope Version"
-                    },
-                    "thresholds": {
-                        "type": "list",
-                        "required": true,
-                        "description": "Thresholds associated with eventName",
-                        "entry_schema": {
-                            "type": "onap.datatypes.monitoring.thresholds"
-                        }
-                    }
-                }
+      }
+    },
+    "onap.datatypes.monitoring.thresholds": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "closedLoopControlName": {
+          "type": "string",
+          "required": true,
+          "description": "Closed Loop Control Name associated with the threshold"
+        },
+        "closedLoopEventStatus": {
+          "type": "string",
+          "required": true,
+          "description": "Closed Loop Event Status of the threshold",
+          "constraints": [
+            {
+              "valid_values": [
+                "ONSET",
+                "ABATED"
+              ]
+            }
+          ]
+        },
+        "direction": {
+          "type": "string",
+          "required": true,
+          "description": "Direction of the threshold",
+          "constraints": [
+            {
+              "valid_values": [
+                "LESS",
+                "LESS_OR_EQUAL",
+                "GREATER",
+                "GREATER_OR_EQUAL",
+                "EQUAL"
+              ]
             }
+          ]
         },
-        {
-            "onap.datatypes.monitoring.tca_policy": {
-                "derived_from": "tosca.datatypes.Root",
-                "properties": {
-                    "domain": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Domain name to which TCA needs to be applied",
-                        "default": "measurementsForVfScaling",
-                        "constraints": [
-                            {
-                                "equal": "measurementsForVfScaling"
-                            }
-                        ]
-                    },
-                    "metricsPerEventName": {
-                        "type": "list",
-                        "required": true,
-                        "description": "Contains eventName and threshold details that need to be applied to given eventName",
-                        "entry_schema": {
-                            "type": "onap.datatypes.monitoring.metricsPerEventName"
-                        }
-                    }
-                }
+        "fieldPath": {
+          "type": "string",
+          "required": true,
+          "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
+          "constraints": [
+            {
+              "valid_values": [
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
+                "$.event.measurementsForVfScalingFields.meanRequestLatency",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
+                "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
+              ]
             }
+          ]
         },
-        {
-            "onap.datatypes.monitoring.thresholds": {
-                "derived_from": "tosca.datatypes.Root",
-                "properties": {
-                    "closedLoopControlName": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Closed Loop Control Name associated with the threshold"
-                    },
-                    "closedLoopEventStatus": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Closed Loop Event Status of the threshold",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "ONSET",
-                                    "ABATED"
-                                ]
-                            }
-                        ]
-                    },
-                    "direction": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Direction of the threshold",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "LESS",
-                                    "LESS_OR_EQUAL",
-                                    "GREATER",
-                                    "GREATER_OR_EQUAL",
-                                    "EQUAL"
-                                ]
-                            }
-                        ]
-                    },
-                    "fieldPath": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                                    "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                                    "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                                ]
-                            }
-                        ]
-                    },
-                    "severity": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Threshold Event Severity",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "CRITICAL",
-                                    "MAJOR",
-                                    "MINOR",
-                                    "WARNING",
-                                    "NORMAL"
-                                ]
-                            }
-                        ]
-                    },
-                    "thresholdValue": {
-                        "type": "integer",
-                        "required": true,
-                        "description": "Threshold value for the field Path inside CEF message"
-                    },
-                    "version": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Version number associated with the threshold"
-                    }
-                }
+        "severity": {
+          "type": "string",
+          "required": true,
+          "description": "Threshold Event Severity",
+          "constraints": [
+            {
+              "valid_values": [
+                "CRITICAL",
+                "MAJOR",
+                "MINOR",
+                "WARNING",
+                "NORMAL"
+              ]
             }
+          ]
+        },
+        "thresholdValue": {
+          "type": "integer",
+          "required": true,
+          "description": "Threshold value for the field Path inside CEF message"
+        },
+        "version": {
+          "type": "string",
+          "required": true,
+          "description": "Version number associated with the threshold"
         }
-    ]
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/tests/policy/xacml-pdp/data/onap.policies.monitoring.cdap.tca.hi.lo.app.json b/tests/policy/xacml-pdp/data/onap.policies.monitoring.cdap.tca.hi.lo.app.json
index 1d1a4d64..f06247d7 100644
--- a/tests/policy/xacml-pdp/data/onap.policies.monitoring.cdap.tca.hi.lo.app.json
+++ b/tests/policy/xacml-pdp/data/onap.policies.monitoring.cdap.tca.hi.lo.app.json
@@ -1,223 +1,213 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
-    "policy_types": [
-        {
-            "onap.policies.Monitoring": {
-                "derived_from": "tosca.policies.Root",
-                "description": "a base policy type for all policies that governs monitoring provisioning"
+  "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+  "policy_types": {
+    "onap.policies.Monitoring": {
+      "derived_from": "tosca.policies.Root",
+      "description": "a base policy type for all policies that governs monitoring provisioning"
+    },
+    "onap.policies.monitoring.cdap.tca.hi.lo.app": {
+      "derived_from": "onap.policies.Monitoring",
+      "version": "1.0.0",
+      "properties": {
+        "tca_policy": {
+          "type": "map",
+          "description": "TCA Policy JSON",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.tca_policy"
+          }
+        }
+      }
+    }
+  },
+  "data_types": {
+    "onap.datatypes.monitoring.metricsPerEventName": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "controlLoopSchemaType": {
+          "type": "string",
+          "required": true,
+          "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
+          "constraints": [
+            {
+              "valid_values": [
+                "VM",
+                "VNF"
+              ]
             }
+          ]
+        },
+        "eventName": {
+          "type": "string",
+          "required": true,
+          "description": "Event name to which thresholds need to be applied"
+        },
+        "policyName": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope Name"
         },
-        {
-            "onap.policies.monitoring.cdap.tca.hi.lo.app": {
-                "derived_from": "onap.policies.Monitoring",
-                "version": "1.0.0",
-                "properties": {
-                    "tca_policy": {
-                        "type": "map",
-                        "description": "TCA Policy JSON",
-                        "entry_schema": {
-                            "type": "onap.datatypes.monitoring.tca_policy"
-                        }
-                    }
-                }
+        "policyScope": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope"
+        },
+        "policyVersion": {
+          "type": "string",
+          "required": true,
+          "description": "TCA Policy Scope Version"
+        },
+        "thresholds": {
+          "type": "list",
+          "required": true,
+          "description": "Thresholds associated with eventName",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.thresholds"
+          }
+        }
+      }
+    },
+    "onap.datatypes.monitoring.tca_policy": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "domain": {
+          "type": "string",
+          "required": true,
+          "description": "Domain name to which TCA needs to be applied",
+          "default": "measurementsForVfScaling",
+          "constraints": [
+            {
+              "equal": "measurementsForVfScaling"
             }
+          ]
+        },
+        "metricsPerEventName": {
+          "type": "list",
+          "required": true,
+          "description": "Contains eventName and threshold details that need to be applied to given eventName",
+          "entry_schema": {
+            "type": "onap.datatypes.monitoring.metricsPerEventName"
+          }
         }
-    ],
-    "data_types": [
-        {
-            "onap.datatypes.monitoring.metricsPerEventName": {
-                "derived_from": "tosca.datatypes.Root",
-                "properties": {
-                    "controlLoopSchemaType": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "VM",
-                                    "VNF"
-                                ]
-                            }
-                        ]
-                    },
-                    "eventName": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Event name to which thresholds need to be applied"
-                    },
-                    "policyName": {
-                        "type": "string",
-                        "required": true,
-                        "description": "TCA Policy Scope Name"
-                    },
-                    "policyScope": {
-                        "type": "string",
-                        "required": true,
-                        "description": "TCA Policy Scope"
-                    },
-                    "policyVersion": {
-                        "type": "string",
-                        "required": true,
-                        "description": "TCA Policy Scope Version"
-                    },
-                    "thresholds": {
-                        "type": "list",
-                        "required": true,
-                        "description": "Thresholds associated with eventName",
-                        "entry_schema": {
-                            "type": "onap.datatypes.monitoring.thresholds"
-                        }
-                    }
-                }
+      }
+    },
+    "onap.datatypes.monitoring.thresholds": {
+      "derived_from": "tosca.datatypes.Root",
+      "properties": {
+        "closedLoopControlName": {
+          "type": "string",
+          "required": true,
+          "description": "Closed Loop Control Name associated with the threshold"
+        },
+        "closedLoopEventStatus": {
+          "type": "string",
+          "required": true,
+          "description": "Closed Loop Event Status of the threshold",
+          "constraints": [
+            {
+              "valid_values": [
+                "ONSET",
+                "ABATED"
+              ]
+            }
+          ]
+        },
+        "direction": {
+          "type": "string",
+          "required": true,
+          "description": "Direction of the threshold",
+          "constraints": [
+            {
+              "valid_values": [
+                "LESS",
+                "LESS_OR_EQUAL",
+                "GREATER",
+                "GREATER_OR_EQUAL",
+                "EQUAL"
+              ]
             }
+          ]
         },
-        {
-            "onap.datatypes.monitoring.tca_policy": {
-                "derived_from": "tosca.datatypes.Root",
-                "properties": {
-                    "domain": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Domain name to which TCA needs to be applied",
-                        "default": "measurementsForVfScaling",
-                        "constraints": [
-                            {
-                                "equal": "measurementsForVfScaling"
-                            }
-                        ]
-                    },
-                    "metricsPerEventName": {
-                        "type": "list",
-                        "required": true,
-                        "description": "Contains eventName and threshold details that need to be applied to given eventName",
-                        "entry_schema": {
-                            "type": "onap.datatypes.monitoring.metricsPerEventName"
-                        }
-                    }
-                }
+        "fieldPath": {
+          "type": "string",
+          "required": true,
+          "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
+          "constraints": [
+            {
+              "valid_values": [
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
+                "$.event.measurementsForVfScalingFields.meanRequestLatency",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
+                "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
+              ]
             }
+          ]
         },
-        {
-            "onap.datatypes.monitoring.thresholds": {
-                "derived_from": "tosca.datatypes.Root",
-                "properties": {
-                    "closedLoopControlName": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Closed Loop Control Name associated with the threshold"
-                    },
-                    "closedLoopEventStatus": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Closed Loop Event Status of the threshold",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "ONSET",
-                                    "ABATED"
-                                ]
-                            }
-                        ]
-                    },
-                    "direction": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Direction of the threshold",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "LESS",
-                                    "LESS_OR_EQUAL",
-                                    "GREATER",
-                                    "GREATER_OR_EQUAL",
-                                    "EQUAL"
-                                ]
-                            }
-                        ]
-                    },
-                    "fieldPath": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                                    "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                                    "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                                ]
-                            }
-                        ]
-                    },
-                    "severity": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Threshold Event Severity",
-                        "constraints": [
-                            {
-                                "valid_values": [
-                                    "CRITICAL",
-                                    "MAJOR",
-                                    "MINOR",
-                                    "WARNING",
-                                    "NORMAL"
-                                ]
-                            }
-                        ]
-                    },
-                    "thresholdValue": {
-                        "type": "integer",
-                        "required": true,
-                        "description": "Threshold value for the field Path inside CEF message"
-                    },
-                    "version": {
-                        "type": "string",
-                        "required": true,
-                        "description": "Version number associated with the threshold"
-                    }
-                }
+        "severity": {
+          "type": "string",
+          "required": true,
+          "description": "Threshold Event Severity",
+          "constraints": [
+            {
+              "valid_values": [
+                "CRITICAL",
+                "MAJOR",
+                "MINOR",
+                "WARNING",
+                "NORMAL"
+              ]
             }
+          ]
+        },
+        "thresholdValue": {
+          "type": "integer",
+          "required": true,
+          "description": "Threshold value for the field Path inside CEF message"
+        },
+        "version": {
+          "type": "string",
+          "required": true,
+          "description": "Version number associated with the threshold"
         }
-    ]
+      }
+    }
+  }
 }
\ No newline at end of file