summaryrefslogtreecommitdiffstats
path: root/v3po/impl/src/main
diff options
context:
space:
mode:
authorMaros Marsalek <mmarsale@cisco.com>2016-04-12 10:13:25 +0200
committerMaros Marsalek <mmarsale@cisco.com>2016-04-12 10:13:25 +0200
commita36279bc8bf595fc3d92cf8a59d2044e1f700358 (patch)
tree8f10468e79dc25b868b70227e1ea768e03975237 /v3po/impl/src/main
parentc3661fb2793928359ef28c4439a67d3208ff1604 (diff)
HONEYCOMB-8: Remove references to VPP from data layer
Change-Id: Ia8ceb1f6e16c5148514ee2add55ff78533d8fe1e Signed-off-by: Marek Gradzki <mgradzki@cisco.com> Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'v3po/impl/src/main')
-rw-r--r--v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppDataBrokerInitializationProvider.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppDataBrokerInitializationProvider.java b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppDataBrokerInitializationProvider.java
index 288463f74..0939fe239 100644
--- a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppDataBrokerInitializationProvider.java
+++ b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppDataBrokerInitializationProvider.java
@@ -24,17 +24,16 @@ import com.google.common.util.concurrent.AsyncFunction;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import io.fd.honeycomb.v3po.config.WriterRegistry;
-import io.fd.honeycomb.v3po.data.ReadableVppDataTree;
-import io.fd.honeycomb.v3po.data.VppDataTree;
-import io.fd.honeycomb.v3po.data.impl.VppConfigDataTree;
-import io.fd.honeycomb.v3po.data.impl.VppDataBroker;
-import io.fd.honeycomb.v3po.data.impl.VppOperationalDataTree;
+import io.fd.honeycomb.v3po.data.ModifiableDataTree;
+import io.fd.honeycomb.v3po.data.ReadableDataTree;
+import io.fd.honeycomb.v3po.data.impl.ConfigDataTree;
+import io.fd.honeycomb.v3po.data.impl.OperationalDataTree;
+import io.fd.honeycomb.v3po.data.impl.DataBroker;
import io.fd.honeycomb.v3po.translate.read.ReaderRegistry;
import java.util.Collection;
import java.util.Collections;
import javassist.ClassPool;
import javax.annotation.Nonnull;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -87,14 +86,14 @@ public final class VppDataBrokerInitializationProvider implements Provider, Auto
private final TopologyId VPP_TOPOLOGY_ID = TopologyId.getDefaultInstance("vpp-topology");
private final NodeId VPP_TOPOLOGY_NODE_ID = NodeId.getDefaultInstance("vpp");
- private final DataBroker bindingBroker;
+ private final org.opendaylight.controller.md.sal.binding.api.DataBroker bindingBroker;
private final ReaderRegistry readerRegistry;
private final InstanceIdentifier<Node> mountPointPath;
private final WriterRegistry writerRegistry;
private ObjectRegistration<DOMMountPoint> mountPointRegistration;
private DOMDataBroker broker;
- public VppDataBrokerInitializationProvider(@Nonnull final DataBroker bindingBroker,
+ public VppDataBrokerInitializationProvider(@Nonnull final org.opendaylight.controller.md.sal.binding.api.DataBroker bindingBroker,
final ReaderRegistry readerRegistry,
final WriterRegistry writerRegistry) {
this.bindingBroker = checkNotNull(bindingBroker, "bindingBroker should not be null");
@@ -183,15 +182,16 @@ public final class VppDataBrokerInitializationProvider implements Provider, Auto
private DOMDataBroker initVppDataBroker(final SchemaContext globalContext,
final BindingNormalizedNodeSerializer serializer) {
- final ReadableVppDataTree operationalData =
- new VppOperationalDataTree(serializer, globalContext, readerRegistry); // TODO make configurable
+ final ReadableDataTree operationalData =
+ new OperationalDataTree(serializer, globalContext, readerRegistry); // TODO make configurable
final DataTree dataTree =
InMemoryDataTreeFactory.getInstance().create(TreeType.CONFIGURATION); // TODO make configurable
dataTree.setSchemaContext(globalContext);
- final VppDataTree configDataProxy = new VppConfigDataTree(serializer, dataTree, writerRegistry); // TODO make configurable
- return new VppDataBroker(operationalData, configDataProxy);
+ final ModifiableDataTree configDataProxy =
+ new ConfigDataTree(serializer, dataTree, writerRegistry); // TODO make configurable
+ return new DataBroker(operationalData, configDataProxy);
}
/**
@@ -220,7 +220,7 @@ public final class VppDataBrokerInitializationProvider implements Provider, Auto
final DOMDataReadOnlyTransaction readTx = broker.newReadOnlyTransaction();
final YangInstanceIdentifier
- id = YangInstanceIdentifier.builder().node(VppState.QNAME).node(BridgeDomains.QNAME).build();
+ id = YangInstanceIdentifier.builder().node(VppState.QNAME).node(BridgeDomains.QNAME).build();
LOG.trace("initialVppStateSynchronization id: {}", id);