X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Fcomponents%2Fimpl%2FResourceBusinessLogic.java;h=50b2941f1ba000837ceab7bc7a26dbb96eccc28c;hb=a8d3e1b8c759c21227690a425552a245da883e97;hp=ffac13bdb573d86e8430449ee7cf196abe6df8eb;hpb=591810df468a8e2c59569e701f514bff61203940;p=sdc.git

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
index ffac13bdb5..50b2941f1b 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
@@ -603,7 +603,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 		ParsedToscaYamlInfo uploadComponentInstanceInfoMap;
 		try {
 			uploadComponentInstanceInfoMap = csarBusinessLogic.getParsedToscaYamlInfo(yamlFileContent, yamlFileName,
-					nodeTypesInfo, csarInfo, nodeName);
+					nodeTypesInfo, csarInfo, nodeName, oldResource);
 			Map<String, UploadComponentInstanceInfo> instances = uploadComponentInstanceInfoMap.getInstances();
             if (MapUtils.isEmpty(instances) && newResource.getResourceType() != ResourceTypeEnum.PNF) {
                 throw new ByActionStatusComponentException(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, yamlFileName);
@@ -1193,7 +1193,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 		List<ArtifactDefinition> createdArtifacts = new ArrayList<>();
 		Resource createdResource;
 		try {
-            ParsedToscaYamlInfo parsedToscaYamlInfo = csarBusinessLogic.getParsedToscaYamlInfo(topologyTemplateYaml, yamlName, nodeTypesInfo, csarInfo, nodeName);
+            ParsedToscaYamlInfo parsedToscaYamlInfo = csarBusinessLogic.getParsedToscaYamlInfo(topologyTemplateYaml, yamlName, nodeTypesInfo, csarInfo, nodeName, resource);
             if (MapUtils.isEmpty(parsedToscaYamlInfo.getInstances()) && resource.getResourceType() != ResourceTypeEnum.PNF) {
                 throw new ByActionStatusComponentException(ActionStatus.NOT_TOPOLOGY_TOSCA_TEMPLATE, yamlName);
             }
@@ -2317,9 +2317,15 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
 					createArtifactsFromCsar = csarArtifactsAndGroupsBusinessLogic.createResourceArtifactsFromCsar(
 							csarInfo, resource, artifactsContents, artifactsFileName, createdArtifacts);
 				} else {
-					createArtifactsFromCsar = csarArtifactsAndGroupsBusinessLogic.updateResourceArtifactsFromCsar(
+					Either<Component, ResponseFormat> result  = csarArtifactsAndGroupsBusinessLogic.updateResourceArtifactsFromCsar(
 							csarInfo, resource, artifactsContents, artifactsFileName, createdArtifacts, shouldLock,
 							inTransaction);
+					if ((result.left().value() instanceof Resource) && result.isLeft()) {
+						Resource service1 = (Resource) result.left().value();
+						createArtifactsFromCsar = Either.left(service1);
+					} else {
+						createArtifactsFromCsar = Either.right(result.right().value());
+					}
 				}
 
 				if (createArtifactsFromCsar.isRight()) {