X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ECOMP-PDP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fpdp%2Frest%2Fapi%2Fservices%2FPAPServices.java;h=66a557056ad39f4a953c871bfa858dcb9010483f;hb=e92ff832cf993db876f22b2d27562fedf59f5043;hp=4a705f5c46aeb352f27da10ccead4880cd3acc92;hpb=570290dc6ba8198e653022c2f6f8e5d01cfa8d1b;p=policy%2Fengine.git

diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PAPServices.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PAPServices.java
index 4a705f5c4..66a557056 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PAPServices.java
+++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/api/services/PAPServices.java
@@ -459,6 +459,11 @@ public class PAPServices {
                         + "Group Policy Scope List Exist Error:  The Group Policy Scope List for this Dictionary Item already exist in the database. "
                         + "Duplicate Group Policy Scope Lists for multiple groupNames is not allowed. "
                         + "Please review the request and verify that the groupPolicyScopeListData1 is unique compared to existing groups.";
+            } else if("PolicyInPDP".equals(connection.getHeaderField("error"))){
+            	response = XACMLErrorConstants.ERROR_DATA_ISSUE
+                        + "Policy Exist Error:  The Policy trying to be deleted is active in PDP. "
+                        + "Active PDP Polcies are not allowed to be deleted from PAP. "
+                        + "Please First remove the policy from PDP in order to successfully delete the Policy from PAP.";
             }
             LOGGER.error(response);
         } else if (connection.getResponseCode() == 500 && connection.getHeaderField("error") != null) {
@@ -499,7 +504,7 @@ public class PAPServices {
                         + "Could not create or update the policy for and unknown reason";
             }else{
                 response = XACMLErrorConstants.ERROR_DATA_ISSUE
-                        + "BAD REQUEST:  Error occured while attempting perform this operation.. the request may be incorrect.";
+                        + "BAD REQUEST:  Error occured while attempting perform this operation.. the request may be incorrect. " + connection.getHeaderField("error");
             }
             LOGGER.error(response);
         } else {