diff options
author | Pavel Aharoni <pa0916@att.com> | 2017-05-14 17:56:49 +0300 |
---|---|---|
committer | Pavel Aharoni <pa0916@att.com> | 2017-05-14 17:59:26 +0300 |
commit | 7f05e4ea488144ba8bdecbed0aaa853a6d001a38 (patch) | |
tree | ffa347e4613fbcf8186b88c48f4228eeeb57519c /jtosca | |
parent | 3940304759ebd74d05c129501aa5f92e5e938033 (diff) |
[SDC-20] fix sdc csar for tosca parser dev2dev
Change-Id: I7ea8c3a9cc29be93c5cf6fb79b2b3dc23fb0bb0a
Signed-off-by: Pavel Aharoni <pa0916@att.com>
Diffstat (limited to 'jtosca')
-rw-r--r-- | jtosca/pom.xml | 4 | ||||
-rw-r--r-- | jtosca/src/main/java/org/openecomp/sdc/toscaparser/api/elements/NodeType.java | 5 |
2 files changed, 6 insertions, 3 deletions
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 @@ <parent> <groupId>org.openecomp.sdc.sdc-distribution-client</groupId> <artifactId>sdc-main-distribution-client</artifactId> - <version>1.1.9-SNAPSHOT</version> + <version>1.1.13-SNAPSHOT</version> </parent> <artifactId>jtosca</artifactId> - <version>0.1.3-SNAPSHOT</version> + <version>0.1.6-SNAPSHOT</version> <dependencies> 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; } |