Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix issue where NodeConnector ADDED events were propagated as NodeConnector CHANGED...
[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 1a66b3ba16316b4c5a1c92485e909cf061c3d398..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 {
class NodeChangeCommiter implements OpendaylightInventoryListener {
+ static val LOG = LoggerFactory.getLogger(NodeChangeCommiter);
+
@Property
val FlowCapableInventoryProvider manager;
@Property
val FlowCapableInventoryProvider manager;
@@
-76,6
+78,9
@@
class NodeChangeCommiter implements OpendaylightInventoryListener {
// Check path
val it = manager.startChange()
// Check path
val it = manager.startChange()
+
+ LOG.debug("removing node connector : " + ref.value.toString());
+
removeOperationalData(ref.value as InstanceIdentifier<? extends DataObject>);
commit()
}
removeOperationalData(ref.value as InstanceIdentifier<? extends DataObject>);
commit()
}
@@
-93,6
+98,8
@@
class NodeChangeCommiter implements OpendaylightInventoryListener {
data.addAugmentation(FlowCapableNodeConnector, augment)
}
data.addAugmentation(FlowCapableNodeConnector, augment)
}
+ LOG.debug("updating node connector : " + ref.value.toString());
+
putOperationalData(ref.value as InstanceIdentifier<NodeConnector>, data.build());
commit()
}
putOperationalData(ref.value as InstanceIdentifier<NodeConnector>, data.build());
commit()
}
@@
-101,6
+108,8
@@
class NodeChangeCommiter implements OpendaylightInventoryListener {
val ref = node.nodeRef;
val it = manager.startChange()
val ref = node.nodeRef;
val it = manager.startChange()
+ LOG.debug("removing node : " + ref.value.toString());
+
removeOperationalData(ref.value as InstanceIdentifier<? extends DataObject>);
commit()
}
removeOperationalData(ref.value as InstanceIdentifier<? extends DataObject>);
commit()
}
@@
-117,6
+126,8
@@
class NodeChangeCommiter implements OpendaylightInventoryListener {
data.addAugmentation(FlowCapableNode, augment)
}
data.addAugmentation(FlowCapableNode, augment)
}
+ LOG.debug("updating node : " + ref.value.toString());
+
putOperationalData(ref.value as InstanceIdentifier<Node>, data.build())
commit()
}
putOperationalData(ref.value as InstanceIdentifier<Node>, data.build())
commit()
}