summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavsad <david.sadlier@est.tech>2021-02-17 08:57:04 +0000
committerChristophe Closset <christophe.closset@intl.att.com>2021-02-20 07:41:45 +0000
commitd6992c860be02a4c88b8f49234d8ee7e117dd60a (patch)
tree3a1d3b18f0f682ab21c0f9b3e8165e8283c498cb
parentb1660e1be36e1f6572253f871dd5defa4030c98a (diff)
Fix updating resource version on composition ui
Issue-ID: SDC-3433 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: Ic4334965b0652fba4f55d4f5892d006f8ca469f0
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
index 5af6f41938..d603c8fc78 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ComponentInstanceBusinessLogic.java
@@ -2568,7 +2568,6 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
}
Component eitherOriginComponent = getInstanceOriginNode(currentResourceInstance);
-
DataForMergeHolder dataHolder = compInstMergeDataBL
.saveAllDataBeforeDeleting(containerComponent, currentResourceInstance, eitherOriginComponent);
ComponentInstance resResourceInfo = deleteComponentInstance(containerComponent, componentInstanceId,
@@ -2580,8 +2579,8 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
} else {
Component origComponent = null;
OriginTypeEnum originType = currentResourceInstance.getOriginType();
+ newComponentInstance.setOriginType(originType);
if (originType == OriginTypeEnum.ServiceProxy) {
- newComponentInstance.setOriginType(originType);
Either<Component, StorageOperationStatus> serviceProxyOrigin = toscaOperationFacade
.getLatestByName("serviceProxy");
if (isServiceProxyOrigin(serviceProxyOrigin)) {
@@ -2597,8 +2596,6 @@ public class ComponentInstanceBusinessLogic extends BaseBusinessLogic {
componentsUtils.convertFromStorageResponse(fillProxyRes));
}
} else if (originType == OriginTypeEnum.ServiceSubstitution){
- newComponentInstance.setOriginType(originType);
-
final Either<Component, StorageOperationStatus> getServiceResult = toscaOperationFacade.getToscaFullElement(newComponentInstance.getComponentUid());
if (getServiceResult.isRight()) {
throw new ByActionStatusComponentException(componentsUtils.convertFromStorageResponse(getServiceResult.right().value()));