From: Maharajh, Robby (rx2202) <rx2202@us.att.com>
Date: Wed, 16 Aug 2017 14:54:45 +0000 (-0400)
Subject: [AAI-178 Amsterdam] Make Edge Properties to be
X-Git-Tag: v1.1.0~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=828c5be71fcb4407a1ec4a915cc6ff4e5494fd68;p=aai%2Fresources.git

[AAI-178 Amsterdam] Make Edge Properties to be

declared by direction

Change-Id: I7603ebdc4986caccd7c8be7e62769765e805c4b2
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@us.att.com>
---

diff --git a/aai-resources/src/main/java/org/openecomp/aai/dbgen/ForceDeleteTool.java b/aai-resources/src/main/java/org/openecomp/aai/dbgen/ForceDeleteTool.java
index 1cab2721..0cd0531a 100644
--- a/aai-resources/src/main/java/org/openecomp/aai/dbgen/ForceDeleteTool.java
+++ b/aai-resources/src/main/java/org/openecomp/aai/dbgen/ForceDeleteTool.java
@@ -31,7 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 import org.openecomp.aai.exceptions.AAIException;
-import org.openecomp.aai.serialization.db.EdgeProperties;
+import org.openecomp.aai.serialization.db.AAIDirection;
 import org.openecomp.aai.serialization.db.EdgeProperty;
 import org.openecomp.aai.util.AAIConfig;
 import org.openecomp.aai.util.AAIConstants;
@@ -537,7 +537,7 @@ public class ForceDeleteTool {
 			}
 			
 			try {
-				Iterator <Vertex> vertI = graph.traversal().V(vtx).union(__.outE().has(EdgeProperties.out(EdgeProperty.IS_PARENT), true).inV(), __.inE().has(EdgeProperties.in(EdgeProperty.IS_PARENT), true).outV());
+				Iterator <Vertex> vertI = graph.traversal().V(vtx).union(__.outE().has(EdgeProperty.CONTAINS.toString(), AAIDirection.OUT.toString()).inV(), __.inE().has(EdgeProperty.CONTAINS.toString(), AAIDirection.IN.toString()).outV());
 				while( vertI != null && vertI.hasNext() ){
 					totalCount++;
 					Vertex childVtx = vertI.next();