AT&T 1712 and 1802 release code

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

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/HomingSolution.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/HomingSolution.java
index c038866..4050657 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/HomingSolution.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/HomingSolution.java
@@ -23,32 +23,47 @@ package org.openecomp.mso.bpmn.core.domain;
 import java.io.Serializable;\r
 import java.util.List;\r
 \r
+import com.fasterxml.jackson.annotation.JsonInclude;\r
 import com.fasterxml.jackson.annotation.JsonRootName;\r
 \r
+/**\r
+ * Stores resources placement and licensing information\r
+ *\r
+ */\r
 @JsonRootName("homingSolution")\r
-public class HomingSolution  extends JsonWrapper implements Serializable  {\r
+@JsonInclude(JsonInclude.Include.NON_NULL)\r
+public class HomingSolution extends JsonWrapper implements Serializable  {\r
 \r
        private static final long serialVersionUID = 1L;\r
 \r
        private InventoryType inventoryType;\r
-       private String serviceInstanceId;\r
-       private String vnfHostname;\r
+       private boolean isRehome;\r
+       private String serviceInstanceId; //TODO should start using si object instead\r
        private String cloudOwner;\r
        private String cloudRegionId;\r
        private String aicClli;\r
        private String aicVersion;\r
-       private String ucpeId; //TODO Remove?\r
-       private List<String> entitlementPoolList;\r
-       private List<String> licenseKeyGroupList;\r
+       private String tenant;\r
+       private VnfResource vnf;\r
+       private License license = new License();\r
 \r
 \r
-       public InventoryType getInventoryType(){\r
+       /**\r
+        * @return the inventoryType which indicates the solution type\r
+        */\r
+       public InventoryType getInventoryType() {\r
                return inventoryType;\r
        }\r
 \r
-       public void setInventoryType(InventoryType inventoryType){\r
+       public void setInventoryType(InventoryType inventoryType) {\r
                this.inventoryType = inventoryType;\r
        }\r
+       public boolean isRehome() {\r
+               return isRehome;\r
+       }\r
+       public void setRehome(boolean isRehome) {\r
+               this.isRehome = isRehome;\r
+       }\r
 \r
        public String getServiceInstanceId() {\r
                return serviceInstanceId;\r
@@ -58,21 +73,11 @@ public class HomingSolution  extends JsonWrapper implements Serializable  {
                this.serviceInstanceId = serviceInstanceId;\r
        }\r
 \r
-       public String getVnfHostname(){\r
-               return vnfHostname;\r
-       }\r
-\r
-       public void setVnfHostname(String vnfHostname){\r
-               this.vnfHostname = vnfHostname;\r
-       }\r
-\r
-\r
-       public String getCloudOwner(){\r
+       public String getCloudOwner() {\r
                return cloudOwner;\r
        }\r
 \r
-\r
-       public void setCloudOwner(String cloudOwner){\r
+       public void setCloudOwner(String cloudOwner) {\r
                this.cloudOwner = cloudOwner;\r
        }\r
 \r
@@ -83,48 +88,56 @@ public class HomingSolution  extends JsonWrapper implements Serializable  {
        public void setCloudRegionId(String cloudRegionId) {\r
                this.cloudRegionId = cloudRegionId;\r
        }\r
-\r
-\r
-       public String getAicClli(){\r
+       /**\r
+        * @return the aicClli (aka aic site, physical location id)\r
+        */\r
+       public String getAicClli() {\r
                return aicClli;\r
        }\r
 \r
-\r
-       public void setAicClli(String aicClli){\r
+       public void setAicClli(String aicClli) {\r
                this.aicClli = aicClli;\r
        }\r
 \r
-\r
-       public String getAicVersion(){\r
+       public String getAicVersion() {\r
                return aicVersion;\r
        }\r
 \r
-\r
-       public void setAicVersion(String aicVersion){\r
+       public void setAicVersion(String aicVersion) {\r
                this.aicVersion = aicVersion;\r
        }\r
 \r
-       public String getUcpeId(){\r
-               return ucpeId;\r
+       public String getTenant() {\r
+               return tenant;\r
        }\r
 \r
-       public void setUcpeId(String ucpeId){\r
-               this.ucpeId = ucpeId;\r
+       public void setTenant(String tenant) {\r
+               this.tenant = tenant;\r
        }\r
 \r
-       public List<String> getEntitlementPoolList(){\r
-               return entitlementPoolList;\r
+       /**\r
+        * @return the vnf that the resource was homed too.\r
+        */\r
+       public VnfResource getVnf() {\r
+               return vnf;\r
        }\r
 \r
-       public void setEntitlementPoolList(List<String> entitlementPoolList){\r
-               this.entitlementPoolList = entitlementPoolList;\r
+       public void setVnf(VnfResource vnf) {\r
+               this.vnf = vnf;\r
        }\r
 \r
-       public List<String> getLicenseKeyGroupList(){\r
-               return licenseKeyGroupList;\r
+       public License getLicense() {\r
+               return license;\r
        }\r
 \r
-       public void setLicenseKeyGroupList(List<String> licenseKeyGroupList){\r
-               this.licenseKeyGroupList = licenseKeyGroupList;\r
+       public void setLicense(License license) {\r
+               this.license = license;\r
        }\r
+\r
+\r
+       public static long getSerialversionuid() {\r
+               return serialVersionUID;\r
+       }\r
+\r
+\r
 }
\ No newline at end of file