diff options
Diffstat (limited to 'mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans')
5 files changed, 169 insertions, 0 deletions
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java index 21cef1ea9f..d7dd2adfa6 100644 --- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java +++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java @@ -93,6 +93,8 @@ public class AllottedResourceCustomization extends MavenLikeVersioning { this.modelVersion = modelVersion; } + public String getModelInvariantId() { return "not yet implemented"; } + @Override public String toString () { StringBuffer sb = new StringBuffer(); diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResourceCustomization.java index 0c49f1b1a4..dc8aaadea2 100644 --- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResourceCustomization.java +++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResourceCustomization.java @@ -111,6 +111,7 @@ public class NetworkResourceCustomization extends MavenLikeVersioning{ this.created = timestamp; } + public String getModelInvariantId() { return "not yet implemented"; } @Override public String toString () { diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModule.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModule.java index a551ef864e..2b13a45531 100644 --- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModule.java +++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModule.java @@ -48,6 +48,7 @@ public class VfModule extends MavenLikeVersioning { private Integer maxInstances; private Integer initialCount; private String label; + private String modelUuid; public VfModule() { super(); @@ -191,6 +192,23 @@ public class VfModule extends MavenLikeVersioning { this.label = label; } + // Will be fixed pending finalizing of 1707 catalog db schema changes + public void setModelUuid(String modelUuid) { + this.modelUuid = modelUuid; + } + public String getModelUuid() { + return this.modelUuid; + } + public String getModelInvariantId() { + return this.modelInvariantUuid; + } + public String getVfModuleType() { + return this.type; + } + public String getVfModuleLabel() { + return this.label; + } + @Override public String toString () { StringBuffer buf = new StringBuffer(); diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java index 72f143dcc0..fa54d00ed6 100644 --- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java +++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java @@ -56,6 +56,9 @@ public class VnfResource extends MavenLikeVersioning { private String serviceModelInvariantUUID = null; private String modelCustomizationUuid = null; + private String modelUuid = null; + private String modelInstanceName = null; + private ArrayList<VfModule> vfModules; public VnfResource () { @@ -213,6 +216,24 @@ public class VnfResource extends MavenLikeVersioning { } } } + + //Placeholders for now until new design is finalized: + public void setModelUuid(String modelUuid) { + this.modelUuid = modelUuid; + } + public String getModelUuid() { + return this.modelUuid; + } + public String getModelInvariantId() { + return this.modelInvariantUuid; + } + public void setModelInstanceName(String modelInstanceName) { + this.modelInstanceName = modelInstanceName; + } + public String getModelInstanceName() { + return this.modelInstanceName; + } + @Override public String toString () { StringBuffer buf = new StringBuffer(); diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java new file mode 100644 index 0000000000..2bc6b3ead3 --- /dev/null +++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java @@ -0,0 +1,127 @@ +/*- + * ============LICENSE_START======================================================= + * OPENECOMP - MSO + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.openecomp.mso.db.catalog.beans; + +import java.sql.Timestamp; + +public class VnfResourceCustomization { + + private String modelCustomizationUuid; + private String modelInstanceName; + private Integer ecompHomed; + private String homingPolicy; + private Timestamp creationTimestamp; + private String vnfResourceModelUuid; + private Integer minInstances; + private Integer maxInstances; + private Integer availabilityZoneMaxCount; + private VnfResource vnfResource; + + public VnfResourceCustomization() { + } + + public String getModelCustomizationUuid() { + return this.modelCustomizationUuid; + } + public void setModelCustomizationUuid(String modelCustomizationUuid) { + this.modelCustomizationUuid = modelCustomizationUuid; + } + + public String getModelInstanceName() { + return this.modelInstanceName; + } + public void setModelInstanceName(String modelInstanceName) { + this.modelInstanceName = modelInstanceName; + } + + public Integer getEcompHomed() { + return this.ecompHomed; + } + public void setEcompHomed(Integer ecompHomed) { + this.ecompHomed = ecompHomed; + } + + public String getHomingPolicy() { + return this.homingPolicy; + } + public void setHomingPolicy(String homingPolicy) { + this.homingPolicy = homingPolicy; + } + + public Timestamp getCreationTimestamp() { + return this.creationTimestamp; + } + public void setCreationTimestamp(Timestamp creationTimestamp) { + this.creationTimestamp = creationTimestamp; + } + + public String getVnfResourceModelUuid() { + return this.vnfResourceModelUuid; + } + public void setVnfResourceModelUuid(String vnfResourceModelUuid) { + this.vnfResourceModelUuid = vnfResourceModelUuid; + } + public Integer getMinInstances() { + return this.minInstances; + } + public void setMinInstances(Integer minInstances) { + this.minInstances = minInstances; + } + + public Integer getMaxInstances() { + return this.maxInstances; + } + public void setMaxInstances(Integer maxInstances) { + this.maxInstances = maxInstances; + } + + public Integer getAvailabilityZoneMaxCount() { + return this.availabilityZoneMaxCount; + } + public void setAvailabilityZoneMaxCount(Integer availabilityZoneMaxCount) { + this.availabilityZoneMaxCount = availabilityZoneMaxCount; + } + + public VnfResource getVnfResource() { + return this.vnfResource; + } + public void setVnfResource(VnfResource vnfResource) { + this.vnfResource = vnfResource; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("VnfResourceCustomization: "); + sb.append("ModelCustUuid=" + this.modelCustomizationUuid); + sb.append(", ModelInstanceName=" + this.modelInstanceName); + sb.append(", ecompHomed=" + this.ecompHomed); + sb.append(", homingPolicy=" + this.homingPolicy); + sb.append(", vnfResourceModelUuid=" + this.vnfResourceModelUuid); + sb.append(", creationTimestamp=" + this.creationTimestamp); + sb.append(", minInstances=" + this.minInstances); + sb.append(", maxInstances=" + this.maxInstances); + sb.append(", availabilityZoneMaxCount=" + this.availabilityZoneMaxCount); + sb.append(", vnfResource:\n" + this.vnfResource.toString()); + return sb.toString(); + } + + + +} |