AT&T 1712 and 1802 release code

[so.git] / bpmn / MSOCoreBPMN / src / main / java / org / openecomp / mso / bpmn / core / domain / Resource.java

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/Resource.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/Resource.java
index 60c4fce..ce5ad47 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/Resource.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/Resource.java
@@ -23,20 +23,23 @@ package org.openecomp.mso.bpmn.core.domain;
 import java.io.Serializable;\r
 \r
 import com.fasterxml.jackson.annotation.JsonIgnore;\r
+import com.fasterxml.jackson.annotation.JsonInclude;\r
 \r
 \r
 \r
 public abstract class Resource extends JsonWrapper  implements Serializable {\r
 \r
        private static final long serialVersionUID = 1L;\r
-       private String resourceId;\r
+       private String resourceId; // TODO name this field just id instead, should be the id of the object as it is in aai\r
        protected ResourceType resourceType; // Enum of vnf or network or allotted resource\r
        protected ModelInfo modelInfo;\r
        private long concurrencyCounter = 1L;\r
 \r
        //private List modules;\r
        private ResourceInstance resourceInstance = new ResourceInstance(); // TODO possibly remove\r
-       private HomingSolution homingSolution = new HomingSolution(); // TODO maybe this instead of resourceInstance being "bridge"\r
+       private HomingSolution homingSolution = new HomingSolution();\r
+       @JsonInclude(JsonInclude.Include.NON_NULL)\r
+       private HomingSolution currentHomingSolution;\r
 \r
        //common parameters for all Resources\r
        private String toscaNodeType;\r
@@ -68,6 +71,12 @@ public abstract class Resource extends JsonWrapper  implements Serializable {
        public void setHomingSolution(HomingSolution homingSolution){\r
                this.homingSolution = homingSolution;\r
        }\r
+       public HomingSolution getCurrentHomingSolution() {\r
+               return currentHomingSolution;\r
+       }\r
+       public void setCurrentHomingSolution(HomingSolution currentHomingSolution) {\r
+               this.currentHomingSolution = currentHomingSolution;\r
+       }\r
        public void setResourceType(ResourceType resourceType) {\r
                this.resourceType = resourceType;\r
        }\r