From 5ed3d4d047f8e455d6a80cc8b9b3f91a5f2459cd Mon Sep 17 00:00:00 2001 From: JulienBe Date: Wed, 9 Sep 2020 12:46:42 +0200 Subject: Create / Update Entitlement Pool - Support Type Field Setting Universal as the default EntitlementPoolType if none is provided to the api Issue-ID: SDC-2820 Signed-off-by: JulienBe Change-Id: I64f90e37f8969488f7453aa53543b566281f2a37 --- .../ci/tests/utils/general/VendorLicenseModelRestUtils.java | 6 ------ .../openecomp/sdcrests/vendorlicense/rest/EntitlementPools.java | 7 ++----- .../sdc/vendorlicense/dao/types/EntitlementPoolType.java | 8 ++------ 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorLicenseModelRestUtils.java b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorLicenseModelRestUtils.java index 072f2a95ea..c4c00470ef 100644 --- a/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorLicenseModelRestUtils.java +++ b/integration-tests/src/test/java/org/onap/sdc/backend/ci/tests/utils/general/VendorLicenseModelRestUtils.java @@ -107,17 +107,12 @@ public class VendorLicenseModelRestUtils { assertEquals("did not succeed to create vendor license agreement", 200, vendorLicenseAgreement.getErrorCode().intValue()); String vendorLicenseAgreementId = ResponseParser.getValueFromJsonResponse(vendorLicenseAgreement.getResponse(), "value"); -// RestResponse checkinVendorLicense = OnboardingUtils.checkinVendorLicense(vendorId, user, versionId); -// assertEquals("did not succeed to checkin vendor license", 200, checkinVendorLicense.getErrorCode().intValue()); - vendorLicenseModel = new VendorLicenseModel(vendorId, vendorLicenseName, vendorLicenseAgreementId, featureGroupId); vendorLicenseModel.setVersion(versionId); // Once object created and submitted, his initial version is 1.0 RestResponse submitVendorLicense = submitVendorLicense(vendorLicenseModel, user); assertEquals("did not succeed to submit vendor license", 200, submitVendorLicense.getErrorCode().intValue()); -// ComponentBaseTest.getExtendTest().log(Status.INFO, "Succeeded in creating the vendor license"); - return vendorLicenseModel; } @@ -218,7 +213,6 @@ public class VendorLicenseModelRestUtils { jObject.put("name", "xyz"); jObject.put("description", "new vendor license feature groups"); jObject.put("partNumber", "123abc456"); -// jObject.put("manufacturerReferenceNumber", "5"); jObject.put("addedLicenseKeyGroupsIds", Arrays.asList(licenseKeyGroupId).toArray()); jObject.put("addedEntitlementPoolsIds", Arrays.asList(entitlementPoolId).toArray()); diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/EntitlementPools.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/EntitlementPools.java index 6b30b74bf8..2b16ffcb65 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/EntitlementPools.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-license-rest/vendor-license-rest-services/src/main/java/org/openecomp/sdcrests/vendorlicense/rest/EntitlementPools.java @@ -60,11 +60,8 @@ public interface EntitlementPools { @Path("/") @Operation(description = "Create vendor entitlement pool") Response createEntitlementPool(@Valid EntitlementPoolRequestDto request, - @Parameter(description = "Vendor license model Id") @PathParam("vlmId") - String vlmId, - @Parameter(description = "Vendor license model version Id") @PathParam - ("versionId") - String versionId, + @Parameter(description = "Vendor license model Id") @PathParam("vlmId") String vlmId, + @Parameter(description = "Vendor license model version Id") @PathParam ("versionId") String versionId, @NotNull(message = USER_MISSING_ERROR_MSG) @HeaderParam(USER_ID_HEADER_PARAM) String user); diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolType.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolType.java index 3b66fab110..1a851a54ac 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolType.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolType.java @@ -26,10 +26,6 @@ public enum EntitlementPoolType { One_Time; public static EntitlementPoolType permissiveValueOf(String name) { - if (name == null){ - return null; - } else { - return EntitlementPoolType.valueOf(name); - } + return name == null ? Universal : EntitlementPoolType.valueOf(name); } -} +} \ No newline at end of file -- cgit 1.2.3-korg