From b7a38592f4b665780b0ec048d6abddb89bfe3a62 Mon Sep 17 00:00:00 2001 From: Mojahidul Islam Date: Thu, 20 Jun 2019 17:45:08 +0530 Subject: Fixed bug - implementation path under interfaces the path of the implementation under interfaces points to a non-existing path Change-Id: Iec0c2119c405bf14a1ddec99a0462f29b91f8ea3 Issue-ID: SDC-2377 Signed-off-by: Mojahidul Islam --- .../java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java | 2 +- .../org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'catalog-be') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java index 401c03d44f..03c161e6d3 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java @@ -64,7 +64,7 @@ public class OperationArtifactUtil { // Service Proxy is only in Node Template interface if(componentInstance != null) { return createOperationArtifactPathInService(componentInstance.getToscaComponentName() - + "_v" + component.getVersion(), operation); + + "_v" + componentInstance.getComponentVersion(), operation); } // Resource Instance is part of Node Type interface else { diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java index 32d0acc640..3bd62b8d1c 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java @@ -75,6 +75,7 @@ public class OperationArtifactUtilTest { component.setVersion("1.0"); ComponentInstance componentInstance = new ComponentInstance(); componentInstance.setToscaComponentName("org.openecomp.resource.vf.TestResource"); + componentInstance.setComponentVersion("1.0"); final OperationDataDefinition op = new OperationDataDefinition(); final ArtifactDataDefinition implementation = new ArtifactDataDefinition(); implementation.setArtifactName("createBPMN.bpmn"); -- cgit 1.2.3-korg