diff options
Diffstat (limited to 'openecomp-be/backend')
2 files changed, 125 insertions, 46 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/main/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/main/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseManagerImpl.java index f27e6c05c4..6939eeed32 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/main/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/main/java/org/openecomp/sdc/vendorlicense/impl/VendorLicenseManagerImpl.java @@ -16,6 +16,7 @@ package org.openecomp.sdc.vendorlicense.impl; +import org.apache.commons.lang3.StringUtils; import org.openecomp.core.dao.UniqueValueDao; import org.openecomp.core.util.UniqueValueUtil; import org.openecomp.core.utilities.CommonMethods; @@ -23,8 +24,21 @@ import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.vendorlicense.VendorLicenseConstants; import org.openecomp.sdc.vendorlicense.VendorLicenseManager; -import org.openecomp.sdc.vendorlicense.dao.*; -import org.openecomp.sdc.vendorlicense.dao.types.*; +import org.openecomp.sdc.vendorlicense.dao.EntitlementPoolDao; +import org.openecomp.sdc.vendorlicense.dao.FeatureGroupDao; +import org.openecomp.sdc.vendorlicense.dao.LicenseAgreementDao; +import org.openecomp.sdc.vendorlicense.dao.LicenseKeyGroupDao; +import org.openecomp.sdc.vendorlicense.dao.LimitDao; +import org.openecomp.sdc.vendorlicense.dao.VendorLicenseModelDao; +import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity; +import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity; +import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupModel; +import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementEntity; +import org.openecomp.sdc.vendorlicense.dao.types.LicenseAgreementModel; +import org.openecomp.sdc.vendorlicense.dao.types.LicenseKeyGroupEntity; +import org.openecomp.sdc.vendorlicense.dao.types.LimitEntity; +import org.openecomp.sdc.vendorlicense.dao.types.LimitType; +import org.openecomp.sdc.vendorlicense.dao.types.VendorLicenseModelEntity; import org.openecomp.sdc.vendorlicense.errors.InvalidDateErrorBuilder; import org.openecomp.sdc.vendorlicense.errors.LimitErrorBuilder; import org.openecomp.sdc.vendorlicense.facade.VendorLicenseFacade; @@ -38,14 +52,14 @@ import java.util.Optional; import java.util.Set; public class VendorLicenseManagerImpl implements VendorLicenseManager { - private final UniqueValueUtil uniqueValueUtil; - private final VendorLicenseFacade vendorLicenseFacade; - private final VendorLicenseModelDao vendorLicenseModelDao; - private final LicenseAgreementDao licenseAgreementDao; - private final FeatureGroupDao featureGroupDao; - private final EntitlementPoolDao entitlementPoolDao; - private final LicenseKeyGroupDao licenseKeyGroupDao; - private final LimitDao limitDao; + private UniqueValueUtil uniqueValueUtil; + private VendorLicenseFacade vendorLicenseFacade; + private VendorLicenseModelDao vendorLicenseModelDao; + private LicenseAgreementDao licenseAgreementDao; + private FeatureGroupDao featureGroupDao; + private EntitlementPoolDao entitlementPoolDao; + private LicenseKeyGroupDao licenseKeyGroupDao; + private LimitDao limitDao; private static final String EP_POOL_START_TIME = "T00:00:00Z"; private static final String EP_POOL_EXPIRY_TIME = "T23:59:59Z"; @@ -261,54 +275,68 @@ public class VendorLicenseManagerImpl implements VendorLicenseManager { private void validateCreateDate(String startDate, String expiryDate, String vendorLicenseModelId) { - if(isNull(startDate, expiryDate) || isEmpty(startDate, expiryDate) || - isInvalidStartEndDate(startDate, expiryDate)){ + //original logic allows both nulls + if(StringUtils.isEmpty(startDate) && StringUtils.isEmpty(expiryDate)){ + return; + } + + Optional<LocalDate> parsedStartDate = parseLocalDate(startDate); + Optional<LocalDate> parsedExpiryDate = parseLocalDate(expiryDate); + if (!parsedStartDate.isPresent()) { throw new CoreException( new InvalidDateErrorBuilder(vendorLicenseModelId) .build()); } - } - private boolean isInvalidStartEndDate(String startDate, String expiryDate) { - LocalDate parsedStartDate = parseLocalDate(startDate); - LocalDate parsedExpiryDate = parseLocalDate(expiryDate); + if (!parsedExpiryDate.isPresent() + && parsedStartDate.get().atStartOfDay().isBefore + (LocalDate.now().atStartOfDay())) { + throw new CoreException( + new InvalidDateErrorBuilder(vendorLicenseModelId) + .build()); + } - return parsedStartDate.atStartOfDay().isBefore(LocalDate.now().atStartOfDay()) - || parsedExpiryDate.atStartOfDay().isEqual(parsedStartDate.atStartOfDay()) - || parsedExpiryDate.isBefore(parsedStartDate); + if(parsedExpiryDate.isPresent() && isNotValidatStartAndExpiryDate(parsedStartDate.get(), parsedExpiryDate.get())){ + throw new CoreException( + new InvalidDateErrorBuilder(vendorLicenseModelId) + .build()); + } } - private boolean isEmpty(String startDate, String expiryDate) { - return startDate.isEmpty() || expiryDate.isEmpty(); + private boolean isNotValidatStartAndExpiryDate(LocalDate parsedStartDate, + LocalDate parsedExpiryDate) { + return parsedStartDate.atStartOfDay().isBefore(LocalDate.now().atStartOfDay()) + || parsedExpiryDate.atStartOfDay().isEqual(parsedStartDate.atStartOfDay()) + || parsedExpiryDate.isBefore(parsedStartDate); } - private boolean isNull(String startDate, String expiryDate) { - return startDate == null || expiryDate == null; - } + private static Optional<LocalDate> parseLocalDate(String date) { + if (StringUtils.isEmpty(date)) { + return Optional.empty(); + } - private static LocalDate parseLocalDate(String date) { - return LocalDate.parse(date, FORMATTER ); + return Optional.of(LocalDate.parse(date, FORMATTER )); } private void validateUpdateDate(String startDate, String expiryDate, String vendorLicenseModelId) { + Optional<LocalDate> parsedStartDate = parseLocalDate(startDate); + Optional<LocalDate> parsedExpiryDate = parseLocalDate(expiryDate); - if(isNull(startDate, expiryDate) || isEmpty(startDate, expiryDate) - || isInvalidUpdateDate(startDate, expiryDate)){ + if (parsedStartDate.isPresent() && parsedExpiryDate.isPresent() + && (parsedExpiryDate.get().atStartOfDay() + .isEqual(parsedStartDate.get().atStartOfDay()) + || parsedExpiryDate.get().isBefore(parsedStartDate.get() ))) { throw new CoreException( new InvalidDateErrorBuilder(vendorLicenseModelId) .build()); } - } - - private boolean isInvalidUpdateDate(String startDate, String expiryDate) { - LocalDate parsedStartDate = parseLocalDate(startDate); - LocalDate parsedExpiryDate = parseLocalDate(expiryDate); - - return parsedExpiryDate.atStartOfDay() - .isEqual(parsedStartDate.atStartOfDay()) - || parsedExpiryDate.isBefore(parsedStartDate); + if (startDate == null && expiryDate != null) { + throw new CoreException( + new InvalidDateErrorBuilder(vendorLicenseModelId) + .build()); + } } @Override @@ -378,7 +406,7 @@ public class VendorLicenseManagerImpl implements VendorLicenseManager { .getStartDate().trim().length() != 0 ? licenseKeyGroup.getStartDate() + EP_POOL_START_TIME : null) : null); licenseKeyGroup.setExpiryDate(licenseKeyGroup.getExpiryDate() != null ? (licenseKeyGroup - .getExpiryDate().trim().length() != 0 ? licenseKeyGroup.getExpiryDate() + EP_POOL_EXPIRY_TIME + .getExpiryDate().trim().length() != 0 ? licenseKeyGroup.getExpiryDate() + EP_POOL_EXPIRY_TIME : null) : null); validateCreateDate(licenseKeyGroup.getStartDate(), licenseKeyGroup.getExpiryDate(), @@ -392,7 +420,7 @@ public class VendorLicenseManagerImpl implements VendorLicenseManager { .getStartDate().trim().length() != 0 ? licenseKeyGroup.getStartDate() + EP_POOL_START_TIME : null) : null); licenseKeyGroup.setExpiryDate(licenseKeyGroup.getExpiryDate() != null ? (licenseKeyGroup - .getExpiryDate().trim().length() != 0 ? licenseKeyGroup.getExpiryDate() + EP_POOL_EXPIRY_TIME + .getExpiryDate().trim().length() != 0 ? licenseKeyGroup.getExpiryDate() + EP_POOL_EXPIRY_TIME : null) : null); validateUpdateDate(licenseKeyGroup.getStartDate(), licenseKeyGroup.getExpiryDate(), diff --git a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java index 7b40686271..5db85fef06 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-license-manager/src/test/java/org/openecomp/sdc/vendorlicense/impl/EntitlementPoolTest.java @@ -28,7 +28,13 @@ import org.mockito.Spy; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.vendorlicense.dao.EntitlementPoolDao; import org.openecomp.sdc.vendorlicense.dao.LimitDao; -import org.openecomp.sdc.vendorlicense.dao.types.*; +import org.openecomp.sdc.vendorlicense.dao.types.AggregationFunction; +import org.openecomp.sdc.vendorlicense.dao.types.EntitlementMetric; +import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity; +import org.openecomp.sdc.vendorlicense.dao.types.EntitlementTime; +import org.openecomp.sdc.vendorlicense.dao.types.MultiChoiceOrOther; +import org.openecomp.sdc.vendorlicense.dao.types.OperationalScope; +import org.openecomp.sdc.vendorlicense.dao.types.ThresholdUnit; import org.openecomp.sdc.vendorlicense.errors.VendorLicenseErrorCodes; import org.openecomp.sdc.vendorlicense.facade.VendorLicenseFacade; import org.openecomp.sdc.versioning.dao.types.Version; @@ -40,8 +46,10 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Mockito.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.verify; public class EntitlementPoolTest { @@ -191,6 +199,49 @@ public class EntitlementPoolTest { } @Test + public void createWithExpiryDateNullTest() { + + Set<OperationalScope> opScopeChoices; + opScopeChoices = new HashSet<>(); + opScopeChoices.add(OperationalScope.Core); + opScopeChoices.add(OperationalScope.CPU); + opScopeChoices.add(OperationalScope.Network_Wide); + EntitlementPoolEntity ep2 = + createEntitlementPool("vlm2Id", null, ep1_id, EP1_NAME, "EP2 dec", 70, + ThresholdUnit.Absolute, + EntitlementMetric.Other, "exception metric2", "inc2", AggregationFunction.Average, null, + opScopeChoices, null, EntitlementTime.Other, "time2", "sku2"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM/dd/yyyy"); + ep2.setStartDate(LocalDate.now().format(formatter)); + ep2.setExpiryDate(null); + ep2.setVendorLicenseModelId(vlm1_id); + vendorLicenseManagerImpl.createEntitlementPool(ep2); + verify(vendorLicenseFacade).createEntitlementPool(ep2); + + } + + @Test + public void createWithStartAndExpiryDateNullTest() { + + Set<OperationalScope> opScopeChoices; + opScopeChoices = new HashSet<>(); + opScopeChoices.add(OperationalScope.Core); + opScopeChoices.add(OperationalScope.CPU); + opScopeChoices.add(OperationalScope.Network_Wide); + EntitlementPoolEntity ep2 = + createEntitlementPool("vlm2Id", null, ep1_id, EP1_NAME, "EP2 dec", 70, + ThresholdUnit.Absolute, + EntitlementMetric.Other, "exception metric2", "inc2", AggregationFunction.Average, null, + opScopeChoices, null, EntitlementTime.Other, "time2", "sku2"); + ep2.setStartDate(null); + ep2.setExpiryDate(null); + ep2.setVendorLicenseModelId(vlm1_id); + vendorLicenseManagerImpl.createEntitlementPool(ep2); + verify(vendorLicenseFacade).createEntitlementPool(ep2); + + } + + @Test public void testUpdate() { Set<OperationalScope> opScopeChoices; opScopeChoices = new HashSet<>(); @@ -298,12 +349,12 @@ public class EntitlementPoolTest { entitlementPool.setStartDate(LocalDate.now().format(formatter)); entitlementPool.setExpiryDate(LocalDate.now().plusDays(1L).format(formatter)); - doReturn(entitlementPool).when(entitlementPoolDao).get(anyObject()); + doReturn(entitlementPool).when(entitlementPoolDao).get(any()); doNothing().when(vendorLicenseManagerImpl).deleteChildLimits(vlm1_id, VERSION01, ep1_id); - doNothing().when(vendorLicenseManagerImpl).deleteUniqueName(anyObject(), anyObject(), - anyObject(), anyObject()); + doNothing().when(vendorLicenseManagerImpl).deleteUniqueName(any(), any(), + any(), any()); vendorLicenseManagerImpl.deleteEntitlementPool(entitlementPool); @@ -328,7 +379,7 @@ public class EntitlementPoolTest { entitlementPool.setStartDate(LocalDateTime.now().format(formatter)); entitlementPool.setExpiryDate(LocalDateTime.now().plusDays(1L).format(formatter)); - doReturn(entitlementPool).when(entitlementPoolDao).get(anyObject()); + doReturn(entitlementPool).when(entitlementPoolDao).get(any()); EntitlementPoolEntity retrieved = vendorLicenseManagerImpl.getEntitlementPool(entitlementPool); |