Policy 1707 commit to LF
[policy/engine.git] / ecomp-sdk-app / src / main / java / org / openecomp / policy / admin / RESTfulPAPEngine.java
diff --git a/ecomp-sdk-app/src/main/java/org/openecomp/policy/admin/RESTfulPAPEngine.java b/ecomp-sdk-app/src/main/java/org/openecomp/policy/admin/RESTfulPAPEngine.java
deleted file mode 100644 (file)
index ecb6102..0000000
+++ /dev/null
@@ -1,732 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.admin;
-
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.io.IOUtils;
-import org.openecomp.policy.adapter.PolicyAdapter;
-import org.openecomp.policy.rest.XACMLRestProperties;
-
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.policy.xacml.api.pap.EcompPDP;
-import org.openecomp.policy.xacml.api.pap.EcompPDPGroup;
-import org.openecomp.policy.xacml.api.pap.PAPPolicyEngine;
-import org.openecomp.policy.xacml.std.pap.StdPAPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDP;
-import org.openecomp.policy.xacml.std.pap.StdPDPGroup;
-import org.openecomp.policy.xacml.std.pap.StdPDPItemSetChangeNotifier;
-import org.openecomp.policy.xacml.std.pap.StdPDPPolicy;
-import org.openecomp.policy.xacml.std.pap.StdPDPStatus;
-import com.att.research.xacml.api.pap.PAPEngine;
-import com.att.research.xacml.api.pap.PAPException;
-import com.att.research.xacml.api.pap.PDP;
-import com.att.research.xacml.api.pap.PDPGroup;
-//import com.att.research.xacml.api.pap.PDP;
-//import com.att.research.xacml.api.pap.PDPGroup;
-import com.att.research.xacml.api.pap.PDPPolicy;
-import com.att.research.xacml.api.pap.PDPStatus;
-import com.att.research.xacml.util.XACMLProperties;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import com.fasterxml.jackson.databind.type.CollectionType;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger; 
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-/**
- * Implementation of the PAPEngine interface that communicates with a PAP engine in a remote servlet
- * through a RESTful interface
- * 
- *
- */
-public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyEngine {
-       private static final Logger logger      = FlexLogger.getLogger(RESTfulPAPEngine.class);
-
-       //
-       // URL of the PAP Servlet that this Admin Console talks to
-       //
-       private String papServletURLString;
-       
-       /**
-        * Set up link with PAP Servlet and get our initial set of Groups
-        * @throws Exception 
-        */
-       public RESTfulPAPEngine (String myURLString) throws PAPException, IOException  {
-               //
-               // Get our URL to the PAP servlet
-               //
-               this.papServletURLString = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_URL);
-               if (this.papServletURLString == null || this.papServletURLString.length() == 0) {
-                       String message = "The property 'POLICYENGINE_ADMIN_ACTIVE' was not set during installation.  Admin Console cannot call PAP.";
-                       logger.error(message);
-                       throw new PAPException(message);
-               }
-
-               //
-               // register this Admin Console with the PAP Servlet to get updates
-               //
-               Object newURL = sendToPAP("PUT", null, null, null, "adminConsoleURL=" + myURLString);
-               if (newURL != null) {
-                       // assume this was a re-direct and try again
-                       logger.warn("Redirecting to '" + newURL + "'");
-                       this.papServletURLString = (String)newURL;
-                       newURL = sendToPAP("PUT", null, null, null, "adminConsoleURL=" + myURLString);
-                       if (newURL != null) {
-                               logger.error("Failed to redirect to " + this.papServletURLString);
-                               throw new PAPException("Failed to register with PAP");
-                       }
-               }
-       }
-       
-
-       //
-       // High-level commands used by the Admin Console code through the PAPEngine Interface
-       //
-       
-       @Override
-       public EcompPDPGroup getDefaultGroup() throws PAPException {
-               EcompPDPGroup newGroup = (EcompPDPGroup)sendToPAP("GET", null, null, StdPDPGroup.class, "groupId=", "default=");
-               return newGroup;
-       }
-
-       @Override
-       public void SetDefaultGroup(EcompPDPGroup group) throws PAPException {
-               sendToPAP("POST", null, null, null, "groupId=" + group.getId(), "default=true");
-       }
-
-       @SuppressWarnings("unchecked")
-       @Override
-       public Set<EcompPDPGroup> getEcompPDPGroups() throws PAPException {
-               Set<EcompPDPGroup> newGroupSet;
-               newGroupSet = (Set<EcompPDPGroup>) this.sendToPAP("GET", null, Set.class, StdPDPGroup.class, "groupId=");
-               return Collections.unmodifiableSet(newGroupSet);
-       }
-
-
-       @Override
-       public EcompPDPGroup getGroup(String id) throws PAPException {
-               EcompPDPGroup newGroup = (EcompPDPGroup)sendToPAP("GET", null, null, StdPDPGroup.class, "groupId=" + id);
-               return newGroup;
-       }
-
-       @Override
-       public void newGroup(String name, String description)
-                       throws PAPException, NullPointerException {
-               String escapedName = null;
-               String escapedDescription = null;
-               try {
-                       escapedName = URLEncoder.encode(name, "UTF-8");
-                       escapedDescription = URLEncoder.encode(description, "UTF-8");
-               } catch (UnsupportedEncodingException e) {
-                       throw new PAPException("Unable to send name or description to PAP: " + e.getMessage());
-               }
-               
-               this.sendToPAP("POST", null, null, null, "groupId=", "groupName="+escapedName, "groupDescription=" + escapedDescription);
-       }
-       
-       
-       /**
-        * Update the configuration on the PAP for a single Group.
-        * 
-        * @param group
-        * @return
-        * @throws PAPException
-        */
-       public void updateGroup(EcompPDPGroup group) throws PAPException {
-
-               try {
-                       
-                       //
-                       // ASSUME that all of the policies mentioned in this group are already located in the correct directory on the PAP!
-                       //
-                       // Whenever a Policy is added to the group, that file must be automatically copied to the PAP from the Workspace.
-                       // 
-                       
-                       
-//                     // Copy all policies from the local machine's workspace to the PAP's PDPGroup directory.
-//                     // This is not efficient since most of the policies will already exist there.
-//                     // However, the policy files are (probably!) not too huge, and this is a good way to ensure that any corrupted files on the PAP get refreshed.
-//                     
-                       
-                       // now update the group object on the PAP
-                       
-                       sendToPAP("PUT", group, null, null, "groupId=" + group.getId());
-               } catch (Exception e) {
-                       String message = "Unable to PUT policy '" + group.getId() + "', e:" + e;
-                       logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + message, e);
-                       throw new PAPException(message);
-               }
-       }
-       
-       
-       @Override
-       public void removeGroup(EcompPDPGroup group, EcompPDPGroup newGroup)
-                       throws PAPException, NullPointerException {
-               String moveToGroupString = null;
-               if (newGroup != null) {
-                       moveToGroupString = "movePDPsToGroupId=" + newGroup.getId();
-               }
-               sendToPAP("DELETE", null, null, null, "groupId=" + group.getId(), moveToGroupString);
-       }
-       
-       @Override
-       public EcompPDPGroup getPDPGroup(EcompPDP pdp) throws PAPException {
-               return getPDPGroup(pdp.getId());
-       }
-
-       
-       public EcompPDPGroup getPDPGroup(String pdpId) throws PAPException {
-               EcompPDPGroup newGroup = (EcompPDPGroup)sendToPAP("GET", null, null, StdPDPGroup.class, "groupId=", "pdpId=" + pdpId, "getPDPGroup=");
-               return newGroup;
-       }
-
-       @Override
-       public EcompPDP getPDP(String pdpId) throws PAPException {
-               EcompPDP newPDP = (EcompPDP)sendToPAP("GET", null, null, StdPDP.class, "groupId=", "pdpId=" + pdpId);
-               return newPDP;
-       }
-       
-       @Override
-       public void newPDP(String id, EcompPDPGroup group, String name, String description, int jmxport) throws PAPException,
-                       NullPointerException {
-               StdPDP newPDP = new StdPDP(id, name, description, jmxport);
-               sendToPAP("PUT", newPDP, null, null, "groupId=" + group.getId(), "pdpId=" + id);
-               return;
-       }
-
-       @Override
-       public void movePDP(EcompPDP pdp, EcompPDPGroup newGroup) throws PAPException {
-               sendToPAP("POST", null, null, null, "groupId=" + newGroup.getId(), "pdpId=" + pdp.getId());
-               return;
-       }
-
-       @Override
-       public void updatePDP(EcompPDP pdp) throws PAPException {
-               EcompPDPGroup group = getPDPGroup(pdp);
-               sendToPAP("PUT", pdp, null, null, "groupId=" + group.getId(), "pdpId=" + pdp.getId());
-               return;
-       }
-       
-       @Override
-       public void removePDP(EcompPDP pdp) throws PAPException {
-               EcompPDPGroup group = getPDPGroup(pdp);
-               sendToPAP("DELETE", null, null, null, "groupId=" + group.getId(), "pdpId=" + pdp.getId());
-               return;
-       }
-       
-       //Validate the Policy Data
-       public boolean validatePolicyRequest(PolicyAdapter policyAdapter, String policyType) throws PAPException {
-               Boolean isValidData = false;
-/*             StdPAPPolicy newPAPPolicy = new StdPAPPolicy(policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), policyAdapter.getEcompName(), policyAdapter.getConfigName(),
-                               policyAdapter.getDynamicFieldConfigAttributes(), policyAdapter.getConfigBodyData(), policyAdapter.getPolicyID(), policyAdapter.getRuleID(), 
-                               policyAdapter.getRuleCombiningAlgId(), policyAdapter.getParentPath().toString(), policyAdapter.getGitPath().toString(), policyAdapter.getConfigType(), policyAdapter.isEditPolicy());
-               */
-               
-               StdPAPPolicy newPAPPolicy = new StdPAPPolicy(policyAdapter.getPolicyName(), policyAdapter.getConfigBodyData(), policyAdapter.getConfigType(), "Base");
-               
-               //send JSON object to PAP
-               isValidData = (Boolean) sendToPAP("PUT", newPAPPolicy, null, null, "operation=validate", "apiflag=admin", "policyType=" + policyType);
-               return isValidData;
-       }
-       
-       //create a new policy
-       @SuppressWarnings("unchecked")
-       public Map<String, String> createPolicyRequest(PolicyAdapter policyAdapter) throws PAPException {
-               Map<String, String> successMap = new HashMap<String, String>(); 
-               StdPAPPolicy newPAPPolicy = null;
-               
-               if (policyAdapter.getPolicyType().equalsIgnoreCase("Config")) {
-                       
-                       if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("Firewall Config")) {
-                               
-                               //create StdPAPPolicy object for Config Firewall Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getConfigName(), policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getJsonBody(), 
-                                               policyAdapter.getHighestVersion() ,policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-
-                       }
-                       else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("BRMS_Raw")) {
-                               
-                               //create StdPAPPolicy object for BRMS_Raw Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getConfigName(), policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getDynamicFieldConfigAttributes(), 
-                                               policyAdapter.getHighestVersion(),policyAdapter.getEcompName(),policyAdapter.getConfigBodyData(),policyAdapter.getRiskLevel(), 
-                                               policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-
-                       }
-                       else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("BRMS_Param")) {
-               
-                               //create StdPAPPolicy object for BRMS_Param Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getConfigName(), policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getDynamicFieldConfigAttributes(), 
-                                               policyAdapter.getHighestVersion(),policyAdapter.getEcompName(),policyAdapter.getConfigBodyData(),policyAdapter.getBRMSParamBody(),
-                                               policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                       
-                       }
-       
-                       else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("Base")) {
-                               
-                               //create StdPAPPolicy object for Config Base Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getEcompName(), policyAdapter.getConfigName(), policyAdapter.getDynamicFieldConfigAttributes(), policyAdapter.getConfigType(), 
-                                               policyAdapter.getConfigBodyData(), policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getHighestVersion(),
-                                               policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       }else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("ClosedLoop_Fault")) {
-                               
-                               //create StdPAPPolicy object for CloseLoop Fault Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getEcompName(), policyAdapter.getJsonBody(),  policyAdapter.isDraft(), policyAdapter.getOldPolicyFileName(), null, policyAdapter.isEditPolicy(), 
-                                               policyAdapter.getDomainDir(), policyAdapter.getHighestVersion(),
-                                               policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       }else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("ClosedLoop_PM")) {
-                               
-                               //create StdPAPPolicy object for CloseLoop PM Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getEcompName(), policyAdapter.getJsonBody(),  policyAdapter.isDraft(), policyAdapter.getOldPolicyFileName(), policyAdapter.getServiceType(), 
-                                               policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getHighestVersion(),policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), 
-                                               policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       }else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("DCAE Micro Service")) {
-                               
-                               //create StdPAPPolicy object for DCAE Micro Service Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getEcompName(), policyAdapter.getConfigName(), policyAdapter.getServiceType(), policyAdapter.getUuid(), policyAdapter.getLocation(), 
-                        policyAdapter.getJsonBody(), policyAdapter.getPriority(), null, policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), 
-                        policyAdapter.getHighestVersion(),policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       }
-               } else if (policyAdapter.getPolicyType().equalsIgnoreCase("Action")) {
-                       
-                       //create StdPAPPolicy object for Action Policy
-                       newPAPPolicy = new StdPAPPolicy(policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), policyAdapter.getDynamicFieldConfigAttributes(),
-                                       policyAdapter.getDynamicRuleAlgorithmLabels(), policyAdapter.getDynamicRuleAlgorithmCombo(), policyAdapter.getDynamicRuleAlgorithmField1(), 
-                                       policyAdapter.getDynamicRuleAlgorithmField2(), policyAdapter.getActionPerformer(), policyAdapter.getActionAttribute(),
-                                       policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getHighestVersion());
-                       
-               } else if (policyAdapter.getPolicyType().equalsIgnoreCase("Decision")) {
-                       
-                       //create StdPAPPolicy object for Decision Policy 
-                       newPAPPolicy = new StdPAPPolicy(policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), policyAdapter.getEcompName(), policyAdapter.getRuleProvider(), 
-                                       policyAdapter.getDynamicFieldConfigAttributes(), policyAdapter.getDynamicSettingsMap(), policyAdapter.getDynamicRuleAlgorithmLabels(), 
-                                       policyAdapter.getDynamicRuleAlgorithmCombo(), policyAdapter.getDynamicRuleAlgorithmField1(), policyAdapter.getDynamicRuleAlgorithmField2(), 
-                                       policyAdapter.getDropDownMap(), policyAdapter.getDynamicVariableList(), policyAdapter.getDataTypeList(), policyAdapter.isEditPolicy(), 
-                                       policyAdapter.getDomainDir(), policyAdapter.getHighestVersion());
-                       
-               }
-               
-               //send JSON object to PAP
-               successMap = (Map<String, String>) sendToPAP("PUT", newPAPPolicy, null, null, "operation=create", "apiflag=admin", "policyType=" + policyAdapter.getPolicyType());
-               return successMap;
-               
-               
-       }
-       
-       //update an existing policy
-       @SuppressWarnings("unchecked")
-       public Map<String, String> updatePolicyRequest(PolicyAdapter policyAdapter) throws PAPException {
-               Map<String, String> successMap = new HashMap<String, String>();         
-               StdPAPPolicy newPAPPolicy = null;
-               
-               if (policyAdapter.getPolicyType().equalsIgnoreCase("Config")) {
-                       
-                       if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("Firewall Config")) {
-                               
-                               //create StdPAPPolicy object for Firewall Config Policy 
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), policyAdapter.getConfigName(),
-                                               policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getPolicyID(),
-                                               policyAdapter.getRuleID(), policyAdapter.getVersion(), policyAdapter.getJsonBody(), policyAdapter.getHighestVersion(),policyAdapter.getRiskLevel(), 
-                                               policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       } 
-                       else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("BRMS_Raw")) {
-                               //create StdPAPPolicy object for BRMS_Raw Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getConfigName(), policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getDynamicFieldConfigAttributes(), 
-                                               policyAdapter.getHighestVersion(),policyAdapter.getEcompName(),policyAdapter.getConfigBodyData(),policyAdapter.getRiskLevel(), 
-                                               policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       }else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("BRMS_Param")) {
-                               //create StdPAPPolicy object for BRMS_Raw Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getConfigName(), policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getDynamicFieldConfigAttributes(), 
-                                               policyAdapter.getHighestVersion(),policyAdapter.getEcompName(),policyAdapter.getConfigBodyData(),policyAdapter.getBRMSParamBody(),
-                                               policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       }else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("Base")) {
-                               
-                               //create StdPAPPolicy object for Config Base Policy 
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), policyAdapter.getEcompName(), policyAdapter.getConfigName(),
-                                               policyAdapter.getDynamicFieldConfigAttributes(), policyAdapter.getConfigBodyData(), policyAdapter.getPolicyID(), policyAdapter.getRuleID(), 
-                                               policyAdapter.getConfigType(), policyAdapter.isEditPolicy(), policyAdapter.getVersion(), policyAdapter.getDomainDir(), policyAdapter.getHighestVersion(),policyAdapter.getRiskLevel(), 
-                                               policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       }else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("ClosedLoop_Fault")) {
-                               
-                               //create StdPAPPolicy object for CloseLoop Fault Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getEcompName(), policyAdapter.getJsonBody(),  policyAdapter.isDraft(), policyAdapter.getOldPolicyFileName(), null, policyAdapter.isEditPolicy(), 
-                                               policyAdapter.getDomainDir(), policyAdapter.getHighestVersion(),policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), policyAdapter.getGuard(),
-                                               policyAdapter.getTtlDate());
-                               
-                       }else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("ClosedLoop_PM")) {
-                               
-                               //create StdPAPPolicy object for CloseLoop PM Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getEcompName(), policyAdapter.getJsonBody(), policyAdapter.isDraft(), policyAdapter.getOldPolicyFileName(), policyAdapter.getServiceType(), 
-                                               policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getHighestVersion(),policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), 
-                                               policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       }else if (policyAdapter.getConfigPolicyType().equalsIgnoreCase("DCAE Micro Service")) {
-                               
-                               //create StdPAPPolicy object for DCAE Micro Service Policy
-                               newPAPPolicy = new StdPAPPolicy(policyAdapter.getConfigPolicyType(), policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), 
-                                               policyAdapter.getEcompName(), policyAdapter.getConfigName(), policyAdapter.getServiceType(), policyAdapter.getUuid(), policyAdapter.getLocation(), 
-                        policyAdapter.getJsonBody(), policyAdapter.getPriority(), null, policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getHighestVersion(),
-                        policyAdapter.getRiskLevel(), policyAdapter.getRiskType(), policyAdapter.getGuard(),policyAdapter.getTtlDate());
-                               
-                       }
-               } else if (policyAdapter.getPolicyType().equalsIgnoreCase("Action")) {
-                       
-                       //create StdPAPPolicy object for Action Policy 
-                       newPAPPolicy = new StdPAPPolicy(policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), policyAdapter.getDynamicFieldConfigAttributes(),
-                                       policyAdapter.getDynamicRuleAlgorithmLabels(), policyAdapter.getDynamicRuleAlgorithmCombo(), policyAdapter.getDynamicRuleAlgorithmField1(), 
-                                       policyAdapter.getDynamicRuleAlgorithmField2(), policyAdapter.getActionPerformer(), policyAdapter.getActionAttribute(),
-                                       policyAdapter.isEditPolicy(), policyAdapter.getDomainDir(), policyAdapter.getHighestVersion());
-                       
-               } else if (policyAdapter.getPolicyType().equalsIgnoreCase("Decision")) {
-                       
-                       //create StdPAPPolicy object for Decision Policy 
-                       newPAPPolicy = new StdPAPPolicy(policyAdapter.getPolicyName(), policyAdapter.getPolicyDescription(), policyAdapter.getEcompName(), policyAdapter.getRuleProvider(),
-                                       policyAdapter.getDynamicFieldConfigAttributes(), policyAdapter.getDynamicSettingsMap(), policyAdapter.getDynamicRuleAlgorithmLabels(), 
-                                       policyAdapter.getDynamicRuleAlgorithmCombo(), policyAdapter.getDynamicRuleAlgorithmField1(), policyAdapter.getDynamicRuleAlgorithmField2(), 
-                                       policyAdapter.getDropDownMap(), policyAdapter.getDynamicVariableList(), policyAdapter.getDataTypeList(), policyAdapter.isEditPolicy(), 
-                                       policyAdapter.getDomainDir(), policyAdapter.getHighestVersion());
-                       
-               }
-               
-               //send JSON object to PAP
-               successMap = (Map<String, String>) sendToPAP("PUT", newPAPPolicy, null, null, "operation=update", "apiflag=admin", "policyType=" + policyAdapter.getPolicyType());
-               return successMap;
-       }
-       
-       @Override
-       public void publishPolicy(String id, String name, boolean isRoot,
-                       InputStream policy, EcompPDPGroup group) throws PAPException {
-               
-
-               // copy the (one) file into the target directory on the PAP servlet
-               copyFile(id, group, policy);
-               
-               // adjust the local copy of the group to include the new policy
-               PDPPolicy pdpPolicy = new StdPDPPolicy(id, isRoot, name);
-               group.getPolicies().add(pdpPolicy);
-               
-               // tell the PAP servlet to include the policy in the configuration
-               updateGroup(group);
-                               
-               return;
-       }
-       
-       
-       
-       /**
-        * Copy a single Policy file from the input stream to the PAP Servlet.
-        * Either this works (silently) or it throws an exception.
-        * 
-        * @param policyId
-        * @param group
-        * @param policy
-        * @return
-        * @throws PAPException
-        */
-       public void copyFile(String policyId, EcompPDPGroup group, InputStream policy) throws PAPException {
-               // send the policy file to the PAP Servlet
-               try {
-                       sendToPAP("POST", policy, null, null, "groupId=" + group.getId(), "policyId="+policyId);
-               } catch (Exception e) {
-                       String message = "Unable to PUT policy '" + policyId + "', e:" + e;
-                       logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + message, e);
-                       throw new PAPException(message);
-               }
-       }
-       
-
-       @Override
-       public void     copyPolicy(PDPPolicy policy, EcompPDPGroup group) throws PAPException {
-               if (policy == null || group == null) {
-                       throw new PAPException("Null input policy="+policy+"  group="+group);
-               }
-               try (InputStream is = new FileInputStream(new File(policy.getLocation())) ) {
-                       copyFile(policy.getId(), group, is );
-               } catch (Exception e) {
-                       String message = "Unable to PUT policy '" + policy.getId() + "', e:" + e;
-                       logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + message, e);
-                       throw new PAPException(message);
-               }
-       }
-
-
-       
-       
-       @Override
-       public void     removePolicy(PDPPolicy policy, EcompPDPGroup group) throws PAPException {
-               throw new PAPException("NOT IMPLEMENTED");
-
-       }
-
-       
-       
-       /**
-        * Special operation - Similar to the normal PAP operations but this one contacts the PDP directly
-        * to get detailed status info.
-        * 
-        * @param pdp
-        * @return
-        * @throws PAPException 
-        */
-       
-       public PDPStatus getStatus(EcompPDP pdp) throws PAPException {
-               StdPDPStatus status = (StdPDPStatus)sendToPAP("GET", pdp, null, StdPDPStatus.class);
-               return status;
-       }
-       
-       
-       
-       
-       //
-       // Internal Operations called by the PAPEngine Interface methods
-       //
-       
-       /**
-        * Send a request to the PAP Servlet and get the response.
-        * 
-        * The content is either an InputStream to be copied to the Request OutputStream
-        *      OR it is an object that is to be encoded into JSON and pushed into the Request OutputStream.
-        * 
-        * The Request parameters may be encoded in multiple "name=value" sets, or parameters may be combined by the caller.
-        * 
-        * @param method
-        * @param content       - EITHER an InputStream OR an Object to be encoded in JSON
-        * @param collectionTypeClass
-        * @param responseContentClass
-        * @param parameters
-        * @return
-        * @throws Exception
-        */
-       private Object sendToPAP(String method, Object content, Class collectionTypeClass, Class responseContentClass, String... parameters ) throws PAPException {
-               HttpURLConnection connection = null;
-               String papID = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_USERID);
-               logger.info("User Id is " + papID);
-               String papPass = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS);
-               logger.info("Pass is: " + papPass);
-               Base64.Encoder encoder = Base64.getEncoder();
-               String encoding = encoder.encodeToString((papID+":"+papPass).getBytes(StandardCharsets.UTF_8));
-               logger.info("Encoding for the PAP is: " + encoding);
-               try {
-                       String fullURL = papServletURLString;
-                       if (parameters != null && parameters.length > 0) {
-                               String queryString = "";
-                               for (String p : parameters) {
-                                       queryString += "&" + p;
-                               }
-                               fullURL += "?" + queryString.substring(1);
-                       }
-                       
-                       // special case - Status (actually the detailed status) comes from the PDP directly, not the PAP
-                       if (method.equals("GET") &&     (content instanceof EcompPDP) &&        responseContentClass == StdPDPStatus.class) {
-                               // Adjust the url and properties appropriately
-                               String pdpID =((EcompPDP)content).getId(); 
-                               fullURL = pdpID + "?type=Status";
-                               content = null;
-                               if(CheckPDP.validateID(pdpID)){
-                                       encoding = CheckPDP.getEncoding(pdpID);
-                               }
-                       }
-                       
-                       
-                       URL url = new URL(fullURL);
-
-                       //
-                       // Open up the connection
-                       //
-                       connection = (HttpURLConnection)url.openConnection();
-                       //
-                       // Setup our method and headers
-                       //
-            connection.setRequestMethod(method);
-//                             connection.setRequestProperty("Accept", "text/x-java-properties");
-//                 connection.setRequestProperty("Content-Type", "text/x-java-properties");
-            connection.setUseCaches(false);
-            //
-            // Adding this in. It seems the HttpUrlConnection class does NOT
-            // properly forward our headers for POST re-direction. It does so
-            // for a GET re-direction.
-            //
-            // So we need to handle this ourselves.
-            //
-            connection.setInstanceFollowRedirects(false);
-            connection.setRequestProperty("Authorization", "Basic " + encoding);
-                       connection.setDoOutput(true);
-                       connection.setDoInput(true);
-                       
-                       if (content != null) {
-                               if (content instanceof InputStream) {
-                               try {
-                                       //
-                                       // Send our current policy configuration
-                                       //
-                                       try (OutputStream os = connection.getOutputStream()) {
-                                               int count = IOUtils.copy((InputStream)content, os);
-                                               if (logger.isDebugEnabled()) {
-                                                       logger.debug("copied to output, bytes="+count);
-                                               }
-                                       }
-                               } catch (Exception e) {
-                                       logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Failed to write content in '" + method + "'", e);
-                                       throw e;
-                               }
-                               } else {
-                                       // The content is an object to be encoded in JSON
-                           ObjectMapper mapper = new ObjectMapper();
-                           mapper.writeValue(connection.getOutputStream(),  content);
-                               }
-                       }
-            //
-            // Do the connect
-            //
-            connection.connect();
-            if (connection.getResponseCode() == 204) {
-               logger.info("Success - no content.");
-               return null;
-            } else if (connection.getResponseCode() == 200) {
-               logger.info("Success. We have a return object.");
-               String isValidData = connection.getHeaderField("isValidData");
-               String isSuccess = connection.getHeaderField("successMapKey");
-               Map<String, String> successMap = new HashMap<String, String>();
-               if (isValidData != null && isValidData.equalsIgnoreCase("true")){
-                   logger.info("Policy Data is valid.");       
-                       return true;
-               } else if (isValidData != null && isValidData.equalsIgnoreCase("false")) {
-                   logger.info("Policy Data is invalid.");     
-                       return false;
-               } else if (isSuccess != null && isSuccess.equalsIgnoreCase("success")) {
-                       logger.info("Policy Created Successfully!" );
-                       String finalPolicyPath = connection.getHeaderField("finalPolicyPath");
-                       successMap.put("success", finalPolicyPath);
-                       return successMap;
-               } else if (isSuccess != null && isSuccess.equalsIgnoreCase("error")) {
-                       logger.info("There was an error while creating the policy!");
-                       successMap.put("error", "error");
-                       return successMap;
-               } else {
-                       // get the response content into a String
-                       String json = null;
-                               // read the inputStream into a buffer (trick found online scans entire input looking for end-of-file)
-                           java.util.Scanner scanner = new java.util.Scanner(connection.getInputStream());
-                           scanner.useDelimiter("\\A");
-                           json =  scanner.hasNext() ? scanner.next() : "";
-                           scanner.close();
-                           logger.info("JSON response from PAP: " + json);
-                       
-                       // convert Object sent as JSON into local object
-                           ObjectMapper mapper = new ObjectMapper();
-                           mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-                           if (collectionTypeClass != null) {
-                               // collection of objects expected
-                               final CollectionType javaType = 
-                                     mapper.getTypeFactory().constructCollectionType(collectionTypeClass, responseContentClass);
-       
-                               Object objectFromJSON = mapper.readValue(json, javaType);
-                                               return objectFromJSON;
-                           } else {
-                               // single value object expected
-                                   Object objectFromJSON = mapper.readValue(json, responseContentClass);
-                                               return objectFromJSON;
-                           }
-               }
-
-            } else if (connection.getResponseCode() >= 300 && connection.getResponseCode()  <= 399) {
-               // redirection
-               String newURL = connection.getHeaderField("Location");
-               if (newURL == null) {
-                       logger.error("No Location header to redirect to when response code="+connection.getResponseCode());
-                       throw new IOException("No redirect Location header when response code="+connection.getResponseCode());
-               }
-               int qIndex = newURL.indexOf("?");
-               if (qIndex > 0) {
-                       newURL = newURL.substring(0, qIndex);
-               }
-               logger.info("Redirect seen.  Redirecting " + fullURL + " to " + newURL);
-               return newURL;
-            } else {
-               logger.warn("Unexpected response code: " + connection.getResponseCode() + "  message: " + connection.getResponseMessage());
-               throw new IOException("Server Response: " + connection.getResponseCode() + ": " + connection.getResponseMessage());
-            }
-
-               } catch (Exception e) {
-                       logger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "HTTP Request/Response to PAP: " + e,e);
-                       throw new PAPException("Request/Response threw :" + e);
-               } finally {
-                       // cleanup the connection
-                               if (connection != null) {
-                               try {
-                                       // For some reason trying to get the inputStream from the connection
-                                       // throws an exception rather than returning null when the InputStream does not exist.
-                                       InputStream is = null;
-                                       try {
-                                               is = connection.getInputStream();
-                                       } catch (Exception e1) {
-                                               // ignore this
-                                       }
-                                       if (is != null) {
-                                               is.close();
-                                       }
-
-                               } catch (IOException ex) {
-                                       logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Failed to close connection: " + ex, ex);
-                               }
-                               connection.disconnect();
-                       }
-               }
-       }
-
-}
-
-