X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Ftest%2Futil%2FBindingTestContext.java;h=8ba709ad30c461e5b69c50b0d34c9b2d78579fbb;hp=1ea56381ef1cf9a4b248d2be2795d6c290f81c0d;hb=156015d027bd716b16b37ec90e129a603d59c477;hpb=a14731b4fae8abadc04cfb2588e8d1b6117ee488 diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java index 1ea56381ef..8ba709ad30 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java @@ -17,7 +17,9 @@ import java.util.concurrent.Future; import javassist.ClassPool; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.impl.ForwardedBackwardsCompatibleDataBroker; +import org.opendaylight.controller.md.sal.binding.impl.ForwardedBindingDataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.broker.impl.DOMDataBrokerImpl; @@ -112,6 +114,8 @@ public class BindingTestContext implements AutoCloseable { private final MockSchemaService mockSchemaService = new MockSchemaService(); + private DataBroker dataBroker; + public DOMDataBroker getDomAsyncDataBroker() { @@ -150,6 +154,12 @@ public class BindingTestContext implements AutoCloseable { biDataLegacyBroker = biDataImpl; } + public void startNewDataBroker() { + checkState(executor != null, "Executor needs to be set"); + checkState(newDOMDataBroker != null, "DOM Data Broker must be set"); + dataBroker = new ForwardedBindingDataBroker(newDOMDataBroker, mappingServiceImpl, mockSchemaService); + } + public void startNewDomDataBroker() { checkState(executor != null, "Executor needs to be set"); InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", executor); @@ -312,11 +322,12 @@ public class BindingTestContext implements AutoCloseable { public void start() { startNewDomDataBroker(); + startDomBroker(); startDomMountPoint(); startBindingToDomMappingService(); + startNewDataBroker(); startNewBindingDataBroker(); - startBindingNotificationBroker(); startBindingBroker(); @@ -418,5 +429,9 @@ public class BindingTestContext implements AutoCloseable { return biMountImpl; } + public DataBroker getDataBroker() { + return dataBroker; + } + }