1 files changed, 23 insertions, 0 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4NeighbourCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4NeighbourCustomizer.java
index b44a827a9..aedd44286 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4NeighbourCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/Ipv4NeighbourCustomizer.java
@@ -16,6 +16,7 @@
 
 package io.fd.hc2vpp.v3po.interfaces.ip.v4;
 
+import com.google.common.base.Optional;
 import io.fd.hc2vpp.common.translate.util.AddressTranslator;
 import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
 import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
@@ -32,6 +33,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv4;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.Neighbor;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.ipv4.NeighborKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.RoutingBaseAttributes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentation;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -68,6 +71,8 @@ public class Ipv4NeighbourCustomizer extends FutureJVppCustomizer
             request.swIfIndex = interfaceContext
                     .getIndex(id.firstKeyOf(Interface.class).getName(), writeContext.getMappingContext());
 
+            bindVrfIfSpecified(writeContext, id, request);
+
             return request;
         }, getFutureJVpp());
         LOG.debug("Neighbour {} successfully written", id);
@@ -95,8 +100,26 @@ public class Ipv4NeighbourCustomizer extends FutureJVppCustomizer
             request.swIfIndex = interfaceContext
                     .getIndex(id.firstKeyOf(Interface.class).getName(), writeContext.getMappingContext());
 
+            bindVrfIfSpecified(writeContext, id, request);
+
             return request;
         }, getFutureJVpp());
         LOG.debug("Neighbour {} successfully deleted", id);
     }
+
+    private void bindVrfIfSpecified(final WriteContext writeContext,
+                                    final InstanceIdentifier<Neighbor> id,
+                                    IpNeighborAddDel request) {
+        final Optional<Interface> optIface = writeContext.readBefore(id.firstIdentifierOf(Interface.class));
+
+        // if routing set, reads vrf-id
+        // uses java.util.Optional(its internal behaviour suites this use better than guava one)
+        if (optIface.isPresent()) {
+            java.util.Optional.of(optIface.get())
+                    .map(iface -> iface.getAugmentation(VppInterfaceAugmentation.class))
+                    .map(VppInterfaceAugmentation::getRouting)
+                    .map(RoutingBaseAttributes::getIpv4VrfId)
+                    .ifPresent(vrf -> request.vrfId = vrf.byteValue());
+        }
+    }
 }
\ No newline at end of file