From 6e75dd1bfd8c1a4625c9c61a60883d28ca88fff7 Mon Sep 17 00:00:00 2001
From: "andre.schmid" <andre.schmid@est.tech>
Date: Thu, 29 Jul 2021 10:14:19 +0100
Subject: Handle VSP package upload for multi-model
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Iceca3f160eaeb1a6431fc3c5bbab92847e95ae4d
Issue-ID: SDC-3667
Signed-off-by: André Schmid <andre.schmid@est.tech>
---
 .../sdcrests/vsp/rest/mapping/MapPackageInfoToPackageInfoDto.java     | 2 ++
 .../sdcrests/vendorsoftwareproducts/types/PackageInfoDto.java         | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest')

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapPackageInfoToPackageInfoDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapPackageInfoToPackageInfoDto.java
index c6faa0361b..3dce7a72af 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapPackageInfoToPackageInfoDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapPackageInfoToPackageInfoDto.java
@@ -34,6 +34,7 @@ public class MapPackageInfoToPackageInfoDto extends MappingBase<PackageInfo, Pac
         target.setPackageId(source.getVspId());
         target.setDescription(source.getVspDescription());
         target.setVersion(source.getVersion());
+        target.setVersionId(source.getVersionId());
         target.setPackageType(source.getPackageType());
         target.setCategory(source.getCategory());
         target.setSubCategory(source.getSubCategory());
@@ -41,5 +42,6 @@ public class MapPackageInfoToPackageInfoDto extends MappingBase<PackageInfo, Pac
         target.setVendorRelease(source.getVendorRelease());
         target.setVendorName(source.getVendorName());
         target.setResourceType(source.getResourceType());
+        target.setModels(source.getModels());
     }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/PackageInfoDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/PackageInfoDto.java
index 5650ac8670..8935349a4b 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/PackageInfoDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-types/src/main/java/org/openecomp/sdcrests/vendorsoftwareproducts/types/PackageInfoDto.java
@@ -15,6 +15,7 @@
  */
 package org.openecomp.sdcrests.vendorsoftwareproducts.types;
 
+import java.util.Set;
 import lombok.Data;
 
 /**
@@ -27,6 +28,7 @@ public class PackageInfoDto {
     private String description;
     private String vspName;
     private String version;
+    private String versionId;
     private String packageId;
     private String category;
     private String subCategory;
@@ -35,4 +37,6 @@ public class PackageInfoDto {
     private String packageChecksum;
     private String packageType;
     private String resourceType;
+    private Set<String> models;
+
 }
-- 
cgit 1.2.3-korg