Updates for Policy Version Changes

[testsuite.git] / robot / assets / templates / policy / vFirewall_policy_monitoring_input_tosca.jinja

diff --git a/robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.jinja b/robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.jinja
index 1d5386c..5ff2ff8 100644 (file)
--- a/robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.jinja
+++ b/robot/assets/templates/policy/vFirewall_policy_monitoring_input_tosca.jinja
@@ -1,10 +1,11 @@
 {
-    "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
     "topology_template": {
         "policies": [
             {
                 "onap.vfirewall.tca": {
                     "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                    "type_version": "1.0.0",
                     "version": "1.0.0",
                     "metadata": {
                         "policy-id": "onap.vfirewall.tca"
@@ -18,10 +19,10 @@
                                     "controlLoopSchemaType": "VM",
                                     "policyScope": "DCAE",
                                     "policyName": "DCAE.Config_tca-hi-lo",
-                                    "policyVersion": "v0.0.1",
+                                    "policyVersion": "1.0.0",
                                     "thresholds": [
                                         {
-                                            "closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
+                                            "closedLoopControlName": "ControlLoop-vFirewall-{{RESOURCE_ID}}",
                                             "closedLoopEventStatus": "ONSET",
                                             "version": "1.0.2",
                                             "fieldPath": "$$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
@@ -30,7 +31,7 @@
                                             "severity": "MAJOR"
                                         },
                                         {
-                                            "closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
+                                            "closedLoopControlName": "ControlLoop-vFirewall-{{RESOURCE_ID}}",
                                             "closedLoopEventStatus": "ONSET",
                                             "version": "1.0.2",
                                             "fieldPath": "$$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
@@ -47,4 +48,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}