From 532202ce2d8bf83299b3775bba184fb5b3b50df7 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 6 Feb 2020 17:32:48 +0000 Subject: Add data type and policy type reference checking Full validation including references to policy types and data types added. Unit tests fixed to cope with new stricter validation. Issue-ID: POLICY-1402 Change-Id: I59f37640a99494a53960a54d2fc82cc96861d43b Signed-off-by: liamfallon --- .../src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json | 1 + .../src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml | 1 + .../src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json | 1 + .../src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml | 1 + .../main/resources/policies/vFirewall.policy.monitoring.input.tosca.json | 1 + .../main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml | 1 + 6 files changed, 6 insertions(+) (limited to 'models-examples') diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json index 0eabb573a..eb0dec43d 100644 --- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json +++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json @@ -5,6 +5,7 @@ { "onap.restart.tca": { "type": "onap.policies.monitoring.cdap.tca.hi.lo.app", + "type_version": "1.0.0", "version": "1.0.0", "metadata": { "policy-id": "onap.restart.tca" diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml index 00afec393..74961ef0f 100644 --- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml +++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml @@ -4,6 +4,7 @@ topology_template: - onap.restart.tca: type: onap.policies.monitoring.cdap.tca.hi.lo.app + type_version: 1.0.0 version: 1.0.0 metadata: policy-id: onap.restart.tca diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json index 270613a93..19b0e8e51 100644 --- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json +++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json @@ -8,6 +8,7 @@ "onap.scaleout.tca": { "type": "onap.policies.monitoring.cdap.tca.hi.lo.app", + "type_version": "1.0.0", "version": "1.0.0", "metadata": { diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml index 6735c39c2..4cf17ccba 100644 --- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml +++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml @@ -4,6 +4,7 @@ topology_template: - onap.scaleout.tca: type: onap.policies.monitoring.cdap.tca.hi.lo.app + type_version: 1.0.0 version: 1.0.0 metadata: policy-id: onap.scaleout.tca 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 cdc40eb5b..f96e26d3c 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 @@ -8,6 +8,7 @@ "onap.vfirewall.tca": { "type": "onap.policies.monitoring.cdap.tca.hi.lo.app", + "type_version": "1.0.0", "version": "1.0.0", "metadata": { diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml index 6ac547058..59fcf999d 100644 --- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml +++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml @@ -4,6 +4,7 @@ topology_template: - 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 -- cgit 1.2.3-korg