From bb58461fbc21a3dee052efd411de3d72a04ec270 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Tue, 5 May 2020 09:07:15 -0500 Subject: Updates for Policy Version Changes Issue-ID: INT-1350 Change-Id: I4c5956467b7e674546f89678921342cb7dd3e19c Signed-off-by: Brian Freeman --- .../policy/vFirewall_policy_monitoring_input_tosca.jinja | 11 ++++++----- robot/assets/templates/policy/vFirewall_push.jinja | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'robot/assets') 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 1d5386c7..5ff2ff87 100644 --- 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 +} diff --git a/robot/assets/templates/policy/vFirewall_push.jinja b/robot/assets/templates/policy/vFirewall_push.jinja index d9aeca04..92f02fd6 100644 --- a/robot/assets/templates/policy/vFirewall_push.jinja +++ b/robot/assets/templates/policy/vFirewall_push.jinja @@ -2,11 +2,11 @@ "policies": [ { "policy-id": "onap.vfirewall.tca", - "policy-version": 1 + "policy-version": "1.0.0" }, { "policy-id": "operational.modifyconfig", "policy-version": "{{OP_POLICY_VERSION}}.0.0" } ] -} \ No newline at end of file +} -- cgit 1.2.3-korg