diff options
author | a.sreekumar <ajith.sreekumar@est.tech> | 2020-03-11 16:28:57 +0000 |
---|---|---|
committer | a.sreekumar <ajith.sreekumar@est.tech> | 2020-03-11 18:33:22 +0000 |
commit | 29fc835b59417cb575730c24b8689527182fba8b (patch) | |
tree | 2f24b81245a87b2d74b7e94b2d4bfb85eb7b2ca1 /scripts | |
parent | 4b938ffd66e2c32b17807783a85d19052838a36b (diff) |
Fixing policy csits with the tosca version change
Also making the apex test policy changes related to rhino migration.
Change-Id: I20f6c87bf6e2208840eb62a8109f8a98d67e0327
Issue-ID: POLICY-1402
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Diffstat (limited to 'scripts')
-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 | ||||
-rw-r--r-- | scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar | bin | 96917 -> 96857 bytes |
3 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": [ { diff --git a/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar b/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar Binary files differindex 3b1ed6f3..33c601f4 100644 --- a/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar +++ b/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar |