Creation of Vendor Licensing Model is an optional step in VSP onboarding

Issue-ID: SDC-3471
Signed-off-by: JerzySzachniewicz <jerzy.szachniewicz@nokia.com>
Change-Id: Icb98d0832c49939e200ece77f4ca26744cb82222

2 files changed, 28 insertions, 3 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDescriptionDtoToVspDetailsTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDescriptionDtoToVspDetailsTest.java
index 9ec43e9226..20a544927e 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDescriptionDtoToVspDetailsTest.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDescriptionDtoToVspDetailsTest.java
@@ -17,9 +17,13 @@
 package org.openecomp.sdcrests.vsp.rest.mapping;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
-import org.junit.Test;
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.LicenseType;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
+import org.openecomp.sdc.vendorsoftwareproduct.types.LicensingData;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.VspDescriptionDto;
 
 /**
@@ -65,4 +69,21 @@ public class MapVspDescriptionDtoToVspDetailsTest {
         assertEquals(vendorName, target.getVendorName());
         assertEquals(vendorId, target.getVendorId());
     }
+
+    @Test
+    public void testLicenceTypeMapping() {
+        final VspDescriptionDto source = new VspDescriptionDto();
+        LicensingData licensingData = new LicensingData();
+        licensingData.setLicenseAgreement("testLicenseAgreement");
+        licensingData.setFeatureGroups(Collections.emptyList());
+        source.setLicenseType(LicenseType.EXTERNAL);
+        source.setLicensingData(licensingData);
+
+        final VspDetails target = new VspDetails();
+        final MapVspDescriptionDtoToVspDetails mapper = new MapVspDescriptionDtoToVspDetails();
+        mapper.doMapping(source, target);
+        assertEquals(LicenseType.EXTERNAL.name(), target.getLicenseType());
+        assertNull(target.getLicenseAgreement());
+        assertNull(target.getFeatureGroups());
+    }
 }
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDetailsToDtoTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDetailsToDtoTest.java
index d5eb7be0d3..2386328378 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDetailsToDtoTest.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/test/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVspDetailsToDtoTest.java
@@ -18,9 +18,9 @@ package org.openecomp.sdcrests.vsp.rest.mapping;
 
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.openecomp.sdc.vendorsoftwareproduct.dao.type.LicenseType;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
-import org.openecomp.sdc.vendorsoftwareproduct.types.LicensingData;
 import org.openecomp.sdc.versioning.dao.types.Version;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.VspDetailsDto;
 
@@ -68,6 +68,9 @@ public class MapVspDetailsToDtoTest {
         final String onboardingMethod = "b46520ac-e62f-4a24-8f40-ee6e65889bfc";
         source.setOnboardingMethod(onboardingMethod);
 
+        final String licenseType = LicenseType.EXTERNAL.name();
+        source.setLicenseType(licenseType);
+
         final VspDetailsDto target = new VspDetailsDto();
         final MapVspDetailsToDto mapper = new MapVspDetailsToDto();
         mapper.doMapping(source, target);
@@ -83,5 +86,6 @@ public class MapVspDetailsToDtoTest {
         assertEquals(vendorName, target.getVendorName());
         assertEquals(vlmVersionId, target.getLicensingVersion());
         assertEquals(onboardingMethod, target.getOnboardingMethod());
+        assertEquals(LicenseType.EXTERNAL, target.getLicenseType());
     }
 }