2 files changed, 22 insertions, 50 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/VppHoneycombWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2HoneycombWriterFactory.java
index 0fb95938a..80f72db78 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/VppHoneycombWriterFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2HoneycombWriterFactory.java
@@ -19,33 +19,32 @@ package io.fd.hc2vpp.v3po.factory;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.fd.hc2vpp.v3po.vpp.ArpTerminationTableEntryCustomizer;
-import io.fd.hc2vpp.v3po.vpp.BridgeDomainCustomizer;
-import io.fd.hc2vpp.v3po.vpp.L2FibEntryCustomizer;
+import io.fd.hc2vpp.v3po.l2.ArpTerminationTableEntryCustomizer;
+import io.fd.hc2vpp.v3po.l2.BridgeDomainCustomizer;
+import io.fd.hc2vpp.v3po.l2.L2FibEntryCustomizer;
 import io.fd.honeycomb.translate.impl.write.GenericListWriter;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.write.WriterFactory;
 import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.Vpp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.BridgeDomains;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.bridge.domain.attributes.ArpTerminationTable;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.bridge.domain.attributes.arp.termination.table.ArpTerminationTableEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.bridge.domains.BridgeDomain;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.l2.fib.attributes.L2FibTable;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.l2.fib.attributes.l2.fib.table.L2FibEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.BridgeDomains;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.bridge.domains.BridgeDomain;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import io.fd.vpp.jvpp.core.future.FutureJVppCore;
 
-public final class VppHoneycombWriterFactory implements WriterFactory {
+public final class L2HoneycombWriterFactory implements WriterFactory {
 
     private final FutureJVppCore jvpp;
     private final NamingContext bdContext;
     private final NamingContext ifcContext;
 
     @Inject
-    public VppHoneycombWriterFactory(final FutureJVppCore vppJvppWriterDependency,
-                                     @Named("bridge-domain-context") final NamingContext bridgeDomainContextVppDependency,
-                                     @Named("interface-context") final NamingContext interfaceContextVppDependency) {
+    public L2HoneycombWriterFactory(final FutureJVppCore vppJvppWriterDependency,
+                                    @Named("bridge-domain-context") final NamingContext bridgeDomainContextVppDependency,
+                                    @Named("interface-context") final NamingContext interfaceContextVppDependency) {
         this.jvpp = vppJvppWriterDependency;
         this.bdContext = bridgeDomainContextVppDependency;
         this.ifcContext = interfaceContextVppDependency;
@@ -57,7 +56,7 @@ public final class VppHoneycombWriterFactory implements WriterFactory {
         //  BridgeDomains has no handlers
         //   BridgeDomain(handled before L2 of ifc and subifc) =
         final InstanceIdentifier<BridgeDomain> bdId =
-            InstanceIdentifier.create(Vpp.class).child(BridgeDomains.class).child(BridgeDomain.class);
+            InstanceIdentifier.create(BridgeDomains.class).child(BridgeDomain.class);
         registry.addBefore(new GenericListWriter<>(bdId, new BridgeDomainCustomizer(jvpp, bdContext)),
             Sets.newHashSet(
                 InterfacesWriterFactory.L2_ID,
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/VppStateHoneycombReaderFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2StateHoneycombReaderFactory.java
index 6d019ea2a..eacc371fe 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/VppStateHoneycombReaderFactory.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/L2StateHoneycombReaderFactory.java
@@ -19,68 +19,41 @@ package io.fd.hc2vpp.v3po.factory;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.hc2vpp.common.translate.util.ReadTimeoutException;
-import io.fd.hc2vpp.common.translate.util.VppStatusListener;
-import io.fd.hc2vpp.v3po.cfgattrs.V3poConfiguration;
-import io.fd.hc2vpp.v3po.vppstate.BridgeDomainCustomizer;
-import io.fd.hc2vpp.v3po.vppstate.L2FibEntryCustomizer;
-import io.fd.hc2vpp.v3po.vppstate.VersionCustomizer;
+import io.fd.hc2vpp.v3po.l2state.BridgeDomainCustomizer;
+import io.fd.hc2vpp.v3po.l2state.L2FibEntryCustomizer;
 import io.fd.honeycomb.translate.impl.read.GenericInitListReader;
-import io.fd.honeycomb.translate.impl.read.GenericReader;
 import io.fd.honeycomb.translate.read.ReaderFactory;
 import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.util.read.KeepaliveReaderWrapper;
 import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.concurrent.ScheduledExecutorService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppState;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppStateBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.BridgeDomainsState;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.BridgeDomainsStateBuilder;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.bridge.domains.state.BridgeDomain;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.l2.fib.attributes.L2FibTable;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.l2.fib.attributes.L2FibTableBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.l2.fib.attributes.l2.fib.table.L2FibEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.BridgeDomains;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.BridgeDomainsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.Version;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.vpp.state.bridge.domains.BridgeDomain;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public final class VppStateHoneycombReaderFactory implements ReaderFactory {
+public final class L2StateHoneycombReaderFactory implements ReaderFactory {
 
     private final FutureJVppCore jVpp;
     private final NamingContext ifcCtx;
     private final NamingContext bdCtx;
-    private final ScheduledExecutorService keepaliveExecutor;
-    private final VppStatusListener vppStatusListener;
-
-    @Inject
-    private V3poConfiguration v3poConfiguration;
 
     @Inject
-    public VppStateHoneycombReaderFactory(final FutureJVppCore jVpp,
-                                          @Named("interface-context") final NamingContext ifcCtx,
-                                          @Named("bridge-domain-context") final NamingContext bdCtx,
-                                          final ScheduledExecutorService keepaliveExecutorDependency,
-                                          final VppStatusListener vppStatusListener) {
+    public L2StateHoneycombReaderFactory(final FutureJVppCore jVpp,
+                                         @Named("interface-context") final NamingContext ifcCtx,
+                                         @Named("bridge-domain-context") final NamingContext bdCtx) {
         this.jVpp = jVpp;
         this.ifcCtx = ifcCtx;
         this.bdCtx = bdCtx;
-        this.keepaliveExecutor = keepaliveExecutorDependency;
-        this.vppStatusListener = vppStatusListener;
     }
 
     @Override
     public void init(final ModifiableReaderRegistryBuilder registry) {
-        // VppState(Structural)
-        final InstanceIdentifier<VppState> vppStateId = InstanceIdentifier.create(VppState.class);
-        registry.addStructuralReader(vppStateId, VppStateBuilder.class);
-        //  Version
-        // Wrap with keepalive reader to detect connection issues
-        // Relying on VersionCustomizer to provide a "timing out read"
-        registry.add(new KeepaliveReaderWrapper<>(
-                new GenericReader<>(vppStateId.child(Version.class), new VersionCustomizer(jVpp)),
-                keepaliveExecutor, ReadTimeoutException.class, v3poConfiguration.getKeepaliveDelay(), vppStatusListener));
         //  BridgeDomains(Structural)
-        final InstanceIdentifier<BridgeDomains> bridgeDomainsId = vppStateId.child(BridgeDomains.class);
-        registry.addStructuralReader(bridgeDomainsId, BridgeDomainsBuilder.class);
+        final InstanceIdentifier<BridgeDomainsState> bridgeDomainsId = InstanceIdentifier.create(BridgeDomainsState.class);
+        registry.addStructuralReader(bridgeDomainsId, BridgeDomainsStateBuilder.class);
         //   BridgeDomain
         final InstanceIdentifier<BridgeDomain> bridgeDomainId = bridgeDomainsId.child(BridgeDomain.class);
         registry.add(new GenericInitListReader<>(bridgeDomainId, new BridgeDomainCustomizer(jVpp, bdCtx)));