Fixup Augmentable and Identifiable methods changing

[openflowplugin.git] / applications / topology-manager / src / test / java / org / opendaylight / openflowplugin / applications / topology / manager / TerminationPointChangeListenerImplTest.java

diff --git a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImplTest.java b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImplTest.java
index 72979c9161ff1ea43db7672545c4cde92929efe8..c13514fe21ca438c38bc98136973f31aed852f92 100644 (file)
--- a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImplTest.java
+++ b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImplTest.java
@@ -67,7 +67,7 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
         TerminationPointKey terminationPointKey = new TerminationPointKey(new TpId("tp1"));
 
         final InstanceIdentifier<Node> topoNodeII = topologyIID.child(Node.class, topoNodeKey);
-        Node topoNode = new NodeBuilder().setKey(topoNodeKey).build();
+        Node topoNode = new NodeBuilder().withKey(topoNodeKey).build();
 
         org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes
                 .NodeKey nodeKey = newInvNodeKey(topoNodeKey.getNodeId().getValue());
@@ -84,8 +84,8 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
         final Topology topology = new TopologyBuilder().setLink(linkList).build();
 
         final InstanceIdentifier[] expDeletedIIDs = {
-                topologyIID.child(Link.class, linkList.get(0).getKey()),
-                topologyIID.child(Link.class, linkList.get(1).getKey()),
+                topologyIID.child(Link.class, linkList.get(0).key()),
+                topologyIID.child(Link.class, linkList.get(1).key()),
                 topologyIID.child(Node.class, new NodeKey(new NodeId("node1")))
                         .child(TerminationPoint.class, new TerminationPointKey(new TpId("tp1")))
             };
@@ -133,7 +133,7 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
         TerminationPointKey terminationPointKey = new TerminationPointKey(new TpId("tp1"));
 
         InstanceIdentifier<Node> topoNodeII = topologyIID.child(Node.class, topoNodeKey);
-        Node topoNode = new NodeBuilder().setKey(topoNodeKey).build();
+        Node topoNode = new NodeBuilder().withKey(topoNodeKey).build();
 
         org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey
                 nodeKey = newInvNodeKey(topoNodeKey.getNodeId().getValue());
@@ -204,7 +204,7 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
         verify(mockTx).merge(eq(LogicalDatastoreType.OPERATIONAL), eq(expTpPath),
                 mergedNode.capture(), eq(true));
         assertEquals("getTpId", expTpId, mergedNode.getValue().getTpId());
-        InventoryNodeConnector augmentation = mergedNode.getValue().getAugmentation(
+        InventoryNodeConnector augmentation = mergedNode.getValue().augmentation(
                 InventoryNodeConnector.class);
         assertNotNull("Missing augmentation", augmentation);
         assertEquals("getInventoryNodeConnectorRef", new NodeConnectorRef(invNodeConnID),
@@ -253,7 +253,7 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
                 any(TerminationPoint.class), eq(true));
 
         assertDeletedIDs(new InstanceIdentifier[]{topologyIID.child(Link.class,
-                linkList.get(0).getKey())}, deletedLinkIDs);
+                linkList.get(0).key())}, deletedLinkIDs);
     }
 
     @SuppressWarnings("rawtypes")
@@ -298,6 +298,6 @@ public class TerminationPointChangeListenerImplTest extends DataTreeChangeListen
                 any(TerminationPoint.class), eq(true));
 
         assertDeletedIDs(new InstanceIdentifier[]{topologyIID.child(Link.class,
-                linkList.get(0).getKey())}, deletedLinkIDs);
+                linkList.get(0).key())}, deletedLinkIDs);
     }
 }