Add "source" to PAP-PDP messages

[policy/models.git] / models-pdp / src / main / java / org / onap / policy / models / pdp / concepts / PdpUpdate.java

diff --git a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java
index 0c088b8..aa2b85d 100644 (file)
--- a/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java
+++ b/models-pdp/src/main/java/org/onap/policy/models/pdp/concepts/PdpUpdate.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property.
+ *  Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property.
  *  Modifications Copyright (C) 2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,6 +44,11 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 @ToString(callSuper = true)
 public class PdpUpdate extends PdpMessage {
 
+    /**
+     * System from which the message originated.
+     */
+    private String source;
+
     /**
      * Description of the PDP group.
      */
@@ -51,14 +56,6 @@ public class PdpUpdate extends PdpMessage {
 
     private Long pdpHeartbeatIntervalMs;
 
-    /**
-     * Policies that the PDP should deploy. This is a complete list, so PDPs should be
-     * prepared to deploy new policies listed and undeploy policies that are no longer
-     * listed. Note: this list may be empty, as a PDP may remain attached to a subgroup
-     * even if all of the policies are removed from the subgroup.
-     */
-    private List<ToscaPolicy> policies = new LinkedList<>();
-
     /**
      * Policies that the PDP should deploy.
      */
@@ -85,9 +82,12 @@ public class PdpUpdate extends PdpMessage {
     public PdpUpdate(PdpUpdate source) {
         super(source);
 
+        this.source = source.source;
         this.description = source.description;
         this.pdpHeartbeatIntervalMs = source.pdpHeartbeatIntervalMs;
-        this.policies = (source.policies == null ? null
-                        : source.policies.stream().map(ToscaPolicy::new).collect(Collectors.toList()));
+        this.policiesToBeDeployed = (source.policiesToBeDeployed == null ? null
+                : source.policiesToBeDeployed.stream().map(ToscaPolicy::new).collect(Collectors.toList()));
+        this.policiesToBeUndeployed = (source.policiesToBeUndeployed == null ? null
+                : source.policiesToBeUndeployed.stream().map(ToscaConceptIdentifier::new).collect(Collectors.toList()));
     }
 }