HONEYCOMB-98: Fixed initializing of Ipv4 container

Change-Id: I19161f9a25534160b2473b2a03c4a3c9fc4a2c1c
Signed-off-by: Jan Srnicek <jan.srnicek@pantheon.tech>

3 files changed, 172 insertions, 46 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java
new file mode 100644
index 000000000..b52b0552a
--- /dev/null
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4AddressCustomizer.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2016 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.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.honeycomb.v3po.translate.v3po.interfacesstate.ip;
+
+import com.google.common.base.Optional;
+import io.fd.honeycomb.v3po.translate.ModificationCache;
+import io.fd.honeycomb.v3po.translate.read.ReadContext;
+import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
+import io.fd.honeycomb.v3po.translate.spi.read.ListReaderCustomizer;
+import io.fd.honeycomb.v3po.translate.util.RWUtils;
+import io.fd.honeycomb.v3po.translate.v3po.util.FutureJVppCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.util.TranslateUtils;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.AddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.AddressKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.address.subnet.PrefixLengthBuilder;
+import org.opendaylight.yangtools.concepts.Builder;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.openvpp.jvpp.VppBaseCallException;
+import org.openvpp.jvpp.dto.IpAddressDetails;
+import org.openvpp.jvpp.dto.IpAddressDetailsReplyDump;
+import org.openvpp.jvpp.dto.IpAddressDump;
+import org.openvpp.jvpp.future.FutureJVpp;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Customizer for read operations for {@link Address} of {@link Ipv4}
+ */
+public class Ipv4AddressCustomizer extends FutureJVppCustomizer
+        implements ListReaderCustomizer<Address, AddressKey, AddressBuilder> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(Ipv4AddressCustomizer.class);
+
+    private static final String CACHE_KEY = Ipv4AddressCustomizer.class.getName();
+
+    public Ipv4AddressCustomizer(FutureJVpp futureJvpp) {
+        super(futureJvpp);
+    }
+
+    @Override
+    public AddressBuilder getBuilder(@Nonnull InstanceIdentifier<Address> id) {
+        return new AddressBuilder();
+    }
+
+    @Override
+    public void readCurrentAttributes(@Nonnull InstanceIdentifier<Address> id, @Nonnull AddressBuilder builder,
+                                      @Nonnull ReadContext ctx)
+            throws ReadFailedException {
+        LOG.debug("Reading attributes...");
+
+        Optional<IpAddressDetailsReplyDump> dumpOptional = dumpAddresses(id, ctx);
+
+        if (dumpOptional.isPresent() && dumpOptional.get().ipAddressDetails != null) {
+            List<IpAddressDetails> details = dumpOptional.get().ipAddressDetails;
+
+            AddressKey key = id.firstKeyOf(Address.class);
+            byte[] identifingIpBytes = TranslateUtils.ipv4AddressNoZoneToArray(key.getIp());
+
+            IpAddressDetails detail = details.stream()
+                    .filter(singleDetail -> Arrays.equals(identifingIpBytes, singleDetail.ip))
+                    .collect(RWUtils.singleItemCollector());
+
+            builder.setIp(TranslateUtils.arrayToIpv4AddressNoZone(detail.ip))
+                    .setSubnet(new PrefixLengthBuilder()
+                            .setPrefixLength(Short.valueOf(detail.prefixLength)).build());
+            LOG.info("Address read successfull");
+
+        } else {
+            LOG.warn("No address dump present");
+        }
+    }
+
+    @Override
+    public List<AddressKey> getAllIds(@Nonnull InstanceIdentifier<Address> id, @Nonnull ReadContext context)
+            throws ReadFailedException {
+        LOG.debug("Extracting keys..");
+
+        Optional<IpAddressDetailsReplyDump> dumpOptional = dumpAddresses(id, context);
+
+        if (dumpOptional.isPresent() && dumpOptional.get().ipAddressDetails != null) {
+
+            List<IpAddressDetails> details = dumpOptional.get().ipAddressDetails;
+
+            return details.stream()
+                    .map(detail -> new AddressKey(TranslateUtils.arrayToIpv4AddressNoZone(detail.ip)))
+                    .collect(Collectors.toList());
+        } else {
+            LOG.warn("No dump present");
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public void merge(@Nonnull Builder<? extends DataObject> builder, @Nonnull List<Address> readData) {
+        ((Ipv4Builder) builder).setAddress(readData);
+    }
+
+    // TODO refactor after there is an more generic implementation of cache
+    // operations
+    private Optional<IpAddressDetailsReplyDump> dumpAddresses(InstanceIdentifier<Address> id, ReadContext ctx)
+            throws ReadFailedException {
+        Optional<IpAddressDetailsReplyDump> dumpFromCache = dumpAddressFromCache(ctx.getModificationCache());
+
+        if (dumpFromCache.isPresent()) {
+            return dumpFromCache;
+        }
+
+        Optional<IpAddressDetailsReplyDump> dumpFromOperational;
+        try {
+            dumpFromOperational = dumpAddressFromOperationalData();
+        } catch (VppBaseCallException e) {
+            throw new ReadFailedException(id, e);
+        }
+
+        if (dumpFromOperational.isPresent()) {
+            ctx.getModificationCache().put(CACHE_KEY, dumpFromOperational.get());
+        }
+
+        return dumpFromOperational;
+    }
+
+    private Optional<IpAddressDetailsReplyDump> dumpAddressFromCache(ModificationCache cache) {
+        LOG.debug("Dumping from cache...");
+        return Optional.fromNullable((IpAddressDetailsReplyDump) cache.get(CACHE_KEY));
+    }
+
+    private Optional<IpAddressDetailsReplyDump> dumpAddressFromOperationalData() throws VppBaseCallException {
+        LOG.debug("Dumping from operational data...");
+        return Optional.fromNullable(
+                TranslateUtils.getReply(getFutureJVpp().ipAddressDump(new IpAddressDump()).toCompletableFuture()));
+    }
+
+}
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4Customizer.java
index 582d9c8e3..a10ad3ba5 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4Customizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/ip/Ipv4Customizer.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package io.fd.honeycomb.v3po.translate.v3po.interfacesstate.ip;
 
 import io.fd.honeycomb.v3po.translate.read.ReadContext;
@@ -20,24 +21,13 @@ import io.fd.honeycomb.v3po.translate.read.ReadFailedException;
 import io.fd.honeycomb.v3po.translate.spi.read.ChildReaderCustomizer;
 import io.fd.honeycomb.v3po.translate.v3po.util.FutureJVppCustomizer;
 import io.fd.honeycomb.v3po.translate.v3po.util.NamingContext;
-import io.fd.honeycomb.v3po.translate.v3po.util.TranslateUtils;
-import java.util.concurrent.CompletionStage;
-import java.util.stream.Collectors;
 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.Interface2Builder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4Builder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.AddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.address.subnet.PrefixLengthBuilder;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.openvpp.jvpp.VppBaseCallException;
-import org.openvpp.jvpp.dto.IpAddressDetails;
-import org.openvpp.jvpp.dto.IpAddressDetailsReplyDump;
-import org.openvpp.jvpp.dto.IpAddressDump;
 import org.openvpp.jvpp.future.FutureJVpp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,6 +36,7 @@ public class Ipv4Customizer extends FutureJVppCustomizer implements ChildReaderC
 
     private static final Logger LOG = LoggerFactory.getLogger(Ipv4Customizer.class);
 
+    //do not remove,it will be needed in future implementation
     private final NamingContext interfaceContext;
 
     public Ipv4Customizer(@Nonnull final FutureJVpp futureJvpp, final NamingContext interfaceContext) {
@@ -67,35 +58,8 @@ public class Ipv4Customizer extends FutureJVppCustomizer implements ChildReaderC
     @Override
     public void readCurrentAttributes(@Nonnull final InstanceIdentifier<Ipv4> id, @Nonnull final Ipv4Builder builder,
                                       @Nonnull final ReadContext ctx) throws ReadFailedException {
-        LOG.debug("Reading attributes for IPv4: {}", id);
-        final IpAddressDump dumpRequest = new IpAddressDump();
-        dumpRequest.isIpv6 = 0;
-        dumpRequest.swIfIndex = interfaceContext.getIndex(id.firstKeyOf(Interface.class).getName(), ctx.getMappingContext());
-        final CompletionStage<IpAddressDetailsReplyDump> addressDumpFuture = getFutureJVpp().ipAddressDump(dumpRequest);
-
-        // TODO consider extracting customizer for address
-        final IpAddressDetailsReplyDump reply;
-        try {
-            reply = TranslateUtils.getReply(addressDumpFuture.toCompletableFuture());
-        } catch (VppBaseCallException e) {
-            LOG.warn("Unable to read IPv4 attributes for {}", id, e);
-            throw new ReadFailedException(id, e);
-        }
-        if(reply != null && reply.ipAddressDetails != null) {
-            builder.setAddress(
-                reply.ipAddressDetails.stream()
-                    .map(Ipv4Customizer::addressDetailsToIpv4)
-                    .collect(Collectors.toList()));
-        }
-
-        // TODO what about other children ?
+        //TODO add reading of isForwarding flag when there is dump for it
+        LOG.warn("Operation not supported");
     }
 
-    private static Address addressDetailsToIpv4(IpAddressDetails details) {
-        return new AddressBuilder()
-            .setIp(TranslateUtils.arrayToIpv4AddressNoZone(details.ip))
-            .setSubnet(new PrefixLengthBuilder().setPrefixLength((short) details.prefixLength).build())
-//            .setOrigin()
-            .build();
-    }
 }
diff --git a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java
index ff27694cd..733942e4c 100644
--- a/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java
+++ b/v3po/v3po2vpp/src/main/java/org/opendaylight/yang/gen/v1/urn/honeycomb/params/xml/ns/yang/v3po2vpp/rev160406/InterfacesStateHoneycombReaderModule.java
@@ -1,6 +1,5 @@
 package org.opendaylight.yang.gen.v1.urn.honeycomb.params.xml.ns.yang.v3po2vpp.rev160406;
 
-
 import static io.fd.honeycomb.v3po.translate.util.RWUtils.emptyAugReaderList;
 import static io.fd.honeycomb.v3po.translate.util.RWUtils.emptyChildReaderList;
 import static io.fd.honeycomb.v3po.translate.util.RWUtils.singletonChildReaderList;
@@ -25,6 +24,7 @@ import io.fd.honeycomb.v3po.translate.v3po.interfacesstate.TapCustomizer;
 import io.fd.honeycomb.v3po.translate.v3po.interfacesstate.VhostUserCustomizer;
 import io.fd.honeycomb.v3po.translate.v3po.interfacesstate.VxlanCustomizer;
 import io.fd.honeycomb.v3po.translate.v3po.interfacesstate.VxlanGpeCustomizer;
+import io.fd.honeycomb.v3po.translate.v3po.interfacesstate.ip.Ipv4AddressCustomizer;
 import io.fd.honeycomb.v3po.translate.v3po.interfacesstate.ip.Ipv4Customizer;
 import io.fd.honeycomb.v3po.translate.v3po.interfacesstate.ip.Ipv6Customizer;
 import java.util.ArrayList;
@@ -38,6 +38,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev14061
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface2Builder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv4;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.Ipv6;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces.state._interface.ipv4.Address;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceStateAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceStateAugmentationBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces.state._interface.Ethernet;
@@ -98,17 +99,22 @@ public class InterfacesStateHoneycombReaderModule extends
     }
 
     private ChildReader<? extends Augmentation<Interface>> getInterface1AugmentationReader() {
-        final List<ChildReader<? extends ChildOf<Interface2>>> interface1ChildWriters = Lists.newArrayList();
+
+        final ChildReader<Address> addressReader = new CompositeListReader<>(Address.class,
+                new Ipv4AddressCustomizer(getVppJvppDependency()));
 
         final ChildReader<? extends ChildOf<Interface2>> ipv4Reader = new CompositeChildReader<>(Ipv4.class,
-            new Ipv4Customizer(getVppJvppDependency(), getInterfaceContextIfcStateDependency()));
+                RWUtils.singletonChildReaderList(addressReader),
+                new Ipv4Customizer(getVppJvppDependency(), getInterfaceContextIfcStateDependency()));
         final ChildReader<? extends ChildOf<Interface2>> ipv6Reader = new CompositeChildReader<>(Ipv6.class,
-            new Ipv6Customizer(getVppJvppDependency(), getInterfaceContextIfcStateDependency()));
+                new Ipv6Customizer(getVppJvppDependency(), getInterfaceContextIfcStateDependency()));
+
+        final List<ChildReader<? extends ChildOf<Interface2>>> interface1ChildWriters = Lists.newArrayList();
         interface1ChildWriters.add(ipv4Reader);
         interface1ChildWriters.add(ipv6Reader);
 
-        return new CompositeChildReader<>(Interface2.class,
-            interface1ChildWriters, new ReflexiveAugmentReaderCustomizer<>(Interface2Builder.class, Interface2.class));
+        return new CompositeChildReader<>(Interface2.class, interface1ChildWriters,
+                new ReflexiveAugmentReaderCustomizer<>(Interface2Builder.class, Interface2.class));
     }