From 7c61c7bb0369bc27d05c8801c8cb0cca41e494bf Mon Sep 17 00:00:00 2001 From: vasraz Date: Sat, 5 Aug 2023 18:28:19 +0100 Subject: Fix 'Import use case fails when interfaces in template do not exist in system'-bug (p.2) No interfaces defined on the VFC: - SDC create the basic interface operations on the VFC - Create / Delete etc - with no implementation details - Add the implementations to the interface on the Service side If interfaces are defined on the VFC with no implementation details defined: - SDC import successfully and add the implementation details to the interface on the Service side Signed-off-by: Vasyl Razinkov Change-Id: If966a64b865791eed0cf29c8da8f04e44eb32e50 Issue-ID: SDC-4591 --- .../org/openecomp/sdc/be/model/UploadCapInfo.java | 27 +++-------------- .../org/openecomp/sdc/be/model/UploadInfo.java | 28 ++++-------------- .../sdc/be/model/UploadInterfaceInfo.java | 34 ++++------------------ 3 files changed, 15 insertions(+), 74 deletions(-) (limited to 'catalog-model/src') diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadCapInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadCapInfo.java index 82c1bdd8a7..9516e84ed6 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadCapInfo.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadCapInfo.java @@ -20,7 +20,11 @@ package org.openecomp.sdc.be.model; import java.util.List; +import lombok.Getter; +import lombok.Setter; +@Getter +@Setter public class UploadCapInfo extends UploadInfo { /** @@ -30,27 +34,4 @@ public class UploadCapInfo extends UploadInfo { private List properties; private String node; - public String getNode() { - return node; - } - - public void setNode(String node) { - this.node = node; - } - - public List getValidSourceTypes() { - return validSourceTypes; - } - - public void setValidSourceTypes(List validSourceTypes) { - this.validSourceTypes = validSourceTypes; - } - - public List getProperties() { - return properties; - } - - public void setProperties(List properties) { - this.properties = properties; - } } diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInfo.java index 6b48e4fe2f..eb16d449b5 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInfo.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInfo.java @@ -19,33 +19,15 @@ */ package org.openecomp.sdc.be.model; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter public abstract class UploadInfo { private String key; private String type; private String name; - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } } diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInterfaceInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInterfaceInfo.java index 1a05ace4f1..582afabcb2 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInterfaceInfo.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadInterfaceInfo.java @@ -20,11 +20,16 @@ */ package org.openecomp.sdc.be.model; -import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition; import java.util.HashMap; import java.util.Map; +import lombok.Getter; +import lombok.Setter; +import org.openecomp.sdc.be.datatypes.elements.OperationDataDefinition; +@Getter +@Setter public class UploadInterfaceInfo extends UploadInfo { + private Object value; private String description; private String type; @@ -37,31 +42,4 @@ public class UploadInterfaceInfo extends UploadInfo { return operations; } - public void setOperations(Map operations) { - this.operations = operations; - } - - public Object getValue() { - return value; - } - - public void setValue(Object value) { - this.value = value; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } } -- cgit 1.2.3-korg