Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix for bugs 446 and 456"
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
dom
/
broker
/
impl
/
HashMapDataStore.xtend
diff --git
a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/HashMapDataStore.xtend
b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/HashMapDataStore.xtend
index 9600881e505abdeb8c4d5022d4f1c91c94907e80..12835ccf0a235ec2a312e32313818525425c6f36 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/HashMapDataStore.xtend
+++ b/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/HashMapDataStore.xtend
@@
-18,9
+18,11
@@
import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier
import org.opendaylight.yangtools.yang.data.api.CompositeNode
import org.opendaylight.controller.sal.core.api.data.DataStore
import java.util.HashSet
import org.opendaylight.yangtools.yang.data.api.CompositeNode
import org.opendaylight.controller.sal.core.api.data.DataStore
import java.util.HashSet
+import org.slf4j.LoggerFactory
+import org.slf4j.Logger
-class HashMapDataStore implements DataStore, AutoCloseable {
-
+
final
class HashMapDataStore implements DataStore, AutoCloseable {
+ private val Logger LOG = LoggerFactory.getLogger(HashMapDataStore)
val Map<InstanceIdentifier, CompositeNode> configuration = new ConcurrentHashMap();
val Map<InstanceIdentifier, CompositeNode> operational = new ConcurrentHashMap();
val Map<InstanceIdentifier, CompositeNode> configuration = new ConcurrentHashMap();
val Map<InstanceIdentifier, CompositeNode> operational = new ConcurrentHashMap();
@@
-28,12
+30,11
@@
class HashMapDataStore implements DataStore, AutoCloseable {
override containsConfigurationPath(InstanceIdentifier path) {
override containsConfigurationPath(InstanceIdentifier path) {
- throw new UnsupportedOperationException("TODO: auto-generated method stub")
-
+ return configuration.containsKey(path)
}
override containsOperationalPath(InstanceIdentifier path) {
}
override containsOperationalPath(InstanceIdentifier path) {
-
throw new UnsupportedOperationException("TODO: auto-generated method stub"
)
+
return operational.containsKey(path
)
}
override getStoredConfigurationPaths() {
}
override getStoredConfigurationPaths() {
@@
-45,10
+46,12
@@
class HashMapDataStore implements DataStore, AutoCloseable {
}
override readConfigurationData(InstanceIdentifier path) {
}
override readConfigurationData(InstanceIdentifier path) {
+ LOG.trace("Reading configuration path {}", path)
configuration.get(path);
}
override readOperationalData(InstanceIdentifier path) {
configuration.get(path);
}
override readOperationalData(InstanceIdentifier path) {
+ LOG.trace("Reading operational path {}", path)
operational.get(path);
}
operational.get(path);
}
@@
-65,11
+68,21
@@
class HashMapDataStore implements DataStore, AutoCloseable {
def RpcResult<Void> finish(HashMapDataStoreTransaction transaction) {
val modification = transaction.modification;
for (removal : modification.removedConfigurationData) {
def RpcResult<Void> finish(HashMapDataStoreTransaction transaction) {
val modification = transaction.modification;
for (removal : modification.removedConfigurationData) {
+ LOG.trace("Removing configuration path {}", removal)
remove(configuration,removal);
}
for (removal : modification.removedOperationalData) {
remove(configuration,removal);
}
for (removal : modification.removedOperationalData) {
+ LOG.trace("Removing operational path {}", removal)
remove(operational,removal);
}
remove(operational,removal);
}
+ if (LOG.isTraceEnabled()) {
+ for (a : modification.updatedConfigurationData.keySet) {
+ LOG.trace("Adding configuration path {}", a)
+ }
+ for (a : modification.updatedOperationalData.keySet) {
+ LOG.trace("Adding operational path {}", a)
+ }
+ }
configuration.putAll(modification.updatedConfigurationData);
operational.putAll(modification.updatedOperationalData);
configuration.putAll(modification.updatedConfigurationData);
operational.putAll(modification.updatedOperationalData);
@@
-84,6
+97,7
@@
class HashMapDataStore implements DataStore, AutoCloseable {
}
}
for(pathToRemove : affected) {
}
}
for(pathToRemove : affected) {
+ LOG.trace("Removed path {}", pathToRemove)
map.remove(pathToRemove);
}
map.remove(pathToRemove);
}