From 7f05e4ea488144ba8bdecbed0aaa853a6d001a38 Mon Sep 17 00:00:00 2001 From: Pavel Aharoni Date: Sun, 14 May 2017 17:56:49 +0300 Subject: [SDC-20] fix sdc csar for tosca parser dev2dev Change-Id: I7ea8c3a9cc29be93c5cf6fb79b2b3dc23fb0bb0a Signed-off-by: Pavel Aharoni --- jtosca/pom.xml | 4 ++-- .../java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'jtosca') diff --git a/jtosca/pom.xml b/jtosca/pom.xml index ce50fec..3ef6a3c 100644 --- a/jtosca/pom.xml +++ b/jtosca/pom.xml @@ -5,11 +5,11 @@ org.openecomp.sdc.sdc-distribution-client sdc-main-distribution-client - 1.1.9-SNAPSHOT + 1.1.13-SNAPSHOT jtosca - 0.1.3-SNAPSHOT + 0.1.6-SNAPSHOT diff --git a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java index 853b8ac..e7dc464 100644 --- a/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java +++ b/jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java @@ -106,7 +106,10 @@ public class NodeType extends StatefulEntityType { // the capability type String captype = (String)req.get("capability"); String value = _getNodeTypeByCap(captype); - relation = _getRelation(key,value); + String getRelation = _getRelation(key,value); + if (getRelation != null) { + relation = getRelation; + } keyword = key; nodeType = value; } -- cgit 1.2.3-korg