summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportManager.java3
-rw-r--r--catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadServiceInfo.java10
-rw-r--r--catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadServiceInfoTest.java4
3 files changed, 14 insertions, 3 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportManager.java
index 93601dfc8c..7958efa3de 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ServiceImportManager.java
@@ -80,6 +80,9 @@ public class ServiceImportManager {
if (serviceMetaData.getVendorRelease() != null) {
service.setVendorRelease(serviceMetaData.getVendorRelease());
}
+ service.setCategorySpecificMetadata(serviceMetaData.getCategorySpecificMetadata());
+ service.setDerivedFromGenericType(serviceMetaData.getDerivedFromGenericType());
+ service.setDerivedFromGenericVersion(serviceMetaData.getDerivedFromGenericVersion());
}
}
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadServiceInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadServiceInfo.java
index 26cee8447c..837791af22 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadServiceInfo.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadServiceInfo.java
@@ -21,6 +21,7 @@ package org.openecomp.sdc.be.model;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import lombok.Getter;
import lombok.Setter;
import org.openecomp.sdc.be.model.category.CategoryDefinition;
@@ -52,12 +53,16 @@ public class UploadServiceInfo {
private String contactId, name, serviceIconPath, icon, vendorName, vendorRelease, serviceVendorModelNumber;
private String serviceType = "";
private String model;
+ private Map<String, String> categorySpecificMetadata;
+ private String derivedFromGenericType;
+ private String derivedFromGenericVersion;
public UploadServiceInfo(String payloadData, String payloadName, String description, List<String> tags, String invariantUUID, String UUID,
String type, String category, String subcategory, String resourceVendor, String resourceVendorRelease,
String serviceRole, String serviceEcompNaming, String ecompGeneratedNaming, String namingPolicy,
List<UploadArtifactInfo> artifactList, String contactId, String name, String resourceIconPath, String icon,
- String vendorName, String vendorRelease, String serviceVendorModelNumber, String serviceType, String projectCode, String model) {
+ String vendorName, String vendorRelease, String serviceVendorModelNumber, String serviceType, String projectCode, String model, Map<String, String> categorySpecificMetadata,
+ String derivedFromGenericType, String derivedFromGenericVersion) {
this.payloadData = payloadData;
this.payloadName = payloadName;
this.description = description;
@@ -96,6 +101,9 @@ public class UploadServiceInfo {
categories.add(catDef);
}
}
+ this.categorySpecificMetadata = categorySpecificMetadata;
+ this.derivedFromGenericType = derivedFromGenericType;
+ this.derivedFromGenericVersion = derivedFromGenericVersion;
}
public UploadServiceInfo() {
diff --git a/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadServiceInfoTest.java b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadServiceInfoTest.java
index 0c34d4b745..d8ddb75be4 100644
--- a/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadServiceInfoTest.java
+++ b/catalog-model/src/test/java/org/openecomp/sdc/be/model/UploadServiceInfoTest.java
@@ -25,7 +25,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.openecomp.sdc.be.model.category.CategoryDefinition;
import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
-
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -40,7 +40,7 @@ public class UploadServiceInfoTest {
public void testCtor() {
new UploadServiceInfo("mock", "mock", "mock", new LinkedList<>(), "mock", "mock", "mock", "mock/mock/mock",
"mock", "mock", "mock", "mock", "mock", "mock", "mock", new LinkedList<>(), "mock", "mock", "mock",
- "mock", "mock", "mock", "mock", "mock", "mock", "mock");
+ "mock", "mock", "mock", "mock", "mock", "mock", "mock", new HashMap<>(), "mock", "mock");
}
@Test