From 502142a7334ec31add9a72c239f260893f3022cb Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Mon, 18 Jan 2021 17:53:43 +0000 Subject: Fix import of services containing artifacts Signed-off-by: MichaelMorris Issue-ID: SDC-3437 Change-Id: Ib5402c38c1f2bffa906cef3a36bfdaf5b4d9cf8e --- .../sdc/be/components/csar/CsarArtifactsAndGroupsBusinessLogic.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'catalog-be/src/main/java/org') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarArtifactsAndGroupsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarArtifactsAndGroupsBusinessLogic.java index 5be54a3c88..6bde6ba771 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarArtifactsAndGroupsBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/csar/CsarArtifactsAndGroupsBusinessLogic.java @@ -1002,7 +1002,7 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic { } public Either, ResponseFormat> createOrUpdateCsarArtifactFromJson( - Component resource, User user, Map json, ArtifactOperationInfo operation) { + Component component, User user, Map json, ArtifactOperationInfo operation) { String jsonStr = gson.toJson(json); ArtifactDefinition artifactDefinitionFromJson = RepresentationUtils.convertJsonToArtifactDefinition(jsonStr, @@ -1011,9 +1011,9 @@ public class CsarArtifactsAndGroupsBusinessLogic extends BaseBusinessLogic { Either result; try { result = artifactsBusinessLogic.handleLoadedArtifact( - resource, user, operation, false, true, ComponentTypeEnum.RESOURCE, artifactDefinitionFromJson); + component, user, operation, false, true, component.getComponentType(), artifactDefinitionFromJson); } catch (ComponentException e) { - log.debug(FAILED_UPLOAD_ARTIFACT_TO_COMPONENT, ComponentTypeEnum.RESOURCE, resource.getName()); + log.debug(FAILED_UPLOAD_ARTIFACT_TO_COMPONENT, component.getComponentType(), component.getName()); return Either.right(componentsUtils.getResponseFormat(e)); } catch (Exception e) { ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.GENERAL_ERROR); -- cgit 1.2.3-korg