Merge "Bug fixes for netconf southbound plugin."

[controller.git] / opendaylight / md-sal / inventory-manager / src / main / java / org / opendaylight / controller / md / inventory / manager / FlowCapableInventoryProvider.xtend

diff --git a/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.xtend b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.xtend
index 2b023a72e1c0442cb8f932c0d1472381cb3740ea..43f48a50e56175a2297e78e32478f80404ff839d 100644 (file)
--- a/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.xtend
+++ b/opendaylight/md-sal/inventory-manager/src/main/java/org/opendaylight/controller/md/inventory/manager/FlowCapableInventoryProvider.xtend
@@ -64,6 +64,8 @@ class FlowCapableInventoryProvider implements AutoCloseable {
 
 class NodeChangeCommiter implements OpendaylightInventoryListener {
 
+    static val LOG = LoggerFactory.getLogger(NodeChangeCommiter);
+
     @Property
     val FlowCapableInventoryProvider manager;
 
@@ -76,7 +78,10 @@ class NodeChangeCommiter implements OpendaylightInventoryListener {
 
         // Check path
         val it = manager.startChange()
-        removeRuntimeData(ref.value as InstanceIdentifier<? extends DataObject>);
+
+        LOG.debug("removing node connector : " + ref.value.toString());
+
+        removeOperationalData(ref.value as InstanceIdentifier<? extends DataObject>);
         commit()
     }
 
@@ -93,7 +98,9 @@ class NodeChangeCommiter implements OpendaylightInventoryListener {
             data.addAugmentation(FlowCapableNodeConnector, augment)
         }
 
-        putRuntimeData(ref.value as InstanceIdentifier<NodeConnector>, data.build());
+        LOG.debug("updating node connector : " + ref.value.toString());
+
+        putOperationalData(ref.value as InstanceIdentifier<NodeConnector>, data.build());
         commit()
     }
 
@@ -101,7 +108,9 @@ class NodeChangeCommiter implements OpendaylightInventoryListener {
         val ref = node.nodeRef;
         val it = manager.startChange()
 
-        removeRuntimeData(ref.value as InstanceIdentifier<? extends DataObject>);
+        LOG.debug("removing node : " + ref.value.toString());
+
+        removeOperationalData(ref.value as InstanceIdentifier<? extends DataObject>);
         commit()
     }
 
@@ -117,7 +126,9 @@ class NodeChangeCommiter implements OpendaylightInventoryListener {
             data.addAugmentation(FlowCapableNode, augment)
         }
 
-        putRuntimeData(ref.value as InstanceIdentifier<Node>, data.build())
+        LOG.debug("updating node : " + ref.value.toString());
+
+        putOperationalData(ref.value as InstanceIdentifier<Node>, data.build())
         commit()
     }
 }