Merge "Add PolicyNotification.isEmpty() method"

diff --git a/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProvider.java b/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProvider.java
index 272b4e1..5501f86 100644 (file)
--- a/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProvider.java
+++ b/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/CdsActorServiceProvider.java
@@ -111,11 +111,16 @@ public class CdsActorServiceProvider implements Actor {
         }
         String cbaName = payload.get(CdsActorConstants.KEY_CBA_NAME);
         String cbaVersion = payload.get(CdsActorConstants.KEY_CBA_VERSION);
-        String cbaActionName = policy.getRecipe();
+
+        // Retain only the payload by removing CBA name and version once they are extracted
+        // to be put in CDS request header.
+        payload.remove(CdsActorConstants.KEY_CBA_NAME);
+        payload.remove(CdsActorConstants.KEY_CBA_VERSION);
 
         // Embed payload from policy to ConfigDeployRequest object, serialize and inject into grpc request.
+        String cbaActionName = policy.getRecipe();
         CdsActionRequest request = new CdsActionRequest();
-        request.setConfigDeployProperties(payload);
+        request.setPolicyPayload(payload);
         request.setActionName(cbaActionName);
         request.setResolutionKey(UUID.randomUUID().toString());
 

diff --git a/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/beans/CdsActionRequest.java b/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/beans/CdsActionRequest.java
index 45fbbca..32f1023 100644 (file)
--- a/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/beans/CdsActionRequest.java
+++ b/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/beans/CdsActionRequest.java
@@ -39,7 +39,7 @@ public class CdsActionRequest implements Serializable {
     private static final Coder CODER = new StandardCoder();
 
     @SerializedName("policy-payload")
-    private Map<String, String> configDeployProperties;
+    private Map<String, String> policyPayload;
 
     @SerializedName("aai-properties")
     private Map<String, String> aaiProperties;