aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora.sreekumar <ajith.sreekumar@est.tech>2020-03-20 14:23:00 +0000
committera.sreekumar <ajith.sreekumar@est.tech>2020-03-20 14:28:30 +0000
commit81b94381d9ee1aa89b513db342047ec8e71717e9 (patch)
tree69fcf16b6e0b92acc9117debfb6ed1840e5d6bd2
parent25fac3a21f28662920fb5210c05f4dc36140769e (diff)
Fixing APEX and Distribution csit failures due to invalid key name in policy
When the key name doesn't match with the name field in policy, creation of policy is failing. Due to some recent changes in API and models. So, correcting the policy in this review. Change-Id: I8a57f734a25f46fef623edb078fabc2641722816 Issue-ID: POLICY-2438 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
-rw-r--r--scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csarbin96857 -> 96875 bytes
-rw-r--r--tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json7
-rw-r--r--tests/policy/apex-pdp/data/pdp_update.json2
3 files changed, 6 insertions, 3 deletions
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
index 33c601f4..c2f90eaf 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
Binary files differ
diff --git a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json
index 07118ac3..179bbea2 100644
--- a/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json
+++ b/tests/policy/apex-pdp/data/onap.policies.controlloop.operational.Apex.tosca.json
@@ -3,11 +3,14 @@
"topology_template": {
"policies": [
{
- "operational.sampledomain": {
+ "operational.apex.sampledomain": {
"type": "onap.policies.controlloop.operational.Apex",
"type_version": "1.0.0",
- "name": "onap.policies.controlloop.Operational.apex.sampledomain",
"version": "1.0.0",
+ "metadata": {
+ "policy-id": "operational.apex.sampledomain",
+ "policy-version": 1
+ },
"properties": {
"engineServiceParameters": {
"name": "MyApexEngine",
diff --git a/tests/policy/apex-pdp/data/pdp_update.json b/tests/policy/apex-pdp/data/pdp_update.json
index e880d5ed..5b4dfde7 100644
--- a/tests/policy/apex-pdp/data/pdp_update.json
+++ b/tests/policy/apex-pdp/data/pdp_update.json
@@ -7,7 +7,7 @@
"pdpType": "apex",
"action": "POST",
"policies": [{
- "name": "onap.policies.controlloop.Operational.apex.sampledomain",
+ "name": "operational.apex.sampledomain",
"version": "1.0.0"
}]
}