From 81b94381d9ee1aa89b513db342047ec8e71717e9 Mon Sep 17 00:00:00 2001
From: "a.sreekumar" <ajith.sreekumar@est.tech>
Date: Fri, 20 Mar 2020 14:23:00 +0000
Subject: [PATCH] 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>
---
 .../csar/sample_csar_with_apex_policy.csar          | Bin 96857 -> 96875 bytes
 ...policies.controlloop.operational.Apex.tosca.json |   7 +++++--
 tests/policy/apex-pdp/data/pdp_update.json          |   2 +-
 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 33c601f4080383b90f86f0688bc78596ec00e4d8..c2f90eaf1f1cac916b667a8e87494d1ba5cf53ce 100644
GIT binary patch
delta 424
zcmV;Z0ayOn^abnm1%R{x{~rxAa&%DgOL<L`HUI!|mkb~Q=YNoM`^Ujj`WKklrL6pG
zZ<6}AT+e;RDWsksZ1O$OvuVAUO(wJ1{NQ$Whmc+R&WpdlEfP7v2l#H1*FU|qwKTGp
zcM5hR<u$4dJZcf@otOUd=EdaJ^S|%Be!lQI*C6!$0@&$AHMOU9@q4B1S8^ettdQkR
z!keU1c;<`w#ecO|(Q)&`b*Wyi2@IMb_fs^&X8iv5(`7BE+8)iWrnOIUFNLx5$?W>l
zPV28`3!j8gE=ZH?zG}`Jvw7~;!n}~mYxt`s<rgz!H;L{g`_*2*_~^b$P8&nr%I(v`
zZx2t8zCQWtY%718p0>&Enel#!PNr_QxNKNi7cR2ox0m1{0T~V&fB&=nX$Og4koySg
zzn2Fh0Z9TsXtz=#0rUX@*q28n0hIzcbhq9l0bT?GuEe)KDFK`<1F82Hx7=0%IwB1-
za&%DgOL<L`HUI!|mm_%rX%0`piB7`))d5eziB7`)mzsG2Gy?8cm*H>$DVJY)0UVb-
SR{;u_A9?{a1_fRL0000vThsOc

delta 385
zcmV-{0e=4L^aa`U1%R{x{~rwvgKJRj;<mkkHUI!Qmkb~Q=YLpApSPJ^%F4g-CY67|
z_1x!~Lc;mMCd&goo7RijWHOu04{qmlIJbYK@4Wc?+tQE&e1PvJnaazSSA2Qv6%t-?
zr^I(Nd;P2C3t!qA^54jL^UO{!s;ND-i{C44zmf|mRSlWlB)nhZFRs17$ITDdFM4@V
zFcgK{Pf;0om}&9*-%ppdoN9YCyPDQM$-NZD&L^|$OFON<nk{@1Lb)LKk~P}AK5vZR
z0a^?5LMpG)ubPx!%#7V6x|i%%d;Q|0`zkqYEORTjPY=I6JU#mQ<g2r-{B3%ANwUA+
zc}0m%rf#;lY~Waz>>&Xj4yt?qv;AoYiC>WW2&$Tw7$N~l0>@{!V<G|c0Rdo_SR?_J
z0?Ko@?<4_U1Oo21w@)bnoGk+BFSqVi0XiZL4TEb??c%n*fi?gDIhQqg0cj2vIlza(
f_tgOwIlza(_m`}B0W<;Jm*IH<ga-3n0RR91!ZE!C

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"
                         }]
                 }
-- 
2.16.6