Fix import service to persist its model name

Issue-ID: SDC-3801
Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech>
Change-Id: Ibf3fc8b1a2a8871058e763d915accec5c72375ec

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 9fba1c7..93601df 100644 (file)
--- 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
@@ -73,6 +73,7 @@ public class ServiceImportManager {
             serviceMetadataDataDefinition.getServiceVendorModelNumber();
             service.setServiceType("");
             service.setProjectCode(serviceMetaData.getProjectCode());
+            service.setModel(serviceMetaData.getModel());
             if (serviceMetaData.getVendorName() != null) {
                 service.setVendorName(serviceMetaData.getVendorName());
             }

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 1e5c824..26cee84 100644 (file)
--- 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
@@ -51,12 +51,13 @@ public class UploadServiceInfo {
     private List<UploadArtifactInfo> artifactList;
     private String contactId, name, serviceIconPath, icon, vendorName, vendorRelease, serviceVendorModelNumber;
     private String serviceType = "";
+    private String model;
 
     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 vendorName, String vendorRelease, String serviceVendorModelNumber, String serviceType, String projectCode, String model) {
         this.payloadData = payloadData;
         this.payloadName = payloadName;
         this.description = description;
@@ -82,6 +83,7 @@ public class UploadServiceInfo {
         this.serviceVendorModelNumber = serviceVendorModelNumber;
         this.serviceType = serviceType;
         this.projectCode = projectCode;
+        this.model = model;
         if (category != null) {
             String[] arr = category.split("/");
             if (arr.length >= 2) {

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 ca17663..0c34d4b 100644 (file)
--- 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
@@ -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");
     }
 
     @Test