From: Morgan Richomme <morgan.richomme@orange.com>
Date: Fri, 20 Mar 2020 18:46:50 +0000 (+0000)
Subject: Merge "Fixing APEX and Distribution csit failures due to invalid key name in policy"
X-Git-Tag: 6.0.0-ONAP~38
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a00e89e8b7f7ccc703d4b2c1211477cb9040717b;hp=f909189e3d3cc4cc8a91fb499459d8f84c0e3fc5;p=integration%2Fcsit.git

Merge "Fixing APEX and Distribution csit failures due to invalid key name in policy"
---

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
Binary files a/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar and b/scripts/policy/policy-distribution/config/distribution/csar/sample_csar_with_apex_policy.csar 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"
                         }]
                 }