summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMojahidul Islam <mojahidul.islam@amdocs.com>2019-06-20 17:45:08 +0530
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-06-23 13:26:11 +0000
commitb7a38592f4b665780b0ec048d6abddb89bfe3a62 (patch)
tree9877dcf5d862ce624384f543b4cf1244e4e205a5
parentaa18a9537994b8637d40516aab71fa82cf55c2d3 (diff)
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 <mojahidul.islam@amdocs.com>
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtil.java2
-rw-r--r--catalog-be/src/test/java/org/openecomp/sdc/be/tosca/utils/OperationArtifactUtilTest.java1
2 files changed, 2 insertions, 1 deletions
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");