Refactor for the DataStore changes.

Change-Id: I8fa367f46687dec4f598f46b7f4954810c02f40d
Signed-off-by: Alex Fan <railor33@gmail.com>

diff --git a/l2switch-main/src/main/java/org/opendaylight/l2switch/addressobserver/AddressObservationWriter.java b/l2switch-main/src/main/java/org/opendaylight/l2switch/addressobserver/AddressObservationWriter.java
index 63cb210e7e5008fbc3ff6e2800161b0aa520c5e2..a4568ee90cf5c1c8681bae98dd531cd234eedfa0 100644 (file)
--- a/l2switch-main/src/main/java/org/opendaylight/l2switch/addressobserver/AddressObservationWriter.java
+++ b/l2switch-main/src/main/java/org/opendaylight/l2switch/addressobserver/AddressObservationWriter.java
@@ -135,7 +135,7 @@ public class AddressObservationWriter {
           .addAugmentation(AddressCapableNodeConnector.class, acncBuilder.build());
 
       // Update this NodeConnector in the MD-SAL data tree
-      readWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, nodeConnectorRef.getValue(), ncBuilder.build());
+      readWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, (InstanceIdentifier<NodeConnector>)nodeConnectorRef.getValue(), ncBuilder.build());
       readWriteTransaction.commit();
     }
   }

diff --git a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java
index 27833aa74978ba5bc0c36f88745ab716a846b573..d5025463091fed2f44b3087c4d2529b4814848a0 100644 (file)
--- a/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java
+++ b/loopremover/implementation/src/main/java/org/opendaylight/l2switch/loopremover/topology/TopologyLinkDataChangeHandler.java
@@ -246,7 +246,7 @@ public class TopologyLinkDataChangeHandler implements DataChangeListener {
         nodeConnectorBuilder = new NodeConnectorBuilder(nc)
             .setKey(nc.getKey())
             .addAugmentation(StpStatusAwareNodeConnector.class, stpStatusAwareNodeConnector);
-        readWriteTransaction.put(LogicalDatastoreType.CONFIGURATION, nodeConnectorRef.getValue(), nodeConnectorBuilder.build());
+        readWriteTransaction.put(LogicalDatastoreType.CONFIGURATION, (InstanceIdentifier<NodeConnector>)nodeConnectorRef.getValue(), nodeConnectorBuilder.build());
         _logger.info("Updated node connector in configuration {}", nodeConnectorRef);
       } else {