diff options
author | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:27:46 -0400 |
---|---|---|
committer | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:32:24 -0400 |
commit | 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 (patch) | |
tree | 68c0c53c9156f5aa3c6b3599ac940770f986633d /mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java | |
parent | fa1a211d28a912892fcd888569df033900eb01ee (diff) |
1710 Rebase - Second Attempt
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400
Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000
Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
Diffstat (limited to 'mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java')
-rw-r--r-- | mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java index 01369c4ecd..81409b112a 100644 --- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java +++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java @@ -22,6 +22,7 @@ package org.openecomp.mso.db.catalog.beans; import org.openecomp.mso.db.catalog.beans.Service; import org.openecomp.mso.db.catalog.beans.VnfResource; import org.openecomp.mso.db.catalog.beans.VfModule; +import java.io.Serializable; import java.util.ArrayList; /* @@ -29,12 +30,15 @@ import java.util.ArrayList; * VnfResource, 1-n VfModule, Network TBD */ -public class ServiceMacroHolder { +public class ServiceMacroHolder implements Serializable { + + private static final long serialVersionUID = 768026109321305392L; private Service service; private ArrayList<VnfResource> vnfResources; private ArrayList<NetworkResourceCustomization> networkResourceCustomizations; private ArrayList<AllottedResourceCustomization> allottedResourceCustomizations; + private ArrayList<VnfResourceCustomization> vnfResourceCustomizations; public ServiceMacroHolder() { super(); @@ -42,6 +46,7 @@ public class ServiceMacroHolder { this.vnfResources = new ArrayList<VnfResource>(); this.networkResourceCustomizations = new ArrayList<NetworkResourceCustomization>(); this.allottedResourceCustomizations = new ArrayList<AllottedResourceCustomization>(); + this.vnfResourceCustomizations = new ArrayList<VnfResourceCustomization>(); } public ServiceMacroHolder(Service service) { this(); @@ -72,6 +77,23 @@ public class ServiceMacroHolder { } } + public void setVnfResourceCustomizations(ArrayList<VnfResourceCustomization> vnfResourceCustomizations) { + this.vnfResourceCustomizations = vnfResourceCustomizations; + } + public ArrayList<VnfResourceCustomization> getVnfResourceCustomizations() { + return this.vnfResourceCustomizations; + } + public void addVnfResourceCustomizations(VnfResourceCustomization vrc) { + if (vrc != null) { + if (this.vnfResourceCustomizations != null) { + this.vnfResourceCustomizations.add(vrc); + } else { + this.vnfResourceCustomizations = new ArrayList<VnfResourceCustomization>(); + this.vnfResourceCustomizations.add(vrc); + } + } + } + public void setNetworkResourceCustomization(ArrayList<NetworkResourceCustomization> networkResourceCustomizations) { this.networkResourceCustomizations = networkResourceCustomizations; } @@ -110,6 +132,15 @@ public class ServiceMacroHolder { } else { sb.append("service: null"); } + if (this.vnfResourceCustomizations != null && this.vnfResourceCustomizations.size() > 0) { + int i=0; + sb.append("VnfResources: "); + for (VnfResourceCustomization vrc : this.vnfResourceCustomizations) { + sb.append(", vnfResourceCustomization[" + i++ + "]:" + vrc.toString()); + } + } else { + sb.append("none"); + } if (this.vnfResources != null && this.vnfResources.size() > 0) { int i=0; sb.append("VnfResources: "); |