aboutsummaryrefslogtreecommitdiffstats
path: root/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans
diff options
context:
space:
mode:
Diffstat (limited to 'mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans')
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResource.java93
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java155
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ArRecipe.java42
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java104
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java128
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java109
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplate.java174
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java80
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParam.java97
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java201
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java184
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java42
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResource.java209
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResourceCustomization.java146
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java129
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java190
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java171
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java150
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResources.java90
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java94
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java110
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java100
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java116
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModule.java175
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java155
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java55
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java119
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java62
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java54
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java92
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java283
-rw-r--r--mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java203
32 files changed, 0 insertions, 4112 deletions
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResource.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResource.java
deleted file mode 100644
index a0af4b2300..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResource.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class AllottedResource extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String modelUuid = null;
- private String modelInvariantUuid = null;
- private String modelVersion = null;
- private String modelName = null;
- private String toscaNodeType = null;
- private String subcategory = null;
- private String description = null;
- private Timestamp created = null;
-
- public AllottedResource() {
- }
-
- public String getModelUuid() {
- return this.modelUuid;
- }
- public void setModelUuid(String modelUuid) {
- this.modelUuid = modelUuid;
- }
- public String getModelInvariantUuid() {
- return this.modelInvariantUuid;
- }
- public void setModelInvariantUuid(String modelInvariantUuid) {
- this.modelInvariantUuid = modelInvariantUuid;
- }
- public String getModelVersion() {
- return this.modelVersion;
- }
- public void setModelVersion(String modelVersion) {
- this.modelVersion = modelVersion;
- }
- public String getModelName() {
- return this.modelName;
- }
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
- public String getToscaNodeType() {
- return this.toscaNodeType;
- }
- public void setToscaNodeType(String toscaNodeType) {
- this.toscaNodeType = toscaNodeType;
- }
- public String getSubcategory() {
- return this.subcategory;
- }
- public void setSubcategory(String subcategory) {
- this.subcategory = subcategory;
- }
- public String getDescription() {
- return this.description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public Timestamp getCreated() {
- return created;
- }
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
-}
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
deleted file mode 100644
index e5a653760b..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-import org.openecomp.mso.db.catalog.beans.AllottedResource;
-
-public class AllottedResourceCustomization extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String modelCustomizationUuid = null;
- private String arModelUuid = null;
- private Timestamp created = null;
- private String modelInstanceName = null;
- private String providingServiceModelInvariantUuid = null;
- private String targetNetworkRole = null;
- private String nfFunction = null;
- private String nfType = null;
- private String nfRole = null;
- private String nfNamingCode = null;
- private Integer minInstances;
- private Integer maxInstances;
- private AllottedResource allottedResource = null;
- private String providingServiceModelUuid = null;
- private String providingServiceModelName = null;
-
- public AllottedResourceCustomization() {
- super();
- }
-
- public String getModelCustomizationUuid() {
- return this.modelCustomizationUuid;
- }
- public void setModelCustomizationUuid(String modelCustomizationUuid) {
- this.modelCustomizationUuid = modelCustomizationUuid;
- }
-
- public String getArModelUuid() {
- return this.arModelUuid;
- }
- public void setArModelUuid(String arModelUuid) {
- this.arModelUuid = arModelUuid;
- }
-
- public Timestamp getCreated() {
- return this.created;
- }
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- public String getModelInstanceName() {
- return this.modelInstanceName;
- }
- public void setModelInstanceName(String modelInstanceName) {
- this.modelInstanceName = modelInstanceName;
- }
- public AllottedResource getAllottedResource() {
- return this.allottedResource;
- }
- public void setAllottedResource(AllottedResource ar) {
- this.allottedResource = ar;
- }
- public String getProvidingServiceModelInvariantUuid() {
- return this.providingServiceModelInvariantUuid;
- }
- public void setProvidingServiceModelInvariantUuid(String providingServiceModelInvariantUuid) {
- this.providingServiceModelInvariantUuid = providingServiceModelInvariantUuid;
- }
- public String getTargetNetworkRole() {
- return this.targetNetworkRole;
- }
- public void setTargetNetworkRole(String targetNetworkRole) {
- this.targetNetworkRole = targetNetworkRole;
- }
- public String getNfFunction() {
- return this.nfFunction;
- }
- public void setNfFunction(String nfFunction) {
- this.nfFunction = nfFunction;
- }
- public String getNfType() {
- return this.nfType;
- }
- public void setNfType(String nfType) {
- this.nfType = nfType;
- }
- public String getNfRole() {
- return this.nfRole;
- }
- public void setNfRole(String nfRole) {
- this.nfRole = nfRole;
- }
- public String getNfNamingCode() {
- return this.nfNamingCode;
- }
- public void setNfNamingCode(String nfNamingCode) {
- this.nfNamingCode = nfNamingCode;
- }
- 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 String getProvidingServiceModelUuid() {
- return this.providingServiceModelUuid;
- }
- public void setProvidingServiceModelUuid(String providingServiceModelUuid) {
- this.providingServiceModelUuid = providingServiceModelUuid;
- }
- public String getProvidingServiceModelName() {
- return this.providingServiceModelName;
- }
- public void setProvidingServiceModelName(String providingServiceModelName) {
- this.providingServiceModelName = providingServiceModelName;
- }
-
- @Override
- public String toString () {
- return "modelCustomizationUuid=" + this.modelCustomizationUuid +
- ",modelInstanceName=" + this.modelInstanceName +
- ",modelInstanceName=" + this.modelInstanceName +
- ",created=" + this.created +
- ",ar=" + this.allottedResource;
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ArRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ArRecipe.java
deleted file mode 100644
index d3532886d5..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ArRecipe.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 Huawei Technologies Co., Ltd. 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.io.Serializable;
-
-public class ArRecipe extends Recipe implements Serializable {
- private static final long serialVersionUID = 768026109321305392L;
- private String modelName = null;
- public ArRecipe() {}
-
- public String getModelName() {
- return modelName;
- }
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- @Override
- public String toString () {
- return super.toString() + ",modelName=" + modelName + ",arParamXSD=" + getParamXSD();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java
deleted file mode 100644
index 8baf62018c..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatEnvironment.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class HeatEnvironment extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String artifactUuid = null;
- private String name = null;
- private String description = null;
- private String environment = null;
- private String artifactChecksum = null;
-
- private Timestamp created = null;
-
- public String getArtifactUuid() {
- return this.artifactUuid;
- }
- public void setArtifactUuid(String artifactUuid) {
- this.artifactUuid = artifactUuid;
- }
-
- public String getName () {
- return name;
- }
-
- public void setName (String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return this.description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getEnvironment() {
- return this.environment;
- }
- public void setEnvironment(String environment) {
- this.environment = environment;
- }
-
- public String getArtifactChecksum() {
- return artifactChecksum;
- }
-
- public void setArtifactChecksum(String artifactChecksum) {
- this.artifactChecksum = artifactChecksum;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- @Override
- public String toString () {
- StringBuilder sb = new StringBuilder();
- sb.append("Artifact UUID=").append(this.artifactUuid);
- sb.append (", name=");
- sb.append (name);
- sb.append (", version=");
- sb.append (version);
- sb.append(", description=");
- sb.append (this.description == null ? "null" : this.description);
- sb.append(", body=");
- sb.append (this.environment == null ? "null" : this.environment);
- if (this.created != null) {
- sb.append (",creationTimestamp=");
- sb.append (DateFormat.getInstance().format(this.created));
- }
- return sb.toString();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java
deleted file mode 100644
index 542cd45081..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatFiles.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class HeatFiles extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String artifactUuid = null;
- private String description = null;
- private String fileName = null;
- private String fileBody = null;
- private Timestamp created = null;
- private String version = null;
- private String artifactChecksum = null;
-
-
- public String getArtifactUuid() {
- return this.artifactUuid;
- }
- public void setArtifactUuid(String artifactUuid) {
- this.artifactUuid = artifactUuid;
- }
-
- public String getDescription() {
- return this.description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getFileName() {
- return this.fileName;
- }
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
- public String getFileBody() {
- return this.fileBody;
- }
- public void setFileBody(String fileBody) {
- this.fileBody = fileBody;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- public String getAsdcUuid() {
- return this.artifactUuid;
- }
- public void setAsdcUuid(String artifactUuid) {
- this.artifactUuid = artifactUuid;
- }
-
- @Override
- public String getVersion() {
- return version;
- }
-
- @Override
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getArtifactChecksum() {
- return artifactChecksum;
- }
- public void setArtifactChecksum(String artifactChecksum) {
- this.artifactChecksum = artifactChecksum;
- }
-
- @Override
- public String toString () {
- StringBuilder sb = new StringBuilder();
- sb.append("artifactUuid=").append(this.artifactUuid);
- if (this.description == null) {
- sb.append(", description=null");
- } else {
- sb.append(", description=").append(this.description);
- }
- if (this.fileName == null) {
- sb.append(", fileName=null");
- } else {
- sb.append(",fileName=").append(this.fileName);
- }
- if (this.fileBody == null) {
- sb.append(", fileBody=null");
- } else {
- sb.append(",fileBody=").append(this.fileBody);
- }
- sb.append(", artifactChecksum=").append(this.artifactChecksum);
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
- return sb.toString();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
deleted file mode 100644
index 1fff17612e..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatNestedTemplate.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-public class HeatNestedTemplate implements Serializable {
-
- @BusinessKey
- private String parentTemplateId = null;
- @BusinessKey
- private String childTemplateId = null;
- private String providerResourceFile = null;
- public static final long serialVersionUID = -1322322139926390329L;
-
- public HeatNestedTemplate () {
- super ();
- }
-
- public void setParentTemplateId (String parentTemplateId) {
- this.parentTemplateId = parentTemplateId;
- }
-
- public String getParentTemplateId () {
- return this.parentTemplateId;
- }
-
- public void setChildTemplateId (String childTemplateId) {
- this.childTemplateId = childTemplateId;
- }
-
- public String getChildTemplateId () {
- return this.childTemplateId;
- }
-
- public void setProviderResourceFile (String providerResourceFile) {
- this.providerResourceFile = providerResourceFile;
- }
-
- public String getProviderResourceFile () {
- return this.providerResourceFile;
- }
-
- @Override
- public String toString () {
- StringBuilder sb = new StringBuilder ();
- sb.append("ParentTemplateId=").append(this.parentTemplateId);
- sb.append(", ChildTemplateId=").append(this.childTemplateId);
- if (this.providerResourceFile == null) {
- sb.append (", providerResourceFile=null");
- } else {
- sb.append(",providerResourceFile=").append(this.providerResourceFile);
- }
- return sb.toString ();
- }
-
- @Override
- public boolean equals (Object o) {
- if (!(o instanceof HeatNestedTemplate)) {
- return false;
- }
- if (this == o) {
- return true;
- }
- HeatNestedTemplate hnt = (HeatNestedTemplate) o;
- if (hnt.getChildTemplateId () == this.childTemplateId && hnt.getParentTemplateId () == this.parentTemplateId) {
- return true;
- }
- return false;
- }
-
- @Override
- public int hashCode () {
- // hash code does not have to be a unique result - only that two objects that should be treated as equal
- // return the same value. so this should work.
- int result;
- int parentTemplateIdHash = 0;
- int childTemplateIdHash = 0;
- if (this.parentTemplateId != null) {
- parentTemplateIdHash = this.parentTemplateId.hashCode();
- }
- if (this.childTemplateId != null) {
- childTemplateIdHash = this.childTemplateId.hashCode();
- }
- result = parentTemplateIdHash + childTemplateIdHash;
- return result;
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplate.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplate.java
deleted file mode 100644
index c6386efdd6..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplate.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.util.Set;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class HeatTemplate extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String artifactUuid = null;
- private String templateName = null;
- private String templateBody = null;
- private int timeoutMinutes;
- private Set <HeatTemplateParam> parameters;
- private Set <HeatNestedTemplate> files;
- private String description = null;
- private String asdcUuid = null;
- private String artifactChecksum = null;
-
- private Timestamp created = null;
-
- public enum TemplateStatus {
- PARENT, CHILD, PARENT_COMPLETE
- }
-
- public HeatTemplate () {
- }
-
- public String getArtifactUuid() {
- return this.artifactUuid;
- }
-
- public void setArtifactUuid (String artifactUuid) {
- this.artifactUuid = artifactUuid;
- }
-
- public String getTemplateName () {
- return templateName;
- }
-
- public void setTemplateName (String templateName) {
- this.templateName = templateName;
- }
-
- public String getTemplateBody () {
- return templateBody;
- }
-
- public void setTemplateBody (String templateBody) {
- this.templateBody = templateBody;
- }
-
- public int getTimeoutMinutes () {
- return timeoutMinutes;
- }
-
- public void setTimeoutMinutes (int timeout) {
- this.timeoutMinutes = timeout;
- }
-
- public Set <HeatTemplateParam> getParameters () {
- return parameters;
- }
-
- public void setParameters (Set <HeatTemplateParam> parameters) {
- this.parameters = parameters;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getHeatTemplate () {
- return this.templateBody;
- }
-
- public void setFiles (Set <HeatNestedTemplate> files) {
- this.files = files;
- }
-
- public Set <HeatNestedTemplate> getFiles () {
- return this.files;
- }
-
- public String getAsdcUuid() {
- return asdcUuid;
- }
-
- public void setAsdcUuid(String asdcUuidp) {
- this.asdcUuid = asdcUuidp;
- }
-
- public String getArtifactChecksum() {
- return artifactChecksum;
- }
-
- public void setArtifactChecksum(String artifactChecksum) {
- this.artifactChecksum = artifactChecksum;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- @Override
- public String toString () {
- String body = (templateBody != null) ? "(" + templateBody.length () + " chars)" : "(Not defined)";
- StringBuilder sb = new StringBuilder ();
- sb.append ("Template=")
- .append (templateName)
- .append (",version=")
- .append (version)
- .append (",body=")
- .append (body)
- .append (",timeout=")
- .append (timeoutMinutes)
- .append (",asdcUuid=")
- .append (asdcUuid)
- .append (",description=")
- .append (description);
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
-
-
- if (parameters != null && !parameters.isEmpty ()) {
- sb.append (",params=[");
- for (HeatTemplateParam param : parameters) {
- sb.append (param.getParamName ());
- if (param.isRequired ()) {
- sb.append ("(reqd)");
- }
- sb.append (",");
- }
- sb.replace (sb.length () - 1, sb.length (), "]");
- }
- return sb.toString ();
- }
-
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java
deleted file mode 100644
index 9bfc41b675..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateArtifactUuidModelUuid.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-// an embeddable class to represent the Composite key for NetworkResource in the 1707 db refactoring
-public class HeatTemplateArtifactUuidModelUuid implements Serializable {
-
- @BusinessKey
- private String heatTemplateArtifactUuid = null;
- @BusinessKey
- private String modelUuid = null;
- public static final long serialVersionUID = -1322322139926390329L;
-
- public HeatTemplateArtifactUuidModelUuid() {
- }
-
- public String getHeatTemplateArtifactUuid() {
- return this.heatTemplateArtifactUuid;
- }
- public void setHeatTemplateArtifactUuid(String heatTemplateArtifactUuid) {
- this.heatTemplateArtifactUuid = heatTemplateArtifactUuid;
- }
- public String getModelUuid() {
- return this.modelUuid;
- }
- public void setModelUuid(String modelUuid) {
- this.modelUuid = modelUuid;
- }
-
- @Override
- public String toString() {
- return "heatTemplateArtifactUuid=" + this.heatTemplateArtifactUuid + " modelUuid=" + this.modelUuid;
- }
-
- @Override
- public boolean equals (Object o) {
- if (!(o instanceof HeatTemplateArtifactUuidModelUuid)) {
- return false;
- }
- if (this == o) {
- return true;
- }
- HeatTemplateArtifactUuidModelUuid htaumu = (HeatTemplateArtifactUuidModelUuid) o;
- if (htaumu.getHeatTemplateArtifactUuid().equals(this.getHeatTemplateArtifactUuid())
- && htaumu.getModelUuid().equals(this.getModelUuid())) {
- return true;
- }
- return false;
- }
-
- @Override
- public int hashCode () {
- // hash code does not have to be a unique result - only that two objects that should be treated as equal
- // return the same value. so this should work.
- return this.heatTemplateArtifactUuid.hashCode() + this.modelUuid.hashCode();
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParam.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParam.java
deleted file mode 100644
index 7f7dd2b4c6..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/HeatTemplateParam.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-public class HeatTemplateParam implements Serializable {
-
- @BusinessKey
- private String heatTemplateArtifactUuid = null;
- @BusinessKey
- private String paramName = null;
- private boolean required;
- private String paramType = null;
- private String paramAlias = null;
- public static final long serialVersionUID = -1322322139926390329L;
-
- public HeatTemplateParam() {}
-
- public String getHeatTemplateArtifactUuid() {
- return this.heatTemplateArtifactUuid;
- }
- public void setHeatTemplateArtifactUuid(String heatTemplateArtifactUuid) {
- this.heatTemplateArtifactUuid = heatTemplateArtifactUuid;
- }
-
- public String getParamName() {
- return paramName;
- }
- public void setParamName(String paramName) {
- this.paramName = paramName;
- }
- public boolean isRequired() {
- return required;
- }
- public void setRequired(boolean required) {
- this.required = required;
- }
- public String getParamAlias() {
- return paramAlias;
- }
- public void setParamAlias(String paramAlias) {
- this.paramAlias = paramAlias;
- }
-
- public String getParamType() {
- return paramType;
- }
- public void setParamType (String paramType) {
- this.paramType = paramType;
- }
-
-
- @Override
- public String toString () {
- return "Param=" + paramName + ",type=" + paramType + ",required=" + required + ",paramAlias=" + paramAlias + ", heatTemplateArtifactUuid=" + this.heatTemplateArtifactUuid;
- }
-
- @Override
- public boolean equals(final Object other) {
- if (!(other instanceof HeatTemplateParam)) {
- return false;
- }
- HeatTemplateParam castOther = (HeatTemplateParam) other;
- return new EqualsBuilder().append(heatTemplateArtifactUuid, castOther.heatTemplateArtifactUuid)
- .append(paramName, castOther.paramName).isEquals();
- }
-
- @Override
- public int hashCode () {
- int result;
- result = this.paramName == null ? 0 : this.paramName.hashCode() + this.heatTemplateArtifactUuid == null ? 0 : this.heatTemplateArtifactUuid.hashCode();
- return result;
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java
deleted file mode 100644
index 5cd6b58aee..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Model.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.util.Map;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-public class Model extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private int id;
- private String modelCustomizationId = null;
- private String modelCustomizationName = null;
- private String modelInvariantId = null;
- private String modelName = null;
- private String modelType = null;
- private String modelVersion = null;
- private String modelVersionId = null;
- private Timestamp created = null;
- private Map<String,ServiceRecipe> recipes;
-
- /**
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * @param id the id to set
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return the modelCustomizationId
- */
- public String getModelCustomizationId() {
- return modelCustomizationId;
- }
-
- /**
- * @param modelCustomizationId the modelCustomizationId to set
- */
- public void setModelCustomizationId(String modelCustomizationId) {
- this.modelCustomizationId = modelCustomizationId;
- }
-
- /**
- * @return the modelCustomizationName
- */
- public String getModelCustomizationName() {
- return modelCustomizationName;
- }
-
- /**
- * @param modelCustomizationName the modelCustomizationName to set
- */
- public void setModelCustomizationName(String modelCustomizationName) {
- this.modelCustomizationName = modelCustomizationName;
- }
-
- /**
- * @return the modelInvariantId
- */
- public String getModelInvariantId() {
- return modelInvariantId;
- }
-
- /**
- * @param modelInvariantId the modelInvariantId to set
- */
- public void setModelInvariantId(String modelInvariantId) {
- this.modelInvariantId = modelInvariantId;
- }
-
- /**
- * @return the modelName
- */
- public String getModelName() {
- return modelName;
- }
-
- /**
- * @param modelName the modelName to set
- */
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- /**
- * @return the modelType
- */
- public String getModelType() {
- return modelType;
- }
-
- /**
- * @param modelType the modelType to set
- */
- public void setModelType(String modelType) {
- this.modelType = modelType;
- }
-
- /**
- * @return the modelVersion
- */
- public String getModelVersion() {
- return modelVersion;
- }
-
- /**
- * @param modelVersion the modelVersion to set
- */
- public void setModelVersion(String modelVersion) {
- this.modelVersion = modelVersion;
- }
-
- /**
- * @return the modelVersionId
- */
- public String getModelVersionId() {
- return modelVersionId;
- }
-
- /**
- * @param modelVersionId the modelVersionId to set
- */
- public void setModelVersionId(String modelVersionId) {
- this.modelVersionId = modelVersionId;
- }
-
- /**
- * @return the created
- */
- public Timestamp getCreated() {
- return created;
- }
-
- /**
- * @param created the created to set
- */
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- /**
- * @return the recipes
- */
- public Map<String, ServiceRecipe> getRecipes() {
- return recipes;
- }
-
- /**
- * @param recipes the recipes to set
- */
- public void setRecipes(Map<String, ServiceRecipe> recipes) {
- this.recipes = recipes;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("Model: ");
- sb.append("modelCustomizationId=").append(modelCustomizationId);
- sb.append(",modelCustomizationName=").append(modelCustomizationName);
- sb.append(",modelInvariantId=").append(modelInvariantId);
- sb.append(",modelName=").append(modelName);
- sb.append(",modelType=").append(modelType);
- sb.append(",modelVersion=").append(modelVersion);
- sb.append(",modelVersionId=").append(modelVersionId);
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
- return sb.toString();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java
deleted file mode 100644
index 4ba35f7f42..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ModelRecipe.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class ModelRecipe extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private int id;
- private Integer modelId;
- private String action = null;
- private String schemaVersion = null;
- private String description = null;
- private String orchestrationUri = null;
- private String modelParamXSD = null;
- private Integer recipeTimeout;
- private Timestamp created = null;
-
- /**
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * @param id the id to set
- */
- public void setId(int id) {
- this.id = id;
- }
-
- /**
- * @return the modelId
- */
- public Integer getModelId() {
- return modelId;
- }
-
- /**
- * @param modelId the modelId to set
- */
- public void setModelId(Integer modelId) {
- this.modelId = modelId;
- }
-
- /**
- * @return the action
- */
- public String getAction() {
- return action;
- }
-
- /**
- * @param action the action to set
- */
- public void setAction(String action) {
- this.action = action;
- }
-
- /**
- * @return the versionStr
- */
- public String getSchemaVersion() {
- return schemaVersion;
- }
-
- /**
- * @param schemaVersion the versionStr to set
- */
- public void setSchemaVersion(String schemaVersion) {
- this.schemaVersion = schemaVersion;
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @param description the description to set
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * @return the orchestrationUri
- */
- public String getOrchestrationUri() {
- return orchestrationUri;
- }
-
- /**
- * @param orchestrationUri the orchestrationUri to set
- */
- public void setOrchestrationUri(String orchestrationUri) {
- this.orchestrationUri = orchestrationUri;
- }
-
- /**
- * @return the modelParamXSD
- */
- public String getModelParamXSD() {
- return modelParamXSD;
- }
-
- /**
- * @param modelParamXSD the modelParamXSD to set
- */
- public void setModelParamXSD(String modelParamXSD) {
- this.modelParamXSD = modelParamXSD;
- }
-
- /**
- * @return the recipeTimeout
- */
- public Integer getRecipeTimeout() {
- return recipeTimeout;
- }
-
- /**
- * @param recipeTimeout the recipeTimeout to set
- */
- public void setRecipeTimeout(Integer recipeTimeout) {
- this.recipeTimeout = recipeTimeout;
- }
-
- /**
- * @return the created
- */
- public Timestamp getCreated() {
- return created;
- }
-
- /**
- * @param created the created to set
- */
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("ModelRecipe: ");
- sb.append("modelId=").append(modelId);
- sb.append(",action=").append(action);
- sb.append(",schemaVersion=").append(schemaVersion);
- sb.append(",orchestrationUri=").append(orchestrationUri);
- sb.append(",modelParamXSD=").append(modelParamXSD);
- sb.append(",recipeTimeout=").append(recipeTimeout);
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
- return sb.toString();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
deleted file mode 100644
index d10b633557..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-
-public class NetworkRecipe extends Recipe implements Serializable {
- private static final long serialVersionUID = 768026109321305392L;
- private String modelName = null;
- public NetworkRecipe() {}
-
- public String getModelName() {
- return modelName;
- }
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- @Override
- public String toString () {
- return super.toString() + ",modelName=" + modelName + ",networkParamXSD=" + getParamXSD();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResource.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResource.java
deleted file mode 100644
index d4e1ec536a..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResource.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class NetworkResource extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String orchestrationMode = null;
- private String description = null;
- private String neutronNetworkType = null;
- private String aicVersionMin = null;
- private String aicVersionMax = null;
- private String modelName = null;
- private String modelInvariantUUID = null;
- private String modelVersion = null;
- private String toscaNodeType = null;
- private Timestamp created = null;
- private String modelUUID = null;
- private String category = null;
- private String subCategory = null;
- private String heatTemplateArtifactUUID = null;
-
- public NetworkResource() {}
-
- public String getOrchestrationMode() {
- return orchestrationMode;
- }
-
- public void setOrchestrationMode(String orchestrationMode) {
- this.orchestrationMode = orchestrationMode;
- }
-
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getNeutronNetworkType() {
- return neutronNetworkType;
- }
-
- public void setNeutronNetworkType(String neutronNetworkType) {
- this.neutronNetworkType = neutronNetworkType;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- public String getAicVersionMin() {
- return aicVersionMin;
- }
-
- public void setAicVersionMin(String aicVersionMin) {
- this.aicVersionMin = aicVersionMin;
- }
-
- public String getAicVersionMax() {
- return aicVersionMax;
- }
-
- public void setAicVersionMax(String aicVersionMax) {
- this.aicVersionMax = aicVersionMax;
- }
-
- public String getModelName() {
- return modelName;
- }
-
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- public String getModelInvariantUUID() {
- return modelInvariantUUID;
- }
-
- public void setModelInvariantUUID(String modelInvariantUUID) {
- this.modelInvariantUUID = modelInvariantUUID;
- }
-
- public String getToscaNodeType() {
- return toscaNodeType;
- }
-
- public void setToscaNodeType(String toscaNodeType) {
- this.toscaNodeType = toscaNodeType;
- }
-
- public String getModelUUID() {
- return modelUUID;
- }
-
- public void setModelUUID(String modelUUID) {
- this.modelUUID = modelUUID;
- }
-
-
- /**
- * @return Returns the category.
- */
- public String getCategory() {
- return category;
- }
-
-
- /**
- * @param category The category to set.
- */
- public void setCategory(String category) {
- this.category = category;
- }
-
-
- /**
- * @return Returns the subCategory.
- */
- public String getSubCategory() {
- return subCategory;
- }
-
-
- /**
- * @param subCategory The subCategory to set.
- */
- public void setSubCategory(String subCategory) {
- this.subCategory = subCategory;
- }
-
- public String getHeatTemplateArtifactUUID() {
- return heatTemplateArtifactUUID;
- }
-
- public void setHeatTemplateArtifactUUID(String heatTemplateArtifactUUID) {
- this.heatTemplateArtifactUUID = heatTemplateArtifactUUID;
- }
-
- public String getModelVersion() {
- return modelVersion;
- }
-
- public void setModelVersion(String modelVersion) {
- this.modelVersion = modelVersion;
- }
-
- @Override
- public String toString () {
- StringBuilder sb = new StringBuilder();
- sb.append("NETWORK Resource:");
- sb.append("modelVersion=");
- sb.append(modelVersion);
- sb.append(",mode=");
- sb.append(orchestrationMode);
- sb.append(",neutronType=");
- sb.append(neutronNetworkType);
- sb.append(",aicVersionMin=");
- sb.append(aicVersionMin);
- sb.append(",aicVersionMax=");
- sb.append(aicVersionMax);
- sb.append(",modelName=");
- sb.append(modelName);
- sb.append(",modelInvariantUUID=");
- sb.append(modelInvariantUUID);
- sb.append(",toscaNodeType=");
- sb.append(toscaNodeType);
- sb.append(",modelUUID=");
- sb.append(modelUUID);
- sb.append(",heatTemplateArtifactUUID=");
- sb.append(heatTemplateArtifactUUID);
-
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
-
- return sb.toString();
- }
-}
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
deleted file mode 100644
index f1d5d4f003..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkResourceCustomization.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-import java.io.Serializable;
-
-public class NetworkResourceCustomization implements Serializable{
-
- // modelCustomizationUuid and networkResourceModelUuid form a composite primary key
- @BusinessKey
- private String modelCustomizationUuid = null;
- @BusinessKey
- private String networkResourceModelUuid = null;
- public static final long serialVersionUID = -1322322139926390329L;
- private String modelInstanceName = null;
- private Timestamp created = null;
- private String networkTechnology = null;
- private String networkType = null;
- private String networkScope = null;
- private String networkRole = null;
-
- // These fields are not in the table directly - but I'm adding them here for storage in the objects we're dealing with
- private NetworkResource networkResource = null;
-
- public NetworkResourceCustomization() {
- super();
- }
-
- public String getModelCustomizationUuid() {
- return this.modelCustomizationUuid;
- }
- public void setModelCustomizationUuid(String modelCustomizationUuid) {
- this.modelCustomizationUuid = modelCustomizationUuid;
- }
-
- public String getNetworkResourceModelUuid() {
- return this.networkResourceModelUuid;
- }
- public void setNetworkResourceModelUuid(String networkResourceModelUuid) {
- this.networkResourceModelUuid = networkResourceModelUuid;
- }
-
- public String getModelInstanceName() {
- return this.modelInstanceName;
- }
- public void setModelInstanceName(String modelInstanceName) {
- this.modelInstanceName = modelInstanceName;
- }
-
- public NetworkResource getNetworkResource() {
- return this.networkResource;
- }
- public void setNetworkResource(NetworkResource networkResource) {
- this.networkResource = networkResource;
- }
-
- public String getNetworkType() {
- return this.networkType;
- }
- public void setNetworkType(String networkType) {
- this.networkType = networkType;
- }
- public Timestamp getCreated() {
- return this.created;
- }
- public void setCreated(java.sql.Timestamp timestamp) {
- this.created = timestamp;
- }
-
- public String getNetworkTechnology() {
- return this.networkTechnology;
- }
- public void setNetworkTechnology(String networkTechnology) {
- this.networkTechnology = networkTechnology;
- }
- public String getNetworkScope() {
- return this.networkScope;
- }
- public void setNetworkScope(String networkScope) {
- this.networkScope = networkScope;
- }
- public void setNetworkRole(String networkRole) {
- this.networkRole = networkRole;
- }
- public String getNetworkRole() {
- return this.networkRole;
- }
-
- @Override
- public String toString() {
- return "modelCustomizationUuid=" + this.modelCustomizationUuid +
- "networkResourceModelUuid=" + this.networkResourceModelUuid +
- "modelInstanceName=" + this.modelInstanceName +
- "networkType=" + this.networkType +
- "networkTechnology=" + this.networkTechnology +
- "networkScope=" + this.networkScope +
- "networkRole=" + this.networkRole;
- }
-
- @Override
- public boolean equals (Object o) {
- if (!(o instanceof NetworkResourceCustomization)) {
- return false;
- }
- if (this == o) {
- return true;
- }
- NetworkResourceCustomization nrc = (NetworkResourceCustomization) o;
- if (nrc.getModelCustomizationUuid().equals(this.getModelCustomizationUuid())
- && nrc.getNetworkResourceModelUuid().equals(this.getNetworkResourceModelUuid())) {
- return true;
- }
- return false;
- }
-
- @Override
- public int hashCode () {
- // hash code does not have to be a unique result - only that two objects that should be treated as equal
- // return the same value. so this should work.
- int result;
- result = (this.modelCustomizationUuid != null ? this.modelCustomizationUuid.hashCode() : 0) + (this.networkResourceModelUuid != null ? this.networkResourceModelUuid.hashCode() : 0);
- return result;
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
deleted file mode 100644
index 3f2093b7e2..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Recipe.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class Recipe extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private int id;
- protected String action = null;
- private String description = null;
- protected String orchestrationUri = null;
- private int recipeTimeout;
- private String serviceType = null;
- private String paramXSD = null;
- private Timestamp created = null;
-
- public Recipe () {
- super ();
- }
-
- public int getId () {
- return id;
- }
-
- public void setId (int id) {
- this.id = id;
- }
-
- public String getAction () {
- return action;
- }
-
- public void setAction (String action) {
- this.action = action;
- }
-
- public String getDescription () {
- return description;
- }
-
- public void setDescription (String description) {
- this.description = description;
- }
-
- public String getOrchestrationUri () {
- return orchestrationUri;
- }
-
- public void setOrchestrationUri (String orchestrationUri) {
- this.orchestrationUri = orchestrationUri;
- }
-
- public int getRecipeTimeout () {
- return recipeTimeout;
- }
-
- public void setRecipeTimeout (int recipeTimeout) {
- this.recipeTimeout = recipeTimeout;
- }
-
- public String getServiceType () {
- return serviceType;
- }
-
- public void setServiceType (String serviceType) {
- this.serviceType = serviceType;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- /**
- * @return Returns the paramXSD.
- */
- public String getParamXSD() {
- return paramXSD;
- }
-
- /**
- * @param paramXSD The paramXSD to set.
- */
- public void setParamXSD(String paramXSD) {
- this.paramXSD = paramXSD;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("RECIPE: ").append(action);
- sb.append(",uri=").append(orchestrationUri);
-
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
- return sb.toString();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
deleted file mode 100644
index 620c6bb17c..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class Service extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String modelName = null;
- private String description = null;
- private String modelUUID = null;
- private String modelInvariantUUID = null;
- private Timestamp created = null;
- private String toscaCsarArtifactUUID = null;
- private String modelVersion = null;
- private String category = null;
- private String serviceType = null;
- private String serviceRole = null;
- private String environmentContext = null;
- private String workloadContext = null;
- private Map<String,ServiceRecipe> recipes = new HashMap<>();
- private Set<ServiceToResourceCustomization> serviceResourceCustomizations = new HashSet<>();
-
- public Service() {}
-
- public String getModelName() {
- return modelName;
- }
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Map<String, ServiceRecipe> getRecipes() {
- return recipes;
- }
- public void setRecipes(Map<String, ServiceRecipe> recipes) {
- this.recipes = recipes;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- public String getModelUUID() {
- return modelUUID;
- }
-
- public void setModelUUID(String modelUUID) {
- this.modelUUID = modelUUID;
- }
-
- public String getModelInvariantUUID() {
- return modelInvariantUUID;
- }
-
- public void setModelInvariantUUID(String modelInvariantUUID) {
- this.modelInvariantUUID = modelInvariantUUID;
- }
-
- public String getToscaCsarArtifactUUID() {
- return toscaCsarArtifactUUID;
- }
-
- public void setToscaCsarArtifactUUID(String toscaCsarArtifactUUID) {
- this.toscaCsarArtifactUUID = toscaCsarArtifactUUID;
- }
-
- public Set<ServiceToResourceCustomization> getServiceResourceCustomizations() {
- return serviceResourceCustomizations;
- }
-
- public void setServiceResourceCustomizations(Set<ServiceToResourceCustomization> serviceResourceCustomizations) {
- this.serviceResourceCustomizations = serviceResourceCustomizations;
- }
-
- public String getModelVersion() {
- return modelVersion;
- }
-
- public void setModelVersion(String modelVersion) {
- this.modelVersion = modelVersion;
- }
-
- /**
- * @return Returns the category.
- */
- public String getCategory() {
- return category;
- }
-
-
- /**
- * @param category The category to set.
- */
- public void setCategory(String category) {
- this.category = category;
- }
-
- public String getServiceType() {
- return serviceType;
- }
-
- public void setServiceType(String serviceType) {
- this.serviceType = serviceType;
- }
-
- public String getServiceRole() {
- return serviceRole;
- }
-
- public void setServiceRole(String serviceRole) {
- this.serviceRole = serviceRole;
- }
- public String getEnvironmentContext() {
- return this.environmentContext;
- }
- public void setEnvironmentContext(String environmentContext) {
- this.environmentContext = environmentContext;
- }
-
- public String getWorkloadContext() {
- return this.workloadContext;
- }
- public void setWorkloadContext(String workloadContext) {
- this.workloadContext = workloadContext;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("SERVICE: name=").append(modelName).append(",modelVersion=").append(modelVersion)
- .append(",description=").append(description).append(",modelInvariantUUID=").append(modelInvariantUUID)
-
- .append(",toscaCsarArtifactUUID=").append(toscaCsarArtifactUUID).append(",serviceType=").append(serviceType)
- .append(",serviceRole=").append(serviceRole).append(",envtContext=").append(this.environmentContext)
- .append(",workloadContext=").append(this.workloadContext);
- for (String recipeAction : recipes.keySet()) {
- ServiceRecipe recipe = recipes.get(recipeAction);
- sb.append("\n").append(recipe.toString());
- }
-
- for(ServiceToResourceCustomization serviceResourceCustomization : serviceResourceCustomizations) {
- sb.append("\n").append(serviceResourceCustomization.toString());
- }
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
- return sb.toString();
- }
-}
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
deleted file mode 100644
index 3fad9a4d02..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceMacroHolder.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/*
- * A simple holder for Service and its associated elements:
- * VnfResource, 1-n VfModule, Network TBD
- */
-
-public class ServiceMacroHolder implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private Service service;
- private List<VnfResource> vnfResources;
- private List<NetworkResourceCustomization> networkResourceCustomization;
- private List<AllottedResourceCustomization> allottedResourceCustomization;
- private List<VnfResourceCustomization> vnfResourceCustomizations;
-
- public ServiceMacroHolder() {
- super();
- this.service = null;
- this.vnfResources = new ArrayList<>();
- this.networkResourceCustomization = new ArrayList<>();
- this.allottedResourceCustomization = new ArrayList<>();
- this.vnfResourceCustomizations = new ArrayList<>();
- }
- public ServiceMacroHolder(Service service) {
- this();
- this.service = service;
- }
-
- public Service getService() {
- return this.service;
- }
- public void setService(Service service) {
- this.service = service;
- }
-
- public void setVnfResources(List<VnfResource> vnfResources) {
- this.vnfResources = vnfResources;
- }
- public List<VnfResource> getVnfResources() {
- return this.vnfResources;
- }
- public void addVnfResource(VnfResource vr) {
- if (vr != null) {
- if (this.vnfResources != null) {
- this.vnfResources.add(vr);
- } else {
- this.vnfResources = new ArrayList<>();
- this.vnfResources.add(vr);
- }
- }
- }
-
- public void setVnfResourceCustomizations(List<VnfResourceCustomization> vnfResourceCustomizations) {
- this.vnfResourceCustomizations = vnfResourceCustomizations;
- }
- public List<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<>();
- this.vnfResourceCustomizations.add(vrc);
- }
- }
- }
-
- public void setNetworkResourceCustomization(List<NetworkResourceCustomization> networkResourceCustomizations) {
- this.networkResourceCustomization = networkResourceCustomizations;
- }
- public List<NetworkResourceCustomization> getNetworkResourceCustomization() {
- return this.networkResourceCustomization;
- }
- public void addNetworkResourceCustomizations(NetworkResourceCustomization nrc) {
- if (this.networkResourceCustomization != null) {
- this.networkResourceCustomization.add(nrc);
- } else {
- this.networkResourceCustomization = new ArrayList<>();
- this.networkResourceCustomization.add(nrc);
- }
- }
-
- public void setAllottedResourceCustomization(List<AllottedResourceCustomization> allottedResourceCustomizations) {
- this.allottedResourceCustomization = allottedResourceCustomizations;
- }
- public List<AllottedResourceCustomization> getAllottedResourceCustomization() {
- return this.allottedResourceCustomization;
- }
- public void addAllottedResourceCustomization(AllottedResourceCustomization arc) {
- if (this.allottedResourceCustomization != null) {
- this.allottedResourceCustomization.add(arc);
- } else {
- this.allottedResourceCustomization = new ArrayList<>();
- this.allottedResourceCustomization.add(arc);
- }
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("ServicePlus: ");
- if (this.service != null) {
- sb.append("service: ").append(this.service.toString());
- } else {
- sb.append("service: null");
- }
- if (this.vnfResourceCustomizations != null && this.vnfResourceCustomizations.size() > 0) {
- int i=0;
- sb.append("vnfResourceCustomization: ");
- for (VnfResourceCustomization vrc : this.vnfResourceCustomizations) {
- sb.append(", vnfResourceCustomization[").append(i++).append("]:").append(vrc.toString());
- }
- } else {
- sb.append("none");
- }
- if (this.vnfResources != null && this.vnfResources.size() > 0) {
- int i=0;
- sb.append("VnfResources: ");
- for (VnfResource vr : this.vnfResources) {
- sb.append(", vnfResource[").append(i++).append("]:").append(vr.toString());
- }
- } else {
- sb.append("none");
- }
- if (this.networkResourceCustomization != null && this.networkResourceCustomization.size() > 0) {
- int i=0;
- sb.append("NetworkResourceCustomizations:");
- for (NetworkResourceCustomization nrc : this.networkResourceCustomization) {
- sb.append("NRC[").append(i++).append("]: ").append(nrc.toString());
- }
- }
- if (this.allottedResourceCustomization != null && this.allottedResourceCustomization.size() > 0) {
- int i=0;
- sb.append("AllottedResourceCustomizations:");
- for (AllottedResourceCustomization arc : this.allottedResourceCustomization) {
- sb.append("ARC[").append(i++).append("]: ").append(arc.toString());
- }
- }
-
- return sb.toString();
- }
-
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
deleted file mode 100644
index d0bc9b33f7..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceRecipe.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.util.Date;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-import org.openecomp.mso.logger.MsoLogger;
-
-public class ServiceRecipe extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private int id;
- private String serviceModelUUID = null;
- private String action = null;
- private String description = null;
- private String orchestrationUri = null;
- private String serviceParamXSD = null;
- private int recipeTimeout;
- private Integer serviceTimeoutInterim;
- private Timestamp created = null;
-
- private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.GENERAL);
-
- // This 'default' CTR is now needed for backward compatibility since a new CTR was added below
- public ServiceRecipe() {
- super();
- }
-
- // This CTR is needed by the HQL SELECT JOIN between the SERVICE and SERVICE_RECIPE tables
- // in CatalogDatabase::getServiceRecipe()
- public ServiceRecipe(int id, String serviceModelUUID, String action,
- String description, String orchestrationUri,
- String serviceParamXSD, int recipeTimeout,
- int serviceTimeoutInterim, Date created) {
- super();
- LOGGER.debug("ServiceRecipe id=" + id + ", serviceModelUUID=" + serviceModelUUID + ", action=" + action + ", description=" + description +
- ", orchestrationUri=" + orchestrationUri + ", serviceParamXSD=" + serviceParamXSD +
- ", recipeTimeout=" + recipeTimeout + ", serviceTimeoutInterim=" + serviceTimeoutInterim + ", created=" + created);
- this.id = id;
- this.serviceModelUUID = serviceModelUUID;
- this.action = action;
- this.description = description;
- this.orchestrationUri = orchestrationUri;
- this.serviceParamXSD = serviceParamXSD;
- this.recipeTimeout = recipeTimeout;
- this.serviceTimeoutInterim = serviceTimeoutInterim;
- long date = created.getTime();
- this.created = new Timestamp(date);
- }
-
- public int getId() {
- return id;
- }
- public void setId(int id) {
- this.id = id;
- }
-
- public String getServiceModelUUID() {
- return serviceModelUUID;
- }
- public void setServiceModelUUID(String serviceModelUUID) {
- this.serviceModelUUID = serviceModelUUID;
- }
-
- public String getAction() {
- return action;
- }
- public void setAction(String action) {
- this.action = action;
- }
-
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getOrchestrationUri() {
- return orchestrationUri;
- }
- public void setOrchestrationUri(String orchestrationUri) {
- this.orchestrationUri = orchestrationUri;
- }
-
- public String getServiceParamXSD() {
- return serviceParamXSD;
- }
- public void setServiceParamXSD(String serviceParamXSD) {
- this.serviceParamXSD = serviceParamXSD;
- }
-
- public int getRecipeTimeout() {
- return recipeTimeout;
- }
- public void setRecipeTimeout(int recipeTimeout) {
- this.recipeTimeout = recipeTimeout;
- }
-
- public Integer getServiceTimeoutInterim() {
- return serviceTimeoutInterim;
- }
-
- public void setServiceTimeoutInterim(Integer serviceTimeoutInterim) {
- this.serviceTimeoutInterim = serviceTimeoutInterim;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("RECIPE: ").append(action);
- sb.append(",uri=").append(orchestrationUri);
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
- return sb.toString();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResources.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResources.java
deleted file mode 100644
index 2ac71f4ddf..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToAllottedResources.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-public class ServiceToAllottedResources implements Serializable {
-
- @BusinessKey
- private String serviceModelUuid = null;
- @BusinessKey
- private String arModelCustomizationUuid = null;
- private Timestamp created = null;
-
- public static final long serialVersionUID = -1322322139926390329L;
-
- public ServiceToAllottedResources() {
- super();
- }
-
- public String getServiceModelUuid() {
- return this.serviceModelUuid;
- }
- public void setServiceModelUuid(String serviceModelUuid) {
- this.serviceModelUuid = serviceModelUuid;
- }
- public String getArModelCustomizationUuid() {
- return this.arModelCustomizationUuid;
- }
- public void setArModelCustomizationUuid(String arModelCustomizationUuid) {
- this.arModelCustomizationUuid = arModelCustomizationUuid;
- }
- public Timestamp getCreated() {
- return this.created;
- }
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- @Override
- public boolean equals(Object o) {
- if (!(o instanceof ServiceToAllottedResources)) {
- return false;
- }
- if (this == o) {
- return true;
- }
- ServiceToAllottedResources star = (ServiceToAllottedResources) o;
- if (star.getArModelCustomizationUuid().equals(this.getArModelCustomizationUuid())
- && star.getServiceModelUuid().equals(this.getServiceModelUuid())) {
- return true;
- }
- return false;
- }
-
- @Override
- public int hashCode() {
-
- int code = this.arModelCustomizationUuid == null ? 0 : this.arModelCustomizationUuid.hashCode();
- code += this.serviceModelUuid == null ? 0 : this.serviceModelUuid.hashCode();
-
- return code;
- }
-
- @Override
- public String toString() {
- return "serviceModelUuid=" + this.serviceModelUuid + "arModelCustomizationUuid=" + this.arModelCustomizationUuid;
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
deleted file mode 100644
index 3894b4f7b5..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-public class ServiceToNetworks implements Serializable {
-
- // This maps to SERVICE.SERVICE_NAME_VERSION_ID / Service.serviceNameVersionId in SERVICE/Service table
- @BusinessKey
- private String serviceModelUuid = null;
- // This maps to NETWORK_RESOURCE_CUSTOMIZATION.MODEL_CUSTOMIZATION_UUID / NetworkResourceCustomization.ModelCustomizationUuid
- @BusinessKey
- private String networkModelCustomizationUuid = null;
- private Timestamp created = null;
- public static final long serialVersionUID = -1322322139926390329L;
-
- public ServiceToNetworks() {
- super();
- }
-
- public String getServiceModelUuid() {
- return this.serviceModelUuid;
- }
- public void setServiceModelUuid(String serviceModelUuid) {
- this.serviceModelUuid = serviceModelUuid;
- }
-
- public String getNetworkModelCustomizationUuid() {
- return this.networkModelCustomizationUuid;
- }
- public void setNetworkModelCustomizationUuid(String networkCustomizationUuid) {
- this.networkModelCustomizationUuid = networkCustomizationUuid;
- }
-
- public Timestamp getCreated() {
- return this.created;
- }
- public void setCreated(Timestamp timestamp) {
- this.created = timestamp;
- }
-
- @Override
- public boolean equals(Object o) {
- if (!(o instanceof ServiceToNetworks)) {
- return false;
- }
- if (this == o) {
- return true;
- }
- ServiceToNetworks stn = (ServiceToNetworks) o;
- if (stn.getNetworkModelCustomizationUuid().equals(this.getNetworkModelCustomizationUuid())
- && stn.getServiceModelUuid().equals(this.getServiceModelUuid())) {
- return true;
- }
- return false;
- }
-
- @Override
- public int hashCode() {
-
- int code = this.networkModelCustomizationUuid == null ? 0 : this.networkModelCustomizationUuid.hashCode();
- code += this.serviceModelUuid == null ? 0 : this.serviceModelUuid.hashCode();
-
- return code;
- }
-
- @Override
- public String toString() {
- return "ServiceToNetworks mapping: " + "serviceModelUuid=" + this.serviceModelUuid
- + ",networkModelCustomizationUuid=" + networkModelCustomizationUuid;
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java
deleted file mode 100644
index 3babe4ad23..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToResourceCustomization.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-public class ServiceToResourceCustomization implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- @BusinessKey
- private String modelType = null;
- @BusinessKey
- private String serviceModelUUID = null;
- private Timestamp created = null;
- @BusinessKey
- private String resourceModelCustomizationUUID = null;
-
- public ServiceToResourceCustomization() {}
-
- public String getServiceModelUUID() {
- return serviceModelUUID;
- }
-
- public void setServiceModelUUID(String serviceModelUUID) {
- this.serviceModelUUID = serviceModelUUID;
- }
-
- public String getModelType() {
- return modelType;
- }
-
- public void setModelType(String modelType) {
- this.modelType = modelType;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- public String getResourceModelCustomizationUUID() {
- return resourceModelCustomizationUUID;
- }
-
- public void setResourceModelCustomizationUUID(String resourceModelCustomizationUUID) {
- this.resourceModelCustomizationUUID = resourceModelCustomizationUUID;
- }
-
-
- @Override
- public boolean equals (final Object other) {
- if (!(other instanceof ServiceToResourceCustomization)) {
- return false;
- }
- ServiceToResourceCustomization castOther = (ServiceToResourceCustomization) other;
- return new EqualsBuilder().append(modelType, castOther.modelType)
- .append(serviceModelUUID, castOther.serviceModelUUID)
- .append(resourceModelCustomizationUUID, castOther.resourceModelCustomizationUUID).isEquals();
- }
-
- @Override
- public int hashCode() {
-
- int code = this.modelType == null ? 0 : this.modelType.hashCode();
- code += this.serviceModelUUID == null ? 0 : this.serviceModelUUID.hashCode();
- code += this.resourceModelCustomizationUUID == null ? 0 : this.resourceModelCustomizationUUID.hashCode();
-
- return code;
-
- }@Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("ServiceToResourceCustomization: modelType=").append(modelType).append(",serviceModelUUID=")
- .append(serviceModelUUID).append(",resourceModelCustomizationUUID=").append(resourceModelCustomizationUUID);
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
- return sb.toString();
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java
deleted file mode 100644
index 6fd6e3e6ae..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/TempNetworkHeatTemplateLookup.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-public class TempNetworkHeatTemplateLookup implements Serializable {
-
- @BusinessKey
- private String networkResourceModelName = null;
- @BusinessKey
- private String heatTemplateArtifactUuid = null;
- private String aicVersionMin = null;
- private String aicVersionMax = null;
- public static final long serialVersionUID = -1322322139926390329L;
-
- public TempNetworkHeatTemplateLookup() {
- super();
- }
-
- public String getNetworkResourceModelName() {
- return this.networkResourceModelName;
- }
- public void setNetworkResourceModelName(String networkResourceModelName) {
- this.networkResourceModelName = networkResourceModelName;
- }
-
- public String getHeatTemplateArtifactUuid() {
- return this.heatTemplateArtifactUuid;
- }
- public void setHeatTemplateArtifactUuid(String heatTemplateArtifactUuid) {
- this.heatTemplateArtifactUuid = heatTemplateArtifactUuid;
- }
- public String getAicVersionMin() {
- return this.aicVersionMin;
- }
-
- public void setAicVersionMin(String aicVersionMin) {
- this.aicVersionMin = aicVersionMin;
- }
-
- public String getAicVersionMax() {
- return this.aicVersionMax;
- }
-
- public void setAicVersionMax(String aicVersionMax) {
- this.aicVersionMax = aicVersionMax;
- }
-
- @Override
- public String toString() {
- return "NetworkResourceModelName=" + this.networkResourceModelName + "HeatTemplateArtifactUuid=" +
- this.heatTemplateArtifactUuid + "aicVersionMin=" + this.aicVersionMin + "aicVersionMax=" + this.aicVersionMax;
- }
-
- @Override
- public boolean equals (Object o) {
- if (!(o instanceof TempNetworkHeatTemplateLookup)) {
- return false;
- }
- if (this == o) {
- return true;
- }
- TempNetworkHeatTemplateLookup tnhtl = (TempNetworkHeatTemplateLookup) o;
- if (tnhtl.getHeatTemplateArtifactUuid().equals(this.getHeatTemplateArtifactUuid()) && tnhtl.getNetworkResourceModelName().equals(this.getNetworkResourceModelName())) {
- return true;
- }
- return false;
- }
-
- @Override
- public int hashCode () {
- // hash code does not have to be a unique result - only that two objects that should be treated as equal
- // return the same value. so this should work.
- int result;
- result = (this.networkResourceModelName != null ? this.networkResourceModelName.hashCode() : 0) + (this.heatTemplateArtifactUuid != null ? this.heatTemplateArtifactUuid.hashCode() : 0);
- return result;
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java
deleted file mode 100644
index 92d02d8a11..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ToscaCsar.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class ToscaCsar extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String artifactUUID = null;
- private String name = null;
- private String artifactChecksum = null;
- private String url = null;
- private String description = null;
- private Timestamp created = null;
- private Set<Service> services = new HashSet<>();
-
- public ToscaCsar() { }
-
- public String getArtifactUUID() {
- return artifactUUID;
- }
-
- public void setArtifactUUID(String artifactUUID) {
- this.artifactUUID = artifactUUID;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getArtifactChecksum() {
- return artifactChecksum;
- }
-
- public void setArtifactChecksum(String artifactChecksum) {
- this.artifactChecksum = artifactChecksum;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- public Set<Service> getServices() {
- return services;
- }
-
- public void setServices(Set<Service> services) {
- this.services = services;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("TOSCACSAR: artifactUUID=").append(artifactUUID).append(",name=").append(name).append(",version=")
- .append(version).append(",description=").append(description).append(",artifactChecksum=")
- .append(artifactChecksum).append(",url=").append(url);
- for (Service service : services) {
- sb.append("\n").append(service.toString());
- }
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
- return sb.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
deleted file mode 100644
index ec3bc7fefb..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModule.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class VfModule extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String modelInvariantUUID = null;
- private String modelName = null;
- private String modelVersion = null;
- private String description = null;
- private int isBase;
- private String heatTemplateArtifactUUId = null;
- private String volHeatTemplateArtifactUUId = null;
- private Timestamp created = null;
- private String modelUUID = null;
- private String vnfResourceModelUUId = null;
-
- public VfModule() {
- super();
- }
-
- public String getVnfResourceModelUUId() {
- return this.vnfResourceModelUUId;
- }
-
- public void setVnfResourceModelUUId(String vnfResourceModelUUId) {
- this.vnfResourceModelUUId = vnfResourceModelUUId;
- }
-
- public String getModelName() {
- return this.modelName;
- }
-
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- public int getIsBase() {
- return this.isBase;
- }
-
- public void setIsBase(int isBase) {
- this.isBase = isBase;
- }
-
- public boolean isBase() {
- if (this.isBase == 0) {
- return false;
- } else {
- return true;
- }
- }
-
- public String getHeatTemplateArtifactUUId() {
- return this.heatTemplateArtifactUUId;
- }
-
- public void setHeatTemplateArtifactUUId(String heatTemplateArtifactUUId) {
- this.heatTemplateArtifactUUId = heatTemplateArtifactUUId;
- }
-
- public String getDescription() {
- return this.description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- public String getModelInvariantUuid() {
- return this.modelInvariantUUID;
- }
- public void setModelInvariantUuid(String modelInvariantUuid) {
- this.modelInvariantUUID = modelInvariantUuid;
- }
- public String getModelInvariantUUID() {
- return this.modelInvariantUUID;
- }
- public void setModelInvariantUUID(String modelInvariantUuid) {
- this.modelInvariantUUID = modelInvariantUuid;
- }
-
- public String getVolHeatTemplateArtifactUUId() {
- return this.volHeatTemplateArtifactUUId;
- }
-
- public void setVolHeatTemplateArtifactUUId(String volHeatTemplateArtifactUUId) {
- this.volHeatTemplateArtifactUUId = volHeatTemplateArtifactUUId;
- }
-
- public String getModelUUID() {
- return modelUUID;
- }
-
- public void setModelUUID(String modelUUID) {
- this.modelUUID = modelUUID;
- }
-
- public String getModelVersion() {
- return modelVersion;
- }
-
- public void setModelVersion(String modelVersion) {
- this.modelVersion = modelVersion;
- }
-
- @Override
- public String toString () {
- StringBuilder buf = new StringBuilder();
-
- buf.append("VFModule:");
- buf.append("modelName=");
- buf.append(modelName);
- buf.append(",modelVersion=");
- buf.append(modelVersion);
- buf.append(",vnfResourceModelUUId=");
- buf.append(this.vnfResourceModelUUId);
- buf.append(",heatTemplateArtifactUUId=");
- buf.append(this.heatTemplateArtifactUUId);
- buf.append(", description=");
- buf.append(this.description);
- buf.append(",volHeatTemplateArtifactUUId=");
- buf.append(this.volHeatTemplateArtifactUUId);
- buf.append(",isBase=");
- buf.append(this.isBase);
- buf.append(",modelInvariantUUID=");
- buf.append(this.modelInvariantUUID);
- buf.append(",modelUUID=");
- buf.append(this.modelUUID);
-
- if (this.created != null) {
- buf.append (",created=");
- buf.append (DateFormat.getInstance().format(this.created));
- }
-
- return buf.toString();
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java
deleted file mode 100644
index 5b3dec4700..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleCustomization.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-public class VfModuleCustomization implements Serializable {
-
- @BusinessKey
- private String modelCustomizationUuid = null;
- @BusinessKey
- private String vfModuleModelUuid = null;
- private String label = null;
- private Integer minInstances;
- private Integer maxInstances;
- private Integer initialCount;
- private Integer availabilityZoneCount;
- private String heatEnvironmentArtifactUuid = null;
- private String volEnvironmentArtifactUuid = null;
- private Timestamp created = null;
- private VfModule vfModule;
- public static final long serialVersionUID = -1322322139926390329L;
-
- public VfModuleCustomization() {
- super();
- }
-
- public String getModelCustomizationUuid() {
- return this.modelCustomizationUuid;
- }
- public void setModelCustomizationUuid(String modelCustomizationUuid) {
- this.modelCustomizationUuid = modelCustomizationUuid;
- }
- public String getVfModuleModelUuid() {
- return this.vfModuleModelUuid;
- }
- public void setVfModuleModelUuid(String vfModuleModelUuid) {
- this.vfModuleModelUuid = vfModuleModelUuid;
- }
- public String getHeatEnvironmentArtifactUuid() {
- return this.heatEnvironmentArtifactUuid;
- }
- public void setHeatEnvironmentArtifactUuid(String heatEnvironmentArtifactUuid) {
- this.heatEnvironmentArtifactUuid = heatEnvironmentArtifactUuid;
- }
- public String getVolEnvironmentArtifactUuid() {
- return this.volEnvironmentArtifactUuid;
- }
- public void setVolEnvironmentArtifactUuid(String volEnvironmentArtifactUuid) {
- this.volEnvironmentArtifactUuid = volEnvironmentArtifactUuid;
- }
-
- 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 getInitialCount() {
- return this.initialCount;
- }
- public void setInitialCount(Integer initialCount) {
- this.initialCount = initialCount;
- }
- public Integer getAvailabilityZoneCount() {
- return this.availabilityZoneCount;
- }
- public void setAvailabilityZoneCount(Integer availabilityZoneCount) {
- this.availabilityZoneCount = availabilityZoneCount;
- }
- public Timestamp getCreated() {
- return created;
- }
- public void setCreated(Timestamp created) {
- this.created = created;
- }
- public String getLabel() {
- return this.label;
- }
- public void setLabel(String label) {
- this.label = label;
- }
- public VfModule getVfModule() {
- return this.vfModule;
- }
- public void setVfModule(VfModule vfModule) {
- this.vfModule = vfModule;
- }
-
- @Override
- public String toString() {
- return "modelCustomizationUuid=" + this.modelCustomizationUuid +
- "vfModuleModelUuid=" + this.vfModuleModelUuid +
- "label=" + this.label +
- "initalCount=" + this.initialCount +
- "minInstances=" + this.minInstances +
- "maxInstances=" + this.maxInstances +
- "availabilityZoneCount=" + this.availabilityZoneCount +
- "heatEnvironmentArtifactUuid=" + this.heatEnvironmentArtifactUuid +
- "volEnvironmentArtifactUuid=" + this.volEnvironmentArtifactUuid +
- "created=" + this.created;
- }
-
- @Override
- public boolean equals (Object o) {
- if (!(o instanceof VfModuleCustomization)) {
- return false;
- }
- if (this == o) {
- return true;
- }
- VfModuleCustomization vfmc = (VfModuleCustomization) o;
- if (vfmc.getModelCustomizationUuid().equals(this.getModelCustomizationUuid()) && vfmc.getVfModuleModelUuid().equals(this.getVfModuleModelUuid())) {
- return true;
- }
- return false;
- }
-
- @Override
- public int hashCode () {
- // hash code does not have to be a unique result - only that two objects that should be treated as equal
- // return the same value. so this should work.
- int result = 0;
- result = (this.modelCustomizationUuid != null ? this.modelCustomizationUuid.hashCode() : 0) + (this.vfModuleModelUuid != null ? this.vfModuleModelUuid.hashCode() : 0);
- return result;
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
deleted file mode 100644
index 3796650364..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VfModuleToHeatFiles.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-
-public class VfModuleToHeatFiles implements Serializable {
-
- private String vfModuleModelUuid = null;
- private String heatFilesArtifactUuid = null;
- public static final long serialVersionUID = -1322322139926390329L;
-
- public VfModuleToHeatFiles() {
- super();
- }
-
- public String getVfModuleModelUuid() {
- return this.vfModuleModelUuid;
- }
- public void setVfModuleModelUuid(String vfModuleModelUuid) {
- this.vfModuleModelUuid = vfModuleModelUuid;
- }
- public String getHeatFilesArtifactUuid() {
- return this.heatFilesArtifactUuid;
- }
- public void setHeatFilesArtifactUuid(String heatFilesArtifactUuid) {
- this.heatFilesArtifactUuid = heatFilesArtifactUuid;
- }
-
- @Override
- public String toString() {
- return "vfModuleModelUuid=" + this.vfModuleModelUuid + ", heatFilesArtifactUuid=" + this.heatFilesArtifactUuid;
- }
-
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java
deleted file mode 100644
index 9b701df1d2..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponent.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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;
-import java.text.DateFormat;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-import java.io.Serializable;
-
-public class VnfComponent implements Serializable {
- @BusinessKey
- private int vnfId;
- @BusinessKey
- private String componentType = null;
- private Integer heatTemplateId;
- private Integer heatEnvironmentId;
- public static final long serialVersionUID = -1322322139926390329L;
-
- private Timestamp created = null;
-
- public VnfComponent() {}
-
- public int getVnfId() {
- return vnfId;
- }
- public void setVnfId(int id) {
- this.vnfId = id;
- }
-
- public String getComponentType() {
- return componentType;
- }
- public void setComponentType(String ct) {
- this.componentType = ct;
- }
-
- public Integer getHeatTemplateId() {
- return heatTemplateId;
- }
- public void setHeatTemplateId(Integer ht) {
- this.heatTemplateId = ht;
- }
-
- public Integer getHeatEnvironmentId() {
- return heatEnvironmentId;
- }
- public void setHeatEnvironmentId(Integer he) {
- this.heatEnvironmentId = he;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("VnfComponent: ");
- sb.append("vnfId=").append(vnfId);
- sb.append(",componentType=").append(componentType);
- sb.append(",heatTemplateId=").append(heatTemplateId);
- sb.append(",heatEnvironmentId=").append(heatEnvironmentId);
-
- if (created != null) {
- sb.append (",created=");
- sb.append (DateFormat.getInstance().format(created));
- }
- return sb.toString();
- }
-
- @Override
- public boolean equals (Object o) {
- if (!(o instanceof VnfComponent)) {
- return false;
- }
- if (this == o) {
- return true;
- }
- VnfComponent vnfComponent = (VnfComponent) o;
- if (vnfComponent.getVnfId() == this.vnfId && vnfComponent.componentType.equalsIgnoreCase(this.componentType)) {
- return true;
- }
- return false;
- }
-
- @Override
- public int hashCode () {
- // return the hashCode of the concat string of type+vnfId - should be okay.
- int result = 0;
- result = (this.componentType + this.vnfId).hashCode();
- return result;
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
deleted file mode 100644
index 2240191d45..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-
-public class VnfComponentsRecipe extends Recipe implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String vnfType = null;
- private String vnfComponentType = null;
- private String vfModuleModelUUId = null;
-
- public VnfComponentsRecipe() {}
-
- public String getVnfType() {
- return vnfType;
- }
- public void setVnfType(String vnfType) {
- this.vnfType = vnfType;
- }
-
- public String getVnfComponentType() {
- return vnfComponentType;
- }
- public void setVnfComponentType(String vnfComponentType) {
- this.vnfComponentType = vnfComponentType;
- }
-
- public String getVfModuleModelUUId() {
- return vfModuleModelUUId;
- }
-
- public void setVfModuleModelUUId(String vfModuleModelUUId) {
- this.vfModuleModelUUId = vfModuleModelUUId;
- }
-
- @Override
- public String toString () {
- return super.toString() + ",vnfComponentParamXSD=" + getParamXSD() + ",serviceType=" + getServiceType() +
- ",vnfComponentType=" + getVnfComponentType() + ",vfModuleId=" + getVfModuleModelUUId();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
deleted file mode 100644
index d94334c98d..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-
-public class VnfRecipe extends Recipe implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String vnfType = null;
- private String vfModuleId = null;
-
- public VnfRecipe() {}
-
- public String getVnfType() {
- return vnfType;
- }
- public void setVnfType(String vnfType) {
- this.vnfType = vnfType;
- }
-
- public String getVfModuleId() {
- return vfModuleId;
- }
-
- public void setVfModuleId(String vfModuleId) {
- this.vfModuleId = vfModuleId;
- }
-
- @Override
- public String toString () {
- return super.toString() + ",vnfParamXSD=" + getParamXSD() + ",serviceType=" + getServiceType() + ",vfModuleId=" +
- getVfModuleId();
- }
-}
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java
deleted file mode 100644
index 6b1cb0a19c..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResCustomToVfModuleCustom.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-
-import com.openpojo.business.annotation.BusinessKey;
-
-public class VnfResCustomToVfModuleCustom implements Serializable {
-
- @BusinessKey
- private String vnfResourceCustModelCustomizationUuid = null;
- @BusinessKey
- private String vfModuleCustModelCustomizationUuid = null;
- private Timestamp created = null;
-
- public static final long serialVersionUID = -1322322139926390329L;
-
-
- public VnfResCustomToVfModuleCustom() {
- super();
- }
- public String getVnfResourceCustModelCustomizationUuid() {
- return this.vnfResourceCustModelCustomizationUuid;
- }
- public void setVnfResourceCustModelCustomizationUuid(String vnfResourceCustModelCustomizationUuid) {
- this.vnfResourceCustModelCustomizationUuid = vnfResourceCustModelCustomizationUuid;
- }
- public String getVfModuleCustModelCustomizationUuid() {
- return this.vfModuleCustModelCustomizationUuid;
- }
- public void setVfModuleCustModelCustomizationUuid(String vfModuleCustModelCustomizationUuid) {
- this.vfModuleCustModelCustomizationUuid = vfModuleCustModelCustomizationUuid;
- }
- public Timestamp getCreated() {
- return created;
- }
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- @Override
- public String toString() {
- return "vnfResourceCustModelCustomizationUuid=" + this.vnfResourceCustModelCustomizationUuid +
- "vfModuleCustModelCustomizationUuid=" + this.vfModuleCustModelCustomizationUuid + "created=" + this.created;
- }
-
- @Override
- public boolean equals (Object o) {
- if (!(o instanceof VnfResCustomToVfModuleCustom)) {
- return false;
- }
- if (this == o) {
- return true;
- }
- VnfResCustomToVfModuleCustom vrctvmc = (VnfResCustomToVfModuleCustom) o;
- if (vrctvmc.getVnfResourceCustModelCustomizationUuid().equals(this.getVnfResourceCustModelCustomizationUuid()) && vrctvmc.getVfModuleCustModelCustomizationUuid().equals(this.getVfModuleCustModelCustomizationUuid())) {
- return true;
- }
- return false;
- }
-
- @Override
- public int hashCode () {
- // hash code does not have to be a unique result - only that two objects that should be treated as equal
- // return the same value. so this should work.
- int result = 0;
- result = (this.vnfResourceCustModelCustomizationUuid != null ? this.vnfResourceCustModelCustomizationUuid.hashCode() : 0) + (this.vfModuleCustModelCustomizationUuid != null ? this.vfModuleCustModelCustomizationUuid.hashCode() : 0);
- return result;
- }
-
-
-}
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
deleted file mode 100644
index f8e6024e69..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResource.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.text.DateFormat;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class VnfResource extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String modelUuid = null;
- private String modelInvariantUuid = null;
- private String modelName = null;
- private String toscaNodeType = null;
- private String description = null;
- private String orchestrationMode = null;
- private String aicVersionMin = null;
- private String aicVersionMax = null;
- private String category = null;
- private String subCategory = null;
- private String heatTemplateArtifactUUId = null;
- private Timestamp created = null;
- private String modelVersion = null;
- private Set<VnfResourceCustomization> vnfResourceCustomizations = new HashSet<>();
- private Set<VfModule> vfModules = new HashSet<>();
- private List<VfModuleCustomization> vfModuleCustomizations = new ArrayList<>();
-
- public VnfResource () { }
-
- public String getOrchestrationMode () {
- return orchestrationMode;
- }
-
- public void setOrchestrationMode (String orchestrationMode) {
- this.orchestrationMode = orchestrationMode;
- }
-
- public String getDescription () {
- return description;
- }
-
- public void setDescription (String description) {
- this.description = description;
- }
-
- public String getTemplateId () {
- return heatTemplateArtifactUUId;
- }
-
- public void setTemplateId (String heatTemplateArtifactUUId) {
- this.heatTemplateArtifactUUId = heatTemplateArtifactUUId;
- }
- public String getHeatTemplateArtifactUUId () {
- return heatTemplateArtifactUUId;
- }
-
- public void setHeatTemplateArtifactUUId (String heatTemplateArtifactUUId) {
- this.heatTemplateArtifactUUId = heatTemplateArtifactUUId;
- }
-
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- public String getAicVersionMin() {
- return this.aicVersionMin;
- }
-
- public void setAicVersionMin(String aicVersionMin) {
- this.aicVersionMin = aicVersionMin;
- }
-
- public String getAicVersionMax() {
- return this.aicVersionMax;
- }
-
- public void setAicVersionMax(String aicVersionMax) {
- this.aicVersionMax = aicVersionMax;
- }
-
-
- /**
- * @return Returns the category.
- */
- public String getCategory() {
- return category;
- }
-
-
- /**
- * @param category The category to set.
- */
- public void setCategory(String category) {
- this.category = category;
- }
-
-
- /**
- * @return Returns the subCategory.
- */
- public String getSubCategory() {
- return subCategory;
- }
-
-
- /**
- * @param subCategory The subCategory to set.
- */
- public void setSubCategory(String subCategory) {
- this.subCategory = subCategory;
- }
-
- public String getModelInvariantUuid() {
- return this.modelInvariantUuid;
- }
-
- public void setModelInvariantUuid(String modelInvariantUuid) {
- this.modelInvariantUuid = modelInvariantUuid;
- }
-
- public String getModelName() {
- return modelName;
- }
-
- public void setModelName(String modelName) {
- this.modelName = modelName;
- }
-
- public String getModelUuid() {
- return modelUuid;
- }
-
- public void setModelUuid(String modelUuid) {
- this.modelUuid = modelUuid;
- }
-
- public String getModelInvariantId() {
- return this.modelInvariantUuid;
- }
-
- public String getToscaNodeType() {
- return toscaNodeType;
- }
-
- public void setToscaNodeType(String toscaNodeType) {
- this.toscaNodeType = toscaNodeType;
- }
-
- public Set<VnfResourceCustomization> getVnfResourceCustomizations() {
- return vnfResourceCustomizations;
- }
-
- public void setVnfResourceCustomizations(Set<VnfResourceCustomization> vnfResourceCustomizations) {
- this.vnfResourceCustomizations = vnfResourceCustomizations;
- }
-
- public Set<VfModule> getVfModules() {
- return vfModules;
- }
-
- public void setVfModules(Set<VfModule> vfModules) {
- this.vfModules = vfModules;
- }
-
- public List<VfModuleCustomization> getVfModuleCustomizations() {
- return this.vfModuleCustomizations == null ? new ArrayList<>() : this.vfModuleCustomizations;
- }
- public void setVfModuleCustomizations(List<VfModuleCustomization> vfModuleCustomizations) {
- this.vfModuleCustomizations = vfModuleCustomizations;
- }
- public void addVfModuleCustomization(VfModuleCustomization vfmc) {
- if (vfmc != null) {
- if (this.vfModuleCustomizations != null) {
- this.vfModuleCustomizations.add(vfmc);
- } else {
- this.vfModuleCustomizations = new ArrayList<>();
- this.vfModuleCustomizations.add(vfmc);
- }
- }
- }
-
- public void addVfModule(VfModule vfm) {
- if (vfm != null) {
- if (this.vfModules != null) {
- this.vfModules.add(vfm);
- } else {
- this.vfModules = new HashSet<>();
- this.vfModules.add(vfm);
- }
- }
- }
- public ArrayList<VfModule> getVfModuleList() {
- if (this.vfModules == null || this.vfModules.size() < 1) {
- return null;
- }
- ArrayList<VfModule> list = new ArrayList<>();
- list.addAll(this.vfModules);
- return list;
- }
-
- public String getModelVersion() {
- return modelVersion;
- }
-
- public void setModelVersion(String modelVersion) {
- this.modelVersion = modelVersion;
- }
-
- @Override
- public String toString () {
- StringBuilder sb = new StringBuilder();
-
- sb.append("VNF=");
- sb.append(",modelVersion=");
- sb.append(modelVersion);
- sb.append(",mode=");
- sb.append(orchestrationMode);
- sb.append(",heatTemplateArtifactUUId=");
- sb.append(heatTemplateArtifactUUId);
- sb.append(",envtId=");
- sb.append(",asdcUuid=");
- sb.append(",aicVersionMin=");
- sb.append(this.aicVersionMin);
- sb.append(",aicVersionMax=");
- sb.append(this.aicVersionMax);
- sb.append(",modelInvariantUuid=");
- sb.append(this.modelInvariantUuid);
- sb.append(",modelVersion=");
- sb.append(",modelCustomizationName=");
- sb.append(",modelName=");
- sb.append(this.modelName);
- sb.append(",serviceModelInvariantUUID=");
- sb.append(",modelCustomizationUuid=");
- sb.append(",toscaNodeType=");
- sb.append(toscaNodeType);
-
- if (created != null) {
- sb.append(",created=");
- sb.append(DateFormat.getInstance().format(created));
- }
-
- for(VnfResourceCustomization vrc : vnfResourceCustomizations) {
- sb.append("/n").append(vrc.toString());
- }
-
- for(VfModule vfm : vfModules) {
- sb.append("/n").append(vfm.toString());
- }
- return sb.toString();
- }
-
-}
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
deleted file mode 100644
index e510ee867d..0000000000
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.io.Serializable;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.openecomp.mso.db.catalog.utils.MavenLikeVersioning;
-
-public class VnfResourceCustomization extends MavenLikeVersioning implements Serializable {
-
- private static final long serialVersionUID = 768026109321305392L;
-
- private String modelCustomizationUuid = null;
- private String modelInstanceName = null;
- private Timestamp created = null;
- private String vnfResourceModelUuid = null;
- private String vnfResourceModelUUID = null;
- private Integer minInstances;
- private Integer maxInstances;
- private Integer availabilityZoneMaxCount;
- private VnfResource vnfResource;
- private String nfFunction = null;
- private String nfType = null;
- private String nfRole = null;
- private String nfNamingCode = null;
- private String multiStageDesign = null;
- private List<VfModuleCustomization> vfModuleCustomizations;
- private Set<ServiceToResourceCustomization> serviceResourceCustomizations;
-
- public VnfResourceCustomization() {
- }
-
-
- public String getModelCustomizationUuid() {
- return modelCustomizationUuid;
- }
-
- public void setModelCustomizationUuid(String modelCustomizationUuid) {
- this.modelCustomizationUuid = modelCustomizationUuid;
- }
-
- public String getModelInstanceName() {
- return this.modelInstanceName;
- }
- public void setModelInstanceName(String modelInstanceName) {
- this.modelInstanceName = modelInstanceName;
- }
-
- public Timestamp getCreationTimestamp() {
- return this.created;
- }
- public void setCreationTimestamp(Timestamp created) {
- this.created = created;
- }
-
- public String getVnfResourceModelUuid() {
- return this.vnfResourceModelUuid == null ? this.vnfResourceModelUUID : this.vnfResourceModelUuid;
- }
- public void setVnfResourceModelUuid(String vnfResourceModelUuid) {
- this.vnfResourceModelUuid = vnfResourceModelUuid;
- }
- 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;
- }
-
- public String getNfFunction() {
- return nfFunction;
- }
-
- public void setNfFunction(String nfFunction) {
- this.nfFunction = nfFunction;
- }
-
- public String getNfType() {
- return nfType;
- }
-
- public void setNfType(String nfType) {
- this.nfType = nfType;
- }
-
- public String getNfRole() {
- return nfRole;
- }
-
- public void setNfRole(String nfRole) {
- this.nfRole = nfRole;
- }
-
- public String getNfNamingCode() {
- return nfNamingCode;
- }
-
- public void setNfNamingCode(String nfNamingCode) {
- this.nfNamingCode = nfNamingCode;
- }
- public String getMultiStageDesign() {
- return this.multiStageDesign;
- }
- public void setMultiStageDesign(String multiStageDesign) {
- this.multiStageDesign = multiStageDesign;
- }
- public List<VfModuleCustomization> getVfModuleCustomizations() {
- return this.vfModuleCustomizations;
- }
- public void setVfModuleCustomizations(List<VfModuleCustomization> vfModuleCustomizations) {
- this.vfModuleCustomizations = vfModuleCustomizations;
- }
- public void addVfModuleCustomization(VfModuleCustomization vfmc) {
- if (vfmc != null) {
- if (this.vfModuleCustomizations != null) {
- this.vfModuleCustomizations.add(vfmc);
- } else {
- this.vfModuleCustomizations = new ArrayList<>();
- this.vfModuleCustomizations.add(vfmc);
- }
- }
- }
- public Timestamp getCreated() {
- return created;
- }
-
- public void setCreated(Timestamp created) {
- this.created = created;
- }
-
- public Set<ServiceToResourceCustomization> getServiceResourceCustomizations() {
- return serviceResourceCustomizations;
- }
-
- public void setServiceResourceCustomizations(
- Set<ServiceToResourceCustomization> serviceResourceCustomizations) {
- this.serviceResourceCustomizations = serviceResourceCustomizations;
- }
-
- @Override
- public String toString() {
- return "VnfResourceCustomization: " + "ModelCustUuid=" + this.modelCustomizationUuid +
- ", ModelInstanceName=" + this.modelInstanceName +
- ", vnfResourceModelUuid=" + this.vnfResourceModelUUID +
- ", creationTimestamp=" + this.created +
- ", minInstances=" + this.minInstances +
- ", maxInstances=" + this.maxInstances +
- ", availabilityZoneMaxCount=" + this.availabilityZoneMaxCount +
- ", nfFunction=" + this.nfFunction +
- ", nfType=" + this.nfType +
- ", nfRole=" + this.nfRole +
- ", nfNamingCode=" + this.nfNamingCode +
- ", multiStageDesign=" + this.multiStageDesign;
- }
-
-}