Merge "Make generated address configurable for netconf testtool"

diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/FlowForwarder.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/FlowForwarder.java
index fd0ddecd1c42acc6f8210d44f35cd7a97502d377..e0c16a080676691080def9e86e12d22fe87883b0 100644 (file)
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/FlowForwarder.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/FlowForwarder.java
@@ -53,7 +53,7 @@ public class FlowForwarder extends AbstractListeningCommiter<Flow> {
         super(manager, Flow.class);
         Preconditions.checkNotNull(db, "DataBroker can not be null!");
         this.listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION,
-                getWildCardPath(), FlowForwarder.this, DataChangeScope.BASE);
+                getWildCardPath(), FlowForwarder.this, DataChangeScope.SUBTREE);
     }
 
     @Override

diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/GroupForwarder.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/GroupForwarder.java
index 77ef162204064bdd64f4f24580f079d55f55f5f3..72e35ce8dbd84b2b22c766c3a9da3d893b855872 100644 (file)
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/GroupForwarder.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/GroupForwarder.java
@@ -50,7 +50,7 @@ public class GroupForwarder extends AbstractListeningCommiter<Group> {
         super(manager, Group.class);
         Preconditions.checkNotNull(db, "DataBroker can not be null!");
         this.listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION,
-                getWildCardPath(), GroupForwarder.this, DataChangeScope.BASE);
+                getWildCardPath(), GroupForwarder.this, DataChangeScope.SUBTREE);
     }
 
     @Override

diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/MeterForwarder.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/MeterForwarder.java
index 9511fb8775958a984da0aa15cda03404f84d2e9f..8a805b029729116b8094d13ef504e05bdd918262 100644 (file)
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/MeterForwarder.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/impl/MeterForwarder.java
@@ -50,7 +50,7 @@ public class MeterForwarder extends AbstractListeningCommiter<Meter> {
         super(manager, Meter.class);
         Preconditions.checkNotNull(db, "DataBroker can not be null!");
         this.listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION,
-                getWildCardPath(), MeterForwarder.this, DataChangeScope.BASE);
+                getWildCardPath(), MeterForwarder.this, DataChangeScope.SUBTREE);
     }
 
     @Override