AAI-1523 checkstyle warnings for aai-core introspe
[aai/aai-common.git] / aai-core / src / test / java / org / onap / aai / introspection / sideeffect / DataLinkTest.java
index c121829..5b9a0fa 100644 (file)
@@ -64,303 +64,303 @@ import static org.mockito.Mockito.when;
 @RunWith(value = Parameterized.class)
 public class DataLinkTest extends DataLinkSetup {
 
-       private static JanusGraph graph;
-       private final static ModelType introspectorFactoryType = ModelType.MOXY;
-       private final static DBConnectionType type = DBConnectionType.REALTIME;
-       private static Loader loader;
-       private static TransactionalGraphEngine dbEngine;
-       @Mock private QueryParser parser;
-       @Mock private Vertex self;
-       @Mock private VertexProperty<String> prop;
-       @Rule
-       public ExpectedException thrown = ExpectedException.none();
+    private static JanusGraph graph;
+    private final static ModelType introspectorFactoryType = ModelType.MOXY;
+    private final static DBConnectionType type = DBConnectionType.REALTIME;
+    private static Loader loader;
+    private static TransactionalGraphEngine dbEngine;
+    @Mock private QueryParser parser;
+    @Mock private Vertex self;
+    @Mock private VertexProperty<String> prop;
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
-       
     
-       @Parameterized.Parameter(value = 0)
-       public QueryStyle queryStyle;
+    
+    @Parameterized.Parameter(value = 0)
+    public QueryStyle queryStyle;
 
-       @Parameterized.Parameters(name = "QueryStyle.{0}")
-       public static Collection<Object[]> data() {
-               return Arrays.asList(new Object[][]{
-                               {QueryStyle.TRAVERSAL},
-                               {QueryStyle.TRAVERSAL_URI}
-               });
-       }
-       
-       @BeforeClass
-       public static void setup() throws NoSuchFieldException, SecurityException, Exception {
-               graph = JanusGraphFactory.build().set("storage.backend","inmemory").open();
-               
+    @Parameterized.Parameters(name = "QueryStyle.{0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {QueryStyle.TRAVERSAL},
+                {QueryStyle.TRAVERSAL_URI}
+        });
+    }
+    
+    @BeforeClass
+    public static void setup() throws NoSuchFieldException, SecurityException, Exception {
+        graph = JanusGraphFactory.build().set("storage.backend","inmemory").open();
+        
 
-               graph.traversal().addV("aai-node-type", "vpn-binding", "vpn-id", "addKey", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/addKey").as("v1")
-               .addV("aai-node-type", "vpn-binding", "vpn-id", "modifyKey", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/modifyKey").as("v2")
-               .addV("aai-node-type", "route-target", "global-route-target", "modifyTargetKey", "route-target-role", "modifyRoleKey", "linked", true, AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/modifyKey/route-targets/route-target/modifyTargetKey/modifyRoleKey")
-                               .addOutE("org.onap.relationships.inventory.BelongsTo", "v2", EdgeProperty.CONTAINS.toString(), true)
-               .addV("aai-node-type", "vpn-binding", "vpn-id", "deleteKey",AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/deleteKey").as("v3" )
-               .addV("aai-node-type", "route-target", "global-route-target", "deleteTargetKey", "route-target-role", "deleteRoleKey", "linked", true, AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/deleteKey/route-targets/route-target/deleteTargetKey/deleteRoleKey")
-                               .addOutE("org.onap.relationships.inventory.BelongsTo", "v3", EdgeProperty.CONTAINS.toString(), true)
-               .addV("aai-node-type", "vpn-binding", "vpn-id", "getKey", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/getKey").as("v4")
-               .addV("aai-node-type", "route-target", "global-route-target", "getTargetKey", "route-target-role", "getRoleKey", "linked", true, AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/getKey/route-targets/route-target/getTargetKeyNoLink/getRoleKeyNoLink")
-                               .addOutE("org.onap.relationships.inventory.BelongsTo", "v4", EdgeProperty.CONTAINS.toString(), true)
-               .addV("aai-node-type", "vpn-binding", "vpn-id", "getKeyNoLink", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/getKeyNoLink").as("v5")
-               .addV("aai-node-type", "route-target", "global-route-target", "getTargetKeyNoLink", "route-target-role", "getRoleKeyNoLink", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/getKeyNoLink/route-targets/route-target/getTargetKeyNoLink/getRoleKeyNoLink")
-                               .addOutE("org.onap.relationships.inventory.BelongsTo", "v5", EdgeProperty.CONTAINS.toString(), true)
-               .next();
-               graph.tx().commit();
+        graph.traversal().addV("aai-node-type", "vpn-binding", "vpn-id", "addKey", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/addKey").as("v1")
+        .addV("aai-node-type", "vpn-binding", "vpn-id", "modifyKey", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/modifyKey").as("v2")
+        .addV("aai-node-type", "route-target", "global-route-target", "modifyTargetKey", "route-target-role", "modifyRoleKey", "linked", true, AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/modifyKey/route-targets/route-target/modifyTargetKey/modifyRoleKey")
+                .addOutE("org.onap.relationships.inventory.BelongsTo", "v2", EdgeProperty.CONTAINS.toString(), true)
+        .addV("aai-node-type", "vpn-binding", "vpn-id", "deleteKey",AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/deleteKey").as("v3" )
+        .addV("aai-node-type", "route-target", "global-route-target", "deleteTargetKey", "route-target-role", "deleteRoleKey", "linked", true, AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/deleteKey/route-targets/route-target/deleteTargetKey/deleteRoleKey")
+                .addOutE("org.onap.relationships.inventory.BelongsTo", "v3", EdgeProperty.CONTAINS.toString(), true)
+        .addV("aai-node-type", "vpn-binding", "vpn-id", "getKey", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/getKey").as("v4")
+        .addV("aai-node-type", "route-target", "global-route-target", "getTargetKey", "route-target-role", "getRoleKey", "linked", true, AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/getKey/route-targets/route-target/getTargetKeyNoLink/getRoleKeyNoLink")
+                .addOutE("org.onap.relationships.inventory.BelongsTo", "v4", EdgeProperty.CONTAINS.toString(), true)
+        .addV("aai-node-type", "vpn-binding", "vpn-id", "getKeyNoLink", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/getKeyNoLink").as("v5")
+        .addV("aai-node-type", "route-target", "global-route-target", "getTargetKeyNoLink", "route-target-role", "getRoleKeyNoLink", AAIProperties.AAI_URI, "/network/vpn-bindings/vpn-binding/getKeyNoLink/route-targets/route-target/getTargetKeyNoLink/getRoleKeyNoLink")
+                .addOutE("org.onap.relationships.inventory.BelongsTo", "v5", EdgeProperty.CONTAINS.toString(), true)
+        .next();
+        graph.tx().commit();
 
-               /*Commented for SysOut issues
-                */
-               //graph.traversal().V().has("aai-uri","/network/vpn-bindings/vpn-binding/deleteKey").properties().forEachRemaining(p->System.out.println(p.key() +" : " + p.value()));
-                
-       }
-       
-       @AfterClass
-       public static void tearDown() {
-               graph.tx().rollback();
-               graph.close();
-       }
-       
-       @Before
-       public void initMock() {
-               loader = loaderFactory.createLoaderForVersion(introspectorFactoryType, schemaVersions.getDefaultVersion());
-               MockitoAnnotations.initMocks(this);
-               dbEngine = new JanusGraphDBEngine(
-                               queryStyle,
-                               type,
-                               loader);
-       }
-       
-       @Test
-       public void verifyCreationOfVertex() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
-               
-               final Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
-               final Introspector obj = loader.introspectorFromName("vpn-binding");
-               obj.setValue("vpn-id", "addKey");
-               obj.setValue("global-route-target", "key1");
-               obj.setValue("route-target-role", "key2");
-               TransactionalGraphEngine spy = spy(dbEngine);
-               TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               Graph g = graph.newTransaction();
-               GraphTraversalSource traversal = g.traversal();
-//             Graph g = graph.newTransaction();
-//             GraphTraversalSource traversal = g;
-       //      System.out.println("Begin method inventory:");
-               Iterator<Vertex> vertexItr = traversal.V();
-               while( vertexItr != null && vertexItr.hasNext() ){
-                       Vertex v = vertexItr.next();
-               //      System.out.println("\nnodeType="+v.<String>property("aai-node-type"));
-                       for(String key: v.keys()) {
-                       //      System.out.println("label="+v.label()+";key= "+key+";value= "+v.value(key)+";id= "+v.id());
-                       }
-                       Direction d = null;
-                       Iterator<Edge> edgeItr = v.edges(Direction.BOTH);
-                       while( edgeItr != null && edgeItr.hasNext() ){
-                               Edge e = edgeItr.next();
-                               //System.out.println("outV="+e.outVertex().property(AAIProperties.NODE_TYPE)+"/"+e.outVertex().id()+";inV= "+e.inVertex().property(AAIProperties.NODE_TYPE)+"/"+e.inVertex().id());
-                       }
-               }
-               //System.out.println("End method inventory:");
-               when(spy.asAdmin()).thenReturn(adminSpy);
-               when(adminSpy.getTraversalSource()).thenReturn(traversal);
-               when(spy.tx()).thenReturn(g);
-               when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
-               when(prop.orElse(null)).thenReturn(obj.getURI());
-               DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
-               SideEffectRunner runner = new SideEffectRunner
-                               .Builder(spy, serializer).addSideEffect(DataLinkWriter.class).build();
-               
-               runner.execute(obj, self);
+        /*Commented for SysOut issues
+         */
+        //graph.traversal().V().has("aai-uri","/network/vpn-bindings/vpn-binding/deleteKey").properties().forEachRemaining(p->System.out.println(p.key() +" : " + p.value()));
+         
+    }
+    
+    @AfterClass
+    public static void tearDown() {
+        graph.tx().rollback();
+        graph.close();
+    }
+    
+    @Before
+    public void initMock() {
+        loader = loaderFactory.createLoaderForVersion(introspectorFactoryType, schemaVersions.getDefaultVersion());
+        MockitoAnnotations.initMocks(this);
+        dbEngine = new JanusGraphDBEngine(
+                queryStyle,
+                type,
+                loader);
+    }
+    
+    @Test
+    public void verifyCreationOfVertex() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
+        
+        final Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
+        final Introspector obj = loader.introspectorFromName("vpn-binding");
+        obj.setValue("vpn-id", "addKey");
+        obj.setValue("global-route-target", "key1");
+        obj.setValue("route-target-role", "key2");
+        TransactionalGraphEngine spy = spy(dbEngine);
+        TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
+        Graph g = graph.newTransaction();
+        GraphTraversalSource traversal = g.traversal();
+//      Graph g = graph.newTransaction();
+//      GraphTraversalSource traversal = g;
+    //  System.out.println("Begin method inventory:");
+        Iterator<Vertex> vertexItr = traversal.V();
+        while( vertexItr != null && vertexItr.hasNext() ){
+            Vertex v = vertexItr.next();
+        //  System.out.println("\nnodeType="+v.<String>property("aai-node-type"));
+            for(String key: v.keys()) {
+            //  System.out.println("label="+v.label()+";key= "+key+";value= "+v.value(key)+";id= "+v.id());
+            }
+            Direction d = null;
+            Iterator<Edge> edgeItr = v.edges(Direction.BOTH);
+            while( edgeItr != null && edgeItr.hasNext() ){
+                Edge e = edgeItr.next();
+                //System.out.println("outV="+e.outVertex().property(AAIProperties.NODE_TYPE)+"/"+e.outVertex().id()+";inV= "+e.inVertex().property(AAIProperties.NODE_TYPE)+"/"+e.inVertex().id());
+            }
+        }
+        //System.out.println("End method inventory:");
+        when(spy.asAdmin()).thenReturn(adminSpy);
+        when(adminSpy.getTraversalSource()).thenReturn(traversal);
+        when(spy.tx()).thenReturn(g);
+        when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
+        when(prop.orElse(null)).thenReturn(obj.getURI());
+        DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
+        SideEffectRunner runner = new SideEffectRunner
+                .Builder(spy, serializer).addSideEffect(DataLinkWriter.class).build();
+        
+        runner.execute(obj, self);
 
-               assertEquals("route-target vertex found", true, traversal.V()
-                               .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "key1").has("route-target-role", "key2").has("linked", true).hasNext());
-               g.tx().rollback();
-               
-       }
-       
-       @Test
-       public void verifyModificationOfVertex() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
-               
-               final Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
-               final Introspector obj = loader.introspectorFromName("vpn-binding");
-               obj.setValue("vpn-id", "modifyKey");
-               obj.setValue("global-route-target", "modifyTargetKey2");
-               obj.setValue("route-target-role", "modifyRoleKey2");
-               TransactionalGraphEngine spy = spy(dbEngine);
-               TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-//             Graph g = graph.newTransaction();
-//             GraphTraversalSource traversal = g;
-               Graph g = graph.newTransaction();
-               GraphTraversalSource traversal = g.traversal();
-               Iterator<Vertex> vertexItr = traversal.V();
-               while( vertexItr != null && vertexItr.hasNext() ){
-                       Vertex v = vertexItr.next();
-                       //System.out.println("\nnodeType="+v.<String>property("aai-node-type"));
-                       for(String key: v.keys()) {
-                               //System.out.println("label="+v.label()+";key= "+key+";value= "+v.value(key)+"/"+v.id());
-                       }
-                       Direction d = null;
-                       Iterator<Edge> edgeItr = v.edges(Direction.BOTH);
-                       while( edgeItr != null && edgeItr.hasNext() ){
-                               Edge e = edgeItr.next();
-                       //      System.out.println("outV="+e.outVertex().property(AAIProperties.NODE_TYPE)+"/"+e.outVertex().id()+";inV= "+e.inVertex().property(AAIProperties.NODE_TYPE)+"/"+e.inVertex().id());
-                       }
-               }
-       //      System.out.println("End method inventory:");
+        assertEquals("route-target vertex found", true, traversal.V()
+                .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "key1").has("route-target-role", "key2").has("linked", true).hasNext());
+        g.tx().rollback();
+        
+    }
+    
+    @Test
+    public void verifyModificationOfVertex() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
+        
+        final Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
+        final Introspector obj = loader.introspectorFromName("vpn-binding");
+        obj.setValue("vpn-id", "modifyKey");
+        obj.setValue("global-route-target", "modifyTargetKey2");
+        obj.setValue("route-target-role", "modifyRoleKey2");
+        TransactionalGraphEngine spy = spy(dbEngine);
+        TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
+//      Graph g = graph.newTransaction();
+//      GraphTraversalSource traversal = g;
+        Graph g = graph.newTransaction();
+        GraphTraversalSource traversal = g.traversal();
+        Iterator<Vertex> vertexItr = traversal.V();
+        while( vertexItr != null && vertexItr.hasNext() ){
+            Vertex v = vertexItr.next();
+            //System.out.println("\nnodeType="+v.<String>property("aai-node-type"));
+            for(String key: v.keys()) {
+                //System.out.println("label="+v.label()+";key= "+key+";value= "+v.value(key)+"/"+v.id());
+            }
+            Direction d = null;
+            Iterator<Edge> edgeItr = v.edges(Direction.BOTH);
+            while( edgeItr != null && edgeItr.hasNext() ){
+                Edge e = edgeItr.next();
+            //  System.out.println("outV="+e.outVertex().property(AAIProperties.NODE_TYPE)+"/"+e.outVertex().id()+";inV= "+e.inVertex().property(AAIProperties.NODE_TYPE)+"/"+e.inVertex().id());
+            }
+        }
+    //  System.out.println("End method inventory:");
 
-               when(spy.asAdmin()).thenReturn(adminSpy);
-               when(adminSpy.getTraversalSource()).thenReturn(traversal);
-//             when(spy.tx()).thenReturn(graph);
-               when(spy.tx()).thenReturn(g);
-               when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
-               when(prop.orElse(null)).thenReturn(obj.getURI());
-               DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
-               SideEffectRunner runner = new SideEffectRunner
-                               .Builder(spy, serializer).addSideEffect(DataLinkWriter.class).build();
-               //System.out.println("Traversal Source: "+traversal.toString());
-               vertexItr = traversal.V();
-       //      System.out.println("Begin method inventory:");
-               while( vertexItr != null && vertexItr.hasNext() ){
-                       Vertex v = vertexItr.next();
-                       //System.out.println("\nnodeType="+v.<String>property("aai-node-type"));
-                       for(String key: v.keys()) {
-                       //      System.out.println("label="+v.label()+";key= "+key+";value= "+v.value(key)+"/"+v.id());
-                       }
-                       Iterator<Edge> edgeItr = v.edges(Direction.BOTH);
-                       while( edgeItr != null && edgeItr.hasNext() ){
-                               Edge e = edgeItr.next();
-                               //System.out.println("outV="+e.outVertex().property(AAIProperties.NODE_TYPE)+"/"+e.outVertex().id()+";inV= "+e.inVertex().property(AAIProperties.NODE_TYPE)+"/"+e.inVertex().id());
-                       }
-               }
-               //System.out.println("End method inventory:");
-               try {
-               runner.execute(obj, self);
-               } catch(Exception e) {
+        when(spy.asAdmin()).thenReturn(adminSpy);
+        when(adminSpy.getTraversalSource()).thenReturn(traversal);
+//      when(spy.tx()).thenReturn(graph);
+        when(spy.tx()).thenReturn(g);
+        when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
+        when(prop.orElse(null)).thenReturn(obj.getURI());
+        DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
+        SideEffectRunner runner = new SideEffectRunner
+                .Builder(spy, serializer).addSideEffect(DataLinkWriter.class).build();
+        //System.out.println("Traversal Source: "+traversal.toString());
+        vertexItr = traversal.V();
+    //  System.out.println("Begin method inventory:");
+        while( vertexItr != null && vertexItr.hasNext() ){
+            Vertex v = vertexItr.next();
+            //System.out.println("\nnodeType="+v.<String>property("aai-node-type"));
+            for(String key: v.keys()) {
+            //  System.out.println("label="+v.label()+";key= "+key+";value= "+v.value(key)+"/"+v.id());
+            }
+            Iterator<Edge> edgeItr = v.edges(Direction.BOTH);
+            while( edgeItr != null && edgeItr.hasNext() ){
+                Edge e = edgeItr.next();
+                //System.out.println("outV="+e.outVertex().property(AAIProperties.NODE_TYPE)+"/"+e.outVertex().id()+";inV= "+e.inVertex().property(AAIProperties.NODE_TYPE)+"/"+e.inVertex().id());
+            }
+        }
+        //System.out.println("End method inventory:");
+        try {
+        runner.execute(obj, self);
+        } catch(Exception e) {
 
-               }
-//             runner.execute(obj, self);
-               //System.out.println("=================\n");
-               vertexItr = traversal.V();
-               while( vertexItr != null && vertexItr.hasNext() ){
-                       Vertex v = vertexItr.next();
-                       //System.out.println("\nnodeType="+v.<String>property("aai-node-type"));
-                       for(String key: v.keys()) {
-                       //      System.out.println("label="+v.label()+";key= "+key+";value= "+v.value(key)+"/"+v.id());
-                       }
-                       Iterator<Edge> edgeItr = v.edges(Direction.BOTH);
-                       while( edgeItr != null && edgeItr.hasNext() ){
-                               Edge e = edgeItr.next();
-                       //      System.out.println("outV="+e.outVertex().property(AAIProperties.NODE_TYPE)+"/"+e.outVertex().id()+";inV= "+e.inVertex().property(AAIProperties.NODE_TYPE)+"/"+e.inVertex().id());
-                       }
-               }
-               assertThat("new route-target vertex found with/or without link", traversal.V()
-                               .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "modifyTargetKey2").has("route-target-role", "modifyRoleKey2").hasNext(),is(true));
-               assertThat("new route-target vertex found", traversal.V()
-                               .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "modifyTargetKey2").has("route-target-role", "modifyRoleKey2").has("linked", true).hasNext(),is(true));
-               assertThat("previous link removed", traversal.V()
-                               .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "modifyTargetKey").has("route-target-role", "modifyRoleKey").has("linked").hasNext(),is(not(true)));
-               assertThat("previous vertex still exists", traversal.V()
-                               .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "modifyTargetKey").has("route-target-role", "modifyRoleKey").hasNext(),is(true));
-               g.tx().rollback();
-               
-       }
-       
-       @Test
-       public void verifyDeleteOfVertex() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
-               
-               final Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
-               final Introspector obj = loader.introspectorFromName("vpn-binding");
-               obj.setValue("vpn-id", "deleteKey");
-               TransactionalGraphEngine spy = spy(dbEngine);
-               TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               Graph g = graph.newTransaction();
-               GraphTraversalSource traversal = g.traversal();
-               when(spy.asAdmin()).thenReturn(adminSpy);
-               when(adminSpy.getTraversalSource()).thenReturn(traversal);
-               when(adminSpy.getReadOnlyTraversalSource()).thenReturn(traversal);
-               when(spy.tx()).thenReturn(g);
-               when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
-               when(prop.orElse(null)).thenReturn(obj.getURI());
-               DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
-               SideEffectRunner runner = new SideEffectRunner
-                               .Builder(spy, serializer).addSideEffect(DataLinkWriter.class).build();
-               
-               runner.execute(obj, self);
+        }
+//      runner.execute(obj, self);
+        //System.out.println("=================\n");
+        vertexItr = traversal.V();
+        while( vertexItr != null && vertexItr.hasNext() ){
+            Vertex v = vertexItr.next();
+            //System.out.println("\nnodeType="+v.<String>property("aai-node-type"));
+            for(String key: v.keys()) {
+            //  System.out.println("label="+v.label()+";key= "+key+";value= "+v.value(key)+"/"+v.id());
+            }
+            Iterator<Edge> edgeItr = v.edges(Direction.BOTH);
+            while( edgeItr != null && edgeItr.hasNext() ){
+                Edge e = edgeItr.next();
+            //  System.out.println("outV="+e.outVertex().property(AAIProperties.NODE_TYPE)+"/"+e.outVertex().id()+";inV= "+e.inVertex().property(AAIProperties.NODE_TYPE)+"/"+e.inVertex().id());
+            }
+        }
+        assertThat("new route-target vertex found with/or without link", traversal.V()
+                .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "modifyTargetKey2").has("route-target-role", "modifyRoleKey2").hasNext(),is(true));
+        assertThat("new route-target vertex found", traversal.V()
+                .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "modifyTargetKey2").has("route-target-role", "modifyRoleKey2").has("linked", true).hasNext(),is(true));
+        assertThat("previous link removed", traversal.V()
+                .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "modifyTargetKey").has("route-target-role", "modifyRoleKey").has("linked").hasNext(),is(not(true)));
+        assertThat("previous vertex still exists", traversal.V()
+                .has(AAIProperties.NODE_TYPE, "route-target").has("global-route-target", "modifyTargetKey").has("route-target-role", "modifyRoleKey").hasNext(),is(true));
+        g.tx().rollback();
+        
+    }
+    
+    @Test
+    public void verifyDeleteOfVertex() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
+        
+        final Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
+        final Introspector obj = loader.introspectorFromName("vpn-binding");
+        obj.setValue("vpn-id", "deleteKey");
+        TransactionalGraphEngine spy = spy(dbEngine);
+        TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
+        Graph g = graph.newTransaction();
+        GraphTraversalSource traversal = g.traversal();
+        when(spy.asAdmin()).thenReturn(adminSpy);
+        when(adminSpy.getTraversalSource()).thenReturn(traversal);
+        when(adminSpy.getReadOnlyTraversalSource()).thenReturn(traversal);
+        when(spy.tx()).thenReturn(g);
+        when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
+        when(prop.orElse(null)).thenReturn(obj.getURI());
+        DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
+        SideEffectRunner runner = new SideEffectRunner
+                .Builder(spy, serializer).addSideEffect(DataLinkWriter.class).build();
+        
+        runner.execute(obj, self);
 
-               assertEquals("route-target vertex not found", false, traversal.V()
-                               .has(AAIProperties.NODE_TYPE, "route-target")
-                               .has("global-route-target", "deleteTargetKey")
-                               .has("route-target-role", "deleteRoleKey")
-                               .has("linked", true)
-                               .hasNext()
-               );
+        assertEquals("route-target vertex not found", false, traversal.V()
+                .has(AAIProperties.NODE_TYPE, "route-target")
+                .has("global-route-target", "deleteTargetKey")
+                .has("route-target-role", "deleteRoleKey")
+                .has("linked", true)
+                .hasNext()
+        );
 
-               g.tx().rollback();
-               
-       }
-       
-       @Test
-       public void verifyPropertyPopulation() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
-               
-               final Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
-               final Introspector obj = loader.introspectorFromName("vpn-binding");
-               obj.setValue("vpn-id", "getKey");
-               TransactionalGraphEngine spy = spy(dbEngine);
-               TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               Graph g = graph.newTransaction();
-               GraphTraversalSource traversal = g.traversal();
-               when(spy.asAdmin()).thenReturn(adminSpy);
-               when(adminSpy.getTraversalSource()).thenReturn(traversal);
-               when(spy.tx()).thenReturn(g);
-               when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
-               when(prop.orElse(null)).thenReturn(obj.getURI());
-               DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
-               SideEffectRunner runner = new SideEffectRunner
-                               .Builder(spy, serializer).addSideEffect(DataLinkReader.class).build();
-               
-               runner.execute(obj, self);
+        g.tx().rollback();
+        
+    }
+    
+    @Test
+    public void verifyPropertyPopulation() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
+        
+        final Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getDepthVersion());
+        final Introspector obj = loader.introspectorFromName("vpn-binding");
+        obj.setValue("vpn-id", "getKey");
+        TransactionalGraphEngine spy = spy(dbEngine);
+        TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
+        Graph g = graph.newTransaction();
+        GraphTraversalSource traversal = g.traversal();
+        when(spy.asAdmin()).thenReturn(adminSpy);
+        when(adminSpy.getTraversalSource()).thenReturn(traversal);
+        when(spy.tx()).thenReturn(g);
+        when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
+        when(prop.orElse(null)).thenReturn(obj.getURI());
+        DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
+        SideEffectRunner runner = new SideEffectRunner
+                .Builder(spy, serializer).addSideEffect(DataLinkReader.class).build();
+        
+        runner.execute(obj, self);
 
-               assertEquals("both properties have been populated in target object", true, obj.getValue("global-route-target").equals("getTargetKey") && obj.getValue("route-target-role").equals("getRoleKey"));
-               g.tx().rollback();
-               
-       }
-       
-       @Test
-       public void verifyPropertyPopulationWithV10OnlyPut() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
-               final Introspector obj = loader.introspectorFromName("vpn-binding");
-               obj.setValue("vpn-id", "getKeyNoLink");
-               final Introspector routeTargets = loader.introspectorFromName("route-targets");
-               obj.setValue("route-targets", routeTargets.getUnderlyingObject());
-               List<Object> targets = routeTargets.getValue("route-target");
-               final Introspector routeTargetOne = loader.introspectorFromName("route-target");
-               routeTargetOne.setValue("global-route-target", "getTargetKeyNoLink");
-               routeTargetOne.setValue("route-target-role", "getRoleKeyNoLink");
-               targets.add(routeTargetOne.getUnderlyingObject());
-               final Introspector routeTargetTwo = loader.introspectorFromName("route-target");
-               routeTargetTwo.setValue("global-route-target", "getTargetKeyNoLink2");
-               routeTargetTwo.setValue("route-target-role", "getRoleKeyNoLink2");
-               targets.add(routeTargetTwo.getUnderlyingObject());
-               TransactionalGraphEngine spy = spy(dbEngine);
-               TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
-               Graph g = graph.newTransaction();
-               GraphTraversalSource traversal = g.traversal();
-               when(spy.tx()).thenReturn(g);
-               when(spy.asAdmin()).thenReturn(adminSpy);
-               when(adminSpy.getTraversalSource()).thenReturn(traversal);
-               when(spy.tx()).thenReturn(g);
-               when(parser.isDependent()).thenReturn(false);
-               when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
-               when(prop.orElse(null)).thenReturn(obj.getURI());
-               DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
-               Vertex v = serializer.createNewVertex(obj);
-               serializer.serializeToDb(obj, v, parser, obj.getURI(), "testing");
-               Vertex routeTargetOneV = traversal.V().has("global-route-target", "getTargetKeyNoLink").next();
-               Vertex routeTargetTwoV = traversal.V().has("global-route-target", "getTargetKeyNoLink2").next();
+        assertEquals("both properties have been populated in target object", true, obj.getValue("global-route-target").equals("getTargetKey") && obj.getValue("route-target-role").equals("getRoleKey"));
+        g.tx().rollback();
+        
+    }
+    
+    @Test
+    public void verifyPropertyPopulationWithV10OnlyPut() throws URISyntaxException, AAIException, UnsupportedEncodingException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, SecurityException, InstantiationException, NoSuchMethodException, MalformedURLException {
+        final Introspector obj = loader.introspectorFromName("vpn-binding");
+        obj.setValue("vpn-id", "getKeyNoLink");
+        final Introspector routeTargets = loader.introspectorFromName("route-targets");
+        obj.setValue("route-targets", routeTargets.getUnderlyingObject());
+        List<Object> targets = routeTargets.getValue("route-target");
+        final Introspector routeTargetOne = loader.introspectorFromName("route-target");
+        routeTargetOne.setValue("global-route-target", "getTargetKeyNoLink");
+        routeTargetOne.setValue("route-target-role", "getRoleKeyNoLink");
+        targets.add(routeTargetOne.getUnderlyingObject());
+        final Introspector routeTargetTwo = loader.introspectorFromName("route-target");
+        routeTargetTwo.setValue("global-route-target", "getTargetKeyNoLink2");
+        routeTargetTwo.setValue("route-target-role", "getRoleKeyNoLink2");
+        targets.add(routeTargetTwo.getUnderlyingObject());
+        TransactionalGraphEngine spy = spy(dbEngine);
+        TransactionalGraphEngine.Admin adminSpy = spy(dbEngine.asAdmin());
+        Graph g = graph.newTransaction();
+        GraphTraversalSource traversal = g.traversal();
+        when(spy.tx()).thenReturn(g);
+        when(spy.asAdmin()).thenReturn(adminSpy);
+        when(adminSpy.getTraversalSource()).thenReturn(traversal);
+        when(spy.tx()).thenReturn(g);
+        when(parser.isDependent()).thenReturn(false);
+        when(self.<String>property(AAIProperties.AAI_URI)).thenReturn(prop);
+        when(prop.orElse(null)).thenReturn(obj.getURI());
+        DBSerializer serializer = new DBSerializer(schemaVersions.getDefaultVersion(), spy, introspectorFactoryType, "AAI_TEST");
+        Vertex v = serializer.createNewVertex(obj);
+        serializer.serializeToDb(obj, v, parser, obj.getURI(), "testing");
+        Vertex routeTargetOneV = traversal.V().has("global-route-target", "getTargetKeyNoLink").next();
+        Vertex routeTargetTwoV = traversal.V().has("global-route-target", "getTargetKeyNoLink2").next();
 
-               assertEquals("first route target put has linked", true, routeTargetOneV.property(AAIProperties.LINKED).orElse(false));
-               assertEquals("second route target put does not have linked", false, routeTargetTwoV.property(AAIProperties.LINKED).orElse(false));
+        assertEquals("first route target put has linked", true, routeTargetOneV.property(AAIProperties.LINKED).orElse(false));
+        assertEquals("second route target put does not have linked", false, routeTargetTwoV.property(AAIProperties.LINKED).orElse(false));
 
-               g.tx().rollback();
-               
-       }
+        g.tx().rollback();
+        
+    }
 }