aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuanHu <yuan.hu1@zte.com.cn>2016-11-21 09:49:20 +0800
committerYuanHu <yuan.hu1@zte.com.cn>2016-11-21 09:49:20 +0800
commit8c9c4f1296fe54d984249a146544e23564fc0f60 (patch)
tree507e3fb31a80be4fedcea7351138ff7b9d348c70
parentd51ccbff2e62811adb917b1ded06d3988eda15b4 (diff)
Filtered the relationship which target node is same to the source node.
Change-Id: I5e8a8148f7d449be1e7094dea4568d68d7fcff35 Issue-id: TOSCA-183 Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
-rw-r--r--catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/aria/AriaModelParser.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/aria/AriaModelParser.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/aria/AriaModelParser.java
index 5145d647..71372c2c 100644
--- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/aria/AriaModelParser.java
+++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/model/parser/yaml/aria/AriaModelParser.java
@@ -186,7 +186,8 @@ public class AriaModelParser extends AbstractModelParser {
* @return
* @throws CatalogResourceException
*/
- private List<RelationShip> parseNodeTemplateRelationShip(Relationship[] relationships, Node sourceNode, Node[] nodes) throws CatalogResourceException {
+ private List<RelationShip> parseNodeTemplateRelationShip(Relationship[] relationships,
+ Node sourceNode, Node[] nodes) throws CatalogResourceException {
List<RelationShip> retList = new ArrayList<>();
if (relationships == null || relationships.length == 0) {
@@ -194,6 +195,10 @@ public class AriaModelParser extends AbstractModelParser {
}
for (Relationship relationship : relationships) {
+ if (relationship.getTarget_node_id().equals(sourceNode.getId())) {
+ continue; // target == source, ignore.
+ }
+
RelationShip ret = new RelationShip();
ret.setSourceNodeId(sourceNode.getTemplate_name());
ret.setSourceNodeName(sourceNode.getTemplate_name());