diff options
author | Morgan Richomme <morgan.richomme@orange.com> | 2020-03-12 08:16:17 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-03-12 08:16:17 +0000 |
commit | 99a09803616cdaeb6897dc69ef793ed648878d5b (patch) | |
tree | e4822dc61f64784d5d911857586c2bed53efa940 /scripts/policy/config/pap | |
parent | fa637364128e153662b0200765bc36fa5aef2c95 (diff) | |
parent | 29fc835b59417cb575730c24b8689527182fba8b (diff) |
Merge "Fixing policy csits with the tosca version change"
Diffstat (limited to 'scripts/policy/config/pap')
-rw-r--r-- | scripts/policy/config/pap/onap.policies.monitoring.cdap.tca.hi.lo.app.json | 11 | ||||
-rw-r--r-- | scripts/policy/config/pap/vCPE.policy.monitoring.input.tosca.json | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/scripts/policy/config/pap/onap.policies.monitoring.cdap.tca.hi.lo.app.json b/scripts/policy/config/pap/onap.policies.monitoring.cdap.tca.hi.lo.app.json index f06247d7..06574735 100644 --- a/scripts/policy/config/pap/onap.policies.monitoring.cdap.tca.hi.lo.app.json +++ b/scripts/policy/config/pap/onap.policies.monitoring.cdap.tca.hi.lo.app.json @@ -1,5 +1,5 @@ { - "tosca_definitions_version": "tosca_simple_yaml_1_0_0", + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", "policy_types": { "onap.policies.Monitoring": { "derived_from": "tosca.policies.Root", @@ -10,11 +10,8 @@ "version": "1.0.0", "properties": { "tca_policy": { - "type": "map", - "description": "TCA Policy JSON", - "entry_schema": { - "type": "onap.datatypes.monitoring.tca_policy" - } + "type": "onap.datatypes.monitoring.tca_policy", + "description": "TCA Policy JSON" } } } @@ -210,4 +207,4 @@ } } } -}
\ No newline at end of file +} diff --git a/scripts/policy/config/pap/vCPE.policy.monitoring.input.tosca.json b/scripts/policy/config/pap/vCPE.policy.monitoring.input.tosca.json index fac5cfad..3003d9a8 100644 --- a/scripts/policy/config/pap/vCPE.policy.monitoring.input.tosca.json +++ b/scripts/policy/config/pap/vCPE.policy.monitoring.input.tosca.json @@ -1,5 +1,5 @@ { - "tosca_definitions_version": "tosca_simple_yaml_1_0_0", + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", "topology_template": { "policies": [ { |