1 files changed, 19 insertions, 62 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RoutingCustomizer.java
index e2da62005..15eb12268 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RoutingCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/RoutingCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Cisco and/or its affiliates.
+ * Copyright (c) 2017 Cisco and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,86 +22,43 @@ import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 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.InitializingReaderCustomizer;
-import io.fd.honeycomb.translate.util.RWUtils;
 import io.fd.vpp.jvpp.core.dto.SwInterfaceGetTable;
 import io.fd.vpp.jvpp.core.dto.SwInterfaceGetTableReply;
 import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import java.util.function.Consumer;
 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.opendaylight.params.xml.ns.yang.v3po.rev170315.VppInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.VppInterfaceStateAugmentationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.interfaces.state._interface.Routing;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.interfaces.state._interface.RoutingBuilder;
-import org.opendaylight.yangtools.concepts.Builder;
-import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.RoutingBaseAttributes;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class RoutingCustomizer extends FutureJVppCustomizer implements
-    InitializingReaderCustomizer<Routing, RoutingBuilder>, JvppReplyConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(RoutingCustomizer.class);
+abstract class RoutingCustomizer extends FutureJVppCustomizer implements JvppReplyConsumer {
     private final NamingContext interfaceContext;
 
-    public RoutingCustomizer(final FutureJVppCore vppApi, final NamingContext interfaceContext) {
-        super(vppApi);
+    protected RoutingCustomizer(@Nonnull final FutureJVppCore futureJVppCore,
+                                @Nonnull final NamingContext interfaceContext) {
+        super(futureJVppCore);
         this.interfaceContext = interfaceContext;
     }
 
-    @Nonnull
-    @Override
-    public RoutingBuilder getBuilder(@Nonnull final InstanceIdentifier<Routing> id) {
-        return new RoutingBuilder();
-    }
-
-    @Override
-    public void readCurrentAttributes(@Nonnull final InstanceIdentifier<Routing> id,
-                                      @Nonnull final RoutingBuilder builder,
-                                      @Nonnull final ReadContext ctx) throws ReadFailedException {
-        LOG.debug("Reading attributes for Routing: {}", id);
-        final String ifName = id.firstKeyOf(Interface.class).getName();
+    protected void readInterfaceRouting(@Nonnull final InstanceIdentifier<? extends RoutingBaseAttributes> id,
+                                        @Nonnull final Consumer<Long> v4VrfConsumer,
+                                        @Nonnull final Consumer<Long> v6VrfConsumer,
+                                        @Nonnull final ReadContext ctx, final String interfaceName)
+            throws ReadFailedException {
         final SwInterfaceGetTable request = new SwInterfaceGetTable();
-        request.swIfIndex = interfaceContext.getIndex(ifName, ctx.getMappingContext());
+        request.swIfIndex = interfaceContext.getIndex(interfaceName, ctx.getMappingContext());
         request.isIpv6 = 0;
-        final SwInterfaceGetTableReply ip4Reply = getReplyForRead(getFutureJVpp().swInterfaceGetTable(request).toCompletableFuture(), id);
+        final SwInterfaceGetTableReply
+                ip4Reply = getReplyForRead(getFutureJVpp().swInterfaceGetTable(request).toCompletableFuture(), id);
 
         request.isIpv6 = 1;
-        final SwInterfaceGetTableReply ip6Reply = getReplyForRead(getFutureJVpp().swInterfaceGetTable(request).toCompletableFuture(), id);
+        final SwInterfaceGetTableReply ip6Reply =
+                getReplyForRead(getFutureJVpp().swInterfaceGetTable(request).toCompletableFuture(), id);
 
         if (ip4Reply.vrfId != 0) {
-            builder.setIpv4VrfId(UnsignedInts.toLong(ip4Reply.vrfId));
+            v4VrfConsumer.accept(UnsignedInts.toLong(ip4Reply.vrfId));
         }
         if (ip6Reply.vrfId != 0) {
-            builder.setIpv6VrfId(UnsignedInts.toLong(ip6Reply.vrfId));
+            v6VrfConsumer.accept(UnsignedInts.toLong(ip6Reply.vrfId));
         }
     }
-
-    @Override
-    public void merge(@Nonnull final Builder<? extends DataObject> parentBuilder, @Nonnull final Routing readValue) {
-        ((VppInterfaceStateAugmentationBuilder)parentBuilder).setRouting(readValue);
-    }
-
-    @Nonnull
-    @Override
-    public Initialized<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.interfaces._interface.Routing> init(
-        @Nonnull final InstanceIdentifier<Routing> id,
-        @Nonnull final Routing readValue,
-        @Nonnull final ReadContext ctx) {
-        return Initialized.create(getCfgId(id),
-            new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.interfaces._interface.RoutingBuilder()
-                .setIpv4VrfId(readValue.getIpv4VrfId())
-                .setIpv6VrfId(readValue.getIpv6VrfId())
-                .build());
-    }
-
-    private InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.interfaces._interface.Routing> getCfgId(
-        final InstanceIdentifier<Routing> id) {
-        return InterfaceCustomizer.getCfgId(RWUtils.cutId(id, Interface.class))
-            .augmentation(VppInterfaceAugmentation.class)
-            .child(
-                org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.interfaces._interface.Routing.class);
-    }
 }