X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-examples%2Fsrc%2Fmain%2Fresources%2Fpolicies%2FvFirewall.policy.monitoring.input.tosca.json;h=012ee25c94f4101dad5e765a87e3d0069272a688;hb=e4cfe3fc84f138fbb2c08ed1695586989734a0b4;hp=aef04c99ccb97f8ddbc1319cf23c0f0c6ac9bb49;hpb=fd6105c2b65f51e229040bd4f6587af048d222a8;p=policy%2Fmodels.git

diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
index aef04c99c..012ee25c9 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
@@ -1,52 +1,54 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
-    "topology_template": 
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
+    "topology_template":
     {
-        "policies": 
+        "policies":
         [
             {
-                "onap.vfirewall.tca": 
+                "onap.vfirewall.tca":
                 {
-                    "type": "onap.policy.monitoring.cdap.tca.hi.lo.app",
+                    "type": "onap.policies.monitoring.tcagen2",
+                    "type_version": "1.0.0",
                     "version": "1.0.0",
-                    "metadata": 
+                    "name": "onap.vfirewall.tca",
+                    "metadata":
                     {
                         "policy-id": "onap.vfirewall.tca"
                     },
 
-                    "properties": 
+                    "properties":
                     {
-                        "tca_policy": 
+                        "tca.policy":
                         {
                             "domain": "measurementsForVfScaling",
-                            "metricsPerEventName": 
+                            "metricsPerEventName":
                             [
                                 {
-                                    "eventName": "vLoadBalancer",
-                                    "controlLoopSchemaType": "VNF",
-                                    "policyScope": "resource=vLoadBalancer;type=configuration",
-                                    "policyName": "onap.vfirewall.tca",
+                                    "eventName": "vFirewallBroadcastPackets",
+                                    "controlLoopSchemaType": "VM",
+                                    "policyScope": "DCAE",
+                                    "policyName": "DCAE.Config_tca-hi-lo",
                                     "policyVersion": "v0.0.1",
-                                    "thresholds": 
+                                    "thresholds":
                                     [
                                         {
                                             "closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
-                                            "closedLoopEventStatus": "ONSET",
                                             "version": "1.0.2",
-                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                            "thresholdValue": 500,
+                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                                            "thresholdValue": 300,
                                             "direction": "LESS_OR_EQUAL",
-                                            "severity": "MAJOR"
+                                            "severity": "MAJOR",
+                                            "closedLoopEventStatus": "ONSET"
                                         },
 
                                         {
                                             "closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
-                                            "closedLoopEventStatus": "ONSET",
                                             "version": "1.0.2",
-                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                            "thresholdValue": 5000,
+                                            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+                                            "thresholdValue": 700,
                                             "direction": "GREATER_OR_EQUAL",
-                                            "severity": "CRITICAL"
+                                            "severity": "CRITICAL",
+                                            "closedLoopEventStatus": "ONSET"
                                         }
                                     ]
                                 }