X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Floop%2Fcomponents%2Fexternal%2FPolicyComponent.java;h=8270a96e3ad6fa10bfc7f6bd05a897a95533d5a6;hb=e47a29578a2287a96ae13d1867925feab53a6526;hp=d47bc9644864b78e02e06317bcfcf1c74cdf573d;hpb=ae6a9829f0c572cb4789812ea65871132ec861fd;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
index d47bc964..8270a96e 100644
--- a/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
+++ b/src/main/java/org/onap/clamp/loop/components/external/PolicyComponent.java
@@ -28,14 +28,14 @@ import com.att.eelf.configuration.EELFManager;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
-
+import java.util.Map;
+import java.util.Map.Entry;
 import javax.persistence.Transient;
-
 import org.apache.camel.Exchange;
-import org.onap.clamp.clds.util.JsonUtils;
 import org.onap.clamp.loop.Loop;
 import org.onap.clamp.policy.microservice.MicroServicePolicy;
 import org.onap.clamp.policy.operational.OperationalPolicy;
@@ -54,7 +54,7 @@ public class PolicyComponent extends ExternalComponent {
     public static final ExternalComponentState SENT_AND_DEPLOYED = new ExternalComponentState("SENT_AND_DEPLOYED",
             "The policies defined have been created and deployed on the policy engine", 10);
     public static final ExternalComponentState UNKNOWN = new ExternalComponentState("UNKNOWN",
-            "The current status is not clear. Need to regresh the status to get the current status.", 0);
+            "The current status is not clear. Need to refresh the status to get the current status.", 0);
 
     /**
      * Default constructor.
@@ -80,44 +80,81 @@ public class PolicyComponent extends ExternalComponent {
      * @return The json, payload to send
      */
     public static String createPoliciesPayloadPdpGroup(Loop loop) {
-        JsonObject jsonObject = new JsonObject();
-        JsonArray jsonArray = new JsonArray();
-        jsonObject.add("groups", jsonArray);
-
+        Map<String, Map<String, List<JsonObject>>> pdpGroupMap = new HashMap<>();
         for (OperationalPolicy opPolicy : loop.getOperationalPolicies()) {
-            jsonArray.add(createPdpDeploymentPayload(opPolicy.getPdpGroup(), opPolicy.getPdpSubGroup(),
-                    opPolicy.getPolicyModel().getPolicyModelType(), opPolicy.getPolicyModel().getVersion()));
+            updatePdpGroupMap(opPolicy.getPdpGroup(), opPolicy.getPdpSubgroup(),
+                    opPolicy.getName(),
+                    opPolicy.getPolicyModel().getVersion(), pdpGroupMap);
         }
 
         for (MicroServicePolicy msPolicy : loop.getMicroServicePolicies()) {
-            jsonArray.add(createPdpDeploymentPayload(msPolicy.getPdpGroup(), msPolicy.getPdpSubGroup(),
-                    msPolicy.getPolicyModel().getPolicyModelType(), msPolicy.getPolicyModel().getVersion()));
+            updatePdpGroupMap(msPolicy.getPdpGroup(), msPolicy.getPdpSubgroup(),
+                    msPolicy.getName(),
+                    msPolicy.getPolicyModel().getVersion(), pdpGroupMap);
         }
 
-        String payload = new GsonBuilder().setPrettyPrinting().create().toJson(jsonObject);
+        String payload = new GsonBuilder().setPrettyPrinting().create()
+                .toJson(generateActivatePdpGroupPayload(pdpGroupMap));
         logger.info("PdpGroup policy payload: " + payload);
-        return new GsonBuilder().setPrettyPrinting().create().toJson(jsonObject);
+        return payload;
     }
 
-    private static JsonObject createPdpDeploymentPayload(String pdpGroup, String pdpSubGroup,
-            String policyType, String version) {
-        JsonObject pdpGroupNode = new JsonObject();
-        JsonArray subPdpArray = new JsonArray();
-        pdpGroupNode.addProperty("name", pdpGroup);
-        pdpGroupNode.add("deploymentSubgroups", subPdpArray);
-
-        JsonObject pdpSubGroupNode = new JsonObject();
-        subPdpArray.add(pdpSubGroupNode);
-        pdpSubGroupNode.addProperty("pdpType", pdpSubGroup);
-        pdpSubGroupNode.addProperty("action", "POST");
-
-        JsonArray policyArray = new JsonArray();
-        pdpSubGroupNode.add("policies", policyArray);
-        JsonObject policyNode = new JsonObject();
-        policyNode.addProperty("name", policyType);
-        policyNode.addProperty("version", version);
-        policyArray.add(policyNode);
-        return pdpGroupNode;
+    private static void updatePdpGroupMap(String pdpGroup,
+                                          String pdpSubGroup,
+                                          String policyName,
+                                          String policyModelVersion,
+                                          Map<String, Map<String,
+                                                  List<JsonObject>>> pdpGroupMap) {
+        JsonObject policyJson = new JsonObject();
+        policyJson.addProperty("name", policyName);
+        policyJson.addProperty("version", policyModelVersion);
+        Map<String, List<JsonObject>> pdpSubGroupMap;
+        List<JsonObject> policyList;
+        if (pdpGroupMap.get(pdpGroup) == null) {
+            pdpSubGroupMap = new HashMap<>();
+            policyList = new LinkedList<>();
+        }
+        else {
+            pdpSubGroupMap = pdpGroupMap.get(pdpGroup);
+            if (pdpSubGroupMap.get(pdpSubGroup) == null) {
+                policyList = new LinkedList<>();
+            }
+            else {
+                policyList = (List<JsonObject>) pdpSubGroupMap.get(pdpSubGroup);
+            }
+        }
+        policyList.add(policyJson);
+        pdpSubGroupMap.put(pdpSubGroup, policyList);
+        pdpGroupMap.put(pdpGroup, pdpSubGroupMap);
+    }
+
+    private static JsonObject generateActivatePdpGroupPayload(
+            Map<String, Map<String, List<JsonObject>>> pdpGroupMap) {
+        JsonArray payloadArray = new JsonArray();
+        for (Entry<String, Map<String, List<JsonObject>>> pdpGroupInfo : pdpGroupMap.entrySet()) {
+            JsonObject pdpGroupNode = new JsonObject();
+            JsonArray subPdpArray = new JsonArray();
+            pdpGroupNode.addProperty("name", pdpGroupInfo.getKey());
+            pdpGroupNode.add("deploymentSubgroups", subPdpArray);
+
+            for (Entry<String, List<JsonObject>> pdpSubGroupInfo : pdpGroupInfo.getValue().entrySet()) {
+                JsonObject pdpSubGroupNode = new JsonObject();
+                subPdpArray.add(pdpSubGroupNode);
+                pdpSubGroupNode.addProperty("pdpType", pdpSubGroupInfo.getKey());
+                pdpSubGroupNode.addProperty("action", "POST");
+
+                JsonArray policyArray = new JsonArray();
+                pdpSubGroupNode.add("policies", policyArray);
+
+                for (JsonObject policy : pdpSubGroupInfo.getValue()) {
+                    policyArray.add(policy);
+                }
+            }
+            payloadArray.add(pdpGroupNode);
+        }
+        JsonObject jsonObject = new JsonObject();
+        jsonObject.add("groups", payloadArray);
+        return jsonObject;
     }
 
     /**
@@ -130,13 +167,12 @@ public class PolicyComponent extends ExternalComponent {
         List<String> policyNamesList = new ArrayList<>();
         for (OperationalPolicy opPolicy : loop.getOperationalPolicies()) {
             policyNamesList.add(opPolicy.getName());
-            for (String guardName : opPolicy.createGuardPolicyPayloads().keySet()) {
-                policyNamesList.add(guardName);
-            }
+            policyNamesList.addAll(opPolicy.createGuardPolicyPayloads().keySet());
         }
         for (MicroServicePolicy microServicePolicy : loop.getMicroServicePolicies()) {
             policyNamesList.add(microServicePolicy.getName());
         }
+        logger.info("Policies that will be removed from PDP:  " + policyNamesList);
         return policyNamesList;
     }
 
@@ -145,16 +181,18 @@ public class PolicyComponent extends ExternalComponent {
         ExternalComponentState newState = NOT_SENT;
         if (found && deployed) {
             newState = SENT_AND_DEPLOYED;
-        } else if (found) {
+        }
+        else if (found) {
             newState = SENT;
-        } else if (deployed) {
+        }
+        else if (deployed) {
             newState = IN_ERROR;
         }
         return newState;
     }
 
     private static ExternalComponentState mergeStates(ExternalComponentState oldState,
-            ExternalComponentState newState) {
+                                                      ExternalComponentState newState) {
         return (oldState.compareTo(newState) < 0) ? newState : oldState;
     }
 
@@ -165,7 +203,6 @@ public class PolicyComponent extends ExternalComponent {
      * this method is called multiple times from the camel route and must be reset
      * for a new global policy state retrieval. The state to compute the global
      * policy state is stored in this class.
-     * 
      */
     @Override
     public ExternalComponentState computeState(Exchange camelExchange) {