1 files changed, 16 insertions, 40 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6AddressCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6AddressCustomizer.java
index a5166525e..55ca35250 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6AddressCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/ip/v6/Ipv6AddressCustomizer.java
@@ -17,27 +17,20 @@
 package io.fd.hc2vpp.v3po.interfacesstate.ip.v6;
 
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableSet;
-import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.hc2vpp.v3po.interfacesstate.InterfaceCustomizer;
-import io.fd.hc2vpp.v3po.interfacesstate.ip.IpReader;
 import io.fd.hc2vpp.v3po.interfacesstate.ip.dump.params.IfaceDumpFilter;
+import io.fd.hc2vpp.v3po.interfacesstate.ip.readers.IpAddressReader;
 import io.fd.honeycomb.translate.read.ReadContext;
 import io.fd.honeycomb.translate.read.ReadFailedException;
 import io.fd.honeycomb.translate.spi.read.Initialized;
 import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer;
 import io.fd.honeycomb.translate.util.RWUtils;
-import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager;
-import io.fd.honeycomb.translate.util.read.cache.TypeAwareIdentifierCacheKeyFactory;
+import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder;
 import io.fd.vpp.jvpp.core.dto.IpAddressDetails;
 import io.fd.vpp.jvpp.core.dto.IpAddressDetailsReplyDump;
 import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.util.List;
-import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface1;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv6;
@@ -51,25 +44,21 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Ipv6AddressCustomizer extends FutureJVppCustomizer
-        implements InitializingListReaderCustomizer<Address, AddressKey, AddressBuilder>, IpReader {
+import javax.annotation.Nonnull;
+import java.util.List;
 
-    private static final Logger LOG = LoggerFactory.getLogger(Ipv6AddressCustomizer.class);
+public class Ipv6AddressCustomizer extends IpAddressReader
+        implements InitializingListReaderCustomizer<Address, AddressKey, AddressBuilder> {
 
-    private final NamingContext interfaceContext;
-    private final DumpCacheManager<IpAddressDetailsReplyDump, IfaceDumpFilter> dumpManager;
+    private static final Logger LOG = LoggerFactory.getLogger(Ipv6AddressCustomizer.class);
 
     public Ipv6AddressCustomizer(@Nonnull final FutureJVppCore futureJVppCore,
                                  @Nonnull final NamingContext interfaceContext) {
-        super(futureJVppCore);
-        this.interfaceContext = checkNotNull(interfaceContext, "interfaceContext should not be null");
-        this.dumpManager =
-                new DumpCacheManager.DumpCacheManagerBuilder<IpAddressDetailsReplyDump, IfaceDumpFilter>()
-                        .withExecutor(createAddressDumpExecutor(futureJVppCore))
-                        // Key needs to contain interface ID to distinguish dumps between interfaces
-                        .withCacheKeyFactory(new TypeAwareIdentifierCacheKeyFactory(IpAddressDetailsReplyDump.class,
-                                ImmutableSet.of(Interface.class)))
-                        .build();
+        super(interfaceContext, true, new DumpCacheManagerBuilder<IpAddressDetailsReplyDump, IfaceDumpFilter>()
+                .withExecutor(createAddressDumpExecutor(futureJVppCore))
+                // Key needs to contain interface ID to distinguish dumps between interfaces
+                .withCacheKeyFactory(interfaceScopedCacheKeyFactory(IpAddressDetailsReplyDump.class))
+                .build());
     }
 
     @Override
@@ -83,17 +72,8 @@ public class Ipv6AddressCustomizer extends FutureJVppCustomizer
                                       @Nonnull ReadContext ctx)
             throws ReadFailedException {
         LOG.debug("Reading attributes for interface address: {}", id);
-
-        final String interfaceName = id.firstKeyOf(Interface.class).getName();
-        final int interfaceIndex = interfaceContext.getIndex(interfaceName, ctx.getMappingContext());
-        final Optional<IpAddressDetailsReplyDump> dumpOptional =
-                dumpManager.getDump(id, ctx.getModificationCache(), new IfaceDumpFilter(interfaceIndex, true));
-
-        if (!dumpOptional.isPresent() || dumpOptional.get().ipAddressDetails.isEmpty()) {
-            return;
-        }
         final Optional<IpAddressDetails> ipAddressDetails =
-                findIpv6AddressDetailsByIp(dumpOptional, id.firstKeyOf(Address.class).getIp());
+                findIpv6AddressDetailsByIp(interfaceAddressDumpSupplier(id, ctx), id.firstKeyOf(Address.class).getIp());
 
         if (ipAddressDetails.isPresent()) {
             final IpAddressDetails detail = ipAddressDetails.get();
@@ -102,6 +82,8 @@ public class Ipv6AddressCustomizer extends FutureJVppCustomizer
                     .build();
 
             if (LOG.isDebugEnabled()) {
+                final String interfaceName = id.firstKeyOf(Interface.class).getName();
+                final int interfaceIndex = getInterfaceContext().getIndex(interfaceName, ctx.getMappingContext());
                 LOG.debug("Attributes for {} interface (id={}) address {} successfully read: {}",
                         interfaceName, interfaceIndex, id, builder.build());
             }
@@ -112,13 +94,7 @@ public class Ipv6AddressCustomizer extends FutureJVppCustomizer
     public List<AddressKey> getAllIds(@Nonnull InstanceIdentifier<Address> id, @Nonnull ReadContext ctx)
             throws ReadFailedException {
         LOG.debug("Reading list of keys for interface addresses: {}", id);
-
-        final String interfaceName = id.firstKeyOf(Interface.class).getName();
-        final int interfaceIndex = interfaceContext.getIndex(interfaceName, ctx.getMappingContext());
-        final Optional<IpAddressDetailsReplyDump> dumpOptional =
-                dumpManager.getDump(id, ctx.getModificationCache(), new IfaceDumpFilter(interfaceIndex, true));
-
-        return getAllIpv6AddressIds(dumpOptional, AddressKey::new);
+        return getAllIpv6AddressIds(interfaceAddressDumpSupplier(id, ctx), AddressKey::new);
     }
 
     @Override