aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src
diff options
context:
space:
mode:
authortalig <talig@amdocs.com>2017-10-23 09:23:14 +0300
committertalig <talig@amdocs.com>2017-10-23 09:23:14 +0300
commitf4398a841ce8c4c185ab75abdf5e5a1c2d8ff784 (patch)
tree05a536d22c52a0b3a8ca5135ea9a17d3be833a24 /openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src
parent6c416937323340a10095cfc2eb70229759fc4b92 (diff)
Fix onboarding undo checkout impl
Fix reset in zusammen collaboration plugin, Throw explicit exception in case of zusammen db illegal state. Change-Id: Ic9463517b72c7a89a2de78b86da5679ac57371a6 Issue-ID: SDC-490 Signed-off-by: talig <talig@amdocs.com>
Diffstat (limited to 'openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src')
-rw-r--r--openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
index 1891cddfd5..be1aaf08e5 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
@@ -256,6 +256,12 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa
Version version =
getVersionInfo(vendorSoftwareProductId, VersionableEntityAction.Read, user)
.getActiveVersion();
+
+ ActivityLogEntity activityLogEntity =
+ new ActivityLogEntity(vendorSoftwareProductId, String.valueOf(version.getMajor() + 1),
+ ActivityType.UNDO_CHECKOUT.toString(), user, true, "", "");
+ activityLogManager.addActionLog(activityLogEntity, user);
+
String preVspName = vspInfoDao
.get(new VspDetails(vendorSoftwareProductId, version)).getName();
@@ -407,8 +413,8 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa
getFeatureGroupMandatoryErrorBuilder(deploymentlocalFlavor.getModel());
errorCodeList.add(deploymentFlavorErrorBuilder);
}
- List<ComponentComputeAssociation> componetComputeAssociations = new ArrayList<>();
- componetComputeAssociations = deploymentlocalFlavor.getComponentComputeAssociations();
+ List<ComponentComputeAssociation> componetComputeAssociations =
+ deploymentlocalFlavor.getComponentComputeAssociations();
if (CollectionUtils.isEmpty(componetComputeAssociations)) {
CompositionEntityValidationData compositionEntityValidationData = new
CompositionEntityValidationData(CompositionEntityType.deployment, deploymentFlavor