HC2VPP-84: multiple ARP proxy ranges support

Change-Id: If3e2b8b889a62ce8b9e62f854c592c24f319c0d4
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

3 files changed, 183 insertions, 136 deletions

diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizer.java
deleted file mode 100644
index 9f5c4ac66..000000000
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ProxyArpCustomizer.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * 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.hc2vpp.v3po.interfaces;
-
-import com.google.common.net.InetAddresses;
-import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
-import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
-import io.fd.hc2vpp.common.translate.util.NamingContext;
-import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.write.WriteContext;
-import io.fd.honeycomb.translate.write.WriteFailedException;
-import io.fd.vpp.jvpp.core.dto.ProxyArpAddDel;
-import io.fd.vpp.jvpp.core.dto.ProxyArpAddDelReply;
-import io.fd.vpp.jvpp.core.dto.ProxyArpIntfcEnableDisable;
-import io.fd.vpp.jvpp.core.future.FutureJVppCore;
-import java.net.InetAddress;
-import java.util.concurrent.Future;
-import javax.annotation.Nonnull;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.ProxyArp;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ProxyArpCustomizer extends FutureJVppCustomizer implements WriterCustomizer<ProxyArp>, JvppReplyConsumer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(ProxyArpCustomizer.class);
-    private final NamingContext interfaceContext;
-
-    public ProxyArpCustomizer(final FutureJVppCore vppApi, final NamingContext interfaceContext) {
-        super(vppApi);
-        this.interfaceContext = interfaceContext;
-    }
-
-    @Override
-    public void writeCurrentAttributes(@Nonnull InstanceIdentifier<ProxyArp> id, @Nonnull ProxyArp dataAfter,
-                                       @Nonnull WriteContext writeContext) throws WriteFailedException {
-        final String swIfName = id.firstKeyOf(Interface.class).getName();
-        final int swIfIndex = interfaceContext.getIndex(swIfName, writeContext.getMappingContext());
-        createProxyArp(getProxyArpRequestFuture(id, swIfName, dataAfter, (byte) 1 /* 1 is add */), id, dataAfter);
-        enableProxyArp(swIfName, swIfIndex, id);
-    }
-
-    @Override
-    public void updateCurrentAttributes(@Nonnull InstanceIdentifier<ProxyArp> id, @Nonnull ProxyArp dataBefore,
-                                        @Nonnull ProxyArp dataAfter, @Nonnull WriteContext writeContext)
-            throws WriteFailedException.UpdateFailedException {
-        throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter,
-                new UnsupportedOperationException("ARP proxy update is not supported"));
-    }
-
-    @Override
-    public void deleteCurrentAttributes(@Nonnull InstanceIdentifier<ProxyArp> id, @Nonnull ProxyArp dataBefore,
-                                        @Nonnull WriteContext writeContext) throws WriteFailedException {
-
-        final String swIfName = id.firstKeyOf(Interface.class).getName();
-        final int swIfIndex = interfaceContext.getIndex(swIfName, writeContext.getMappingContext());
-        deleteProxyArp(getProxyArpRequestFuture(id, swIfName, dataBefore, (byte) 0 /* 0 is delete */), id);
-        disableProxyArp(swIfName, swIfIndex, id);
-    }
-
-    private Future<ProxyArpAddDelReply> getProxyArpRequestFuture(InstanceIdentifier<ProxyArp> id, String swIfName,
-                                                                 ProxyArp proxyArp, byte operation)
-            throws WriteFailedException {
-        LOG.debug("Setting Proxy ARP settings for interface: {}", swIfName);
-        final InetAddress srcAddress = InetAddresses.forString(getv4AddressString(proxyArp.getLowAddr()));
-        final InetAddress dstAddress = InetAddresses.forString(getv4AddressString(proxyArp.getHighAddr()));
-        final int vrfId = proxyArp.getVrfId().intValue();
-        return getFutureJVpp().proxyArpAddDel(
-                getProxyArpConfRequest(operation, srcAddress.getAddress(), dstAddress.getAddress(), vrfId))
-                .toCompletableFuture();
-    }
-
-    private void createProxyArp(final Future<ProxyArpAddDelReply> future, final InstanceIdentifier<ProxyArp> identifier,
-                                final ProxyArp data)
-            throws WriteFailedException {
-        final ProxyArpAddDelReply reply = getReplyForCreate(future, identifier, data);
-        LOG.debug("Proxy ARP setting create successful, with reply context:", reply.context);
-    }
-
-    private void deleteProxyArp(final Future<ProxyArpAddDelReply> future, final InstanceIdentifier<ProxyArp> identifier)
-        throws WriteFailedException {
-        final ProxyArpAddDelReply reply = getReplyForDelete(future, identifier);
-        LOG.debug("Proxy ARP setting delete successful, with reply context:", reply.context);
-    }
-
-    private static ProxyArpAddDel getProxyArpConfRequest(final byte isAdd, final byte[] lAddr, final byte[] hAddr,
-                                                         final int vrfId) {
-
-        final ProxyArpAddDel proxyArpAddDel = new ProxyArpAddDel();
-        proxyArpAddDel.isAdd = isAdd;
-        proxyArpAddDel.lowAddress = lAddr;
-        proxyArpAddDel.hiAddress = hAddr;
-        proxyArpAddDel.vrfId = vrfId;
-        return proxyArpAddDel;
-    }
-
-    private String getv4AddressString(@Nonnull final Ipv4Address addr) {
-        return addr.getValue();
-    }
-
-    private void enableProxyArp(final String swIfName, final int swIfIndex,
-                                final InstanceIdentifier<ProxyArp> identifier)
-        throws WriteFailedException {
-        final ProxyArpIntfcEnableDisable request = new ProxyArpIntfcEnableDisable();
-        request.swIfIndex = swIfIndex;
-        request.enableDisable = 1;
-        getReplyForWrite(getFutureJVpp().proxyArpIntfcEnableDisable(request).toCompletableFuture(), identifier);
-        LOG.debug("Proxy ARP was successfully enabled on interface {} (id={})", swIfName, swIfIndex);
-    }
-
-    private void disableProxyArp(final String swIfName, final int swIfIndex,
-                                 final InstanceIdentifier<ProxyArp> identifier)
-        throws WriteFailedException {
-        final ProxyArpIntfcEnableDisable request = new ProxyArpIntfcEnableDisable();
-        request.swIfIndex = swIfIndex;
-        request.enableDisable = 0;
-        getReplyForDelete(getFutureJVpp().proxyArpIntfcEnableDisable(request).toCompletableFuture(), identifier);
-        LOG.debug("Proxy ARP was successfully disabled on interface {} (id={})", swIfName, swIfIndex);
-    }
-}
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/ProxyArpCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/ProxyArpCustomizer.java
new file mode 100644
index 000000000..a39b9852f
--- /dev/null
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/ProxyArpCustomizer.java
@@ -0,0 +1,78 @@
+/*
+ * 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.
+ * 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.hc2vpp.v3po.interfaces.ip.v4;
+
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
+import io.fd.honeycomb.translate.write.WriteContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.vpp.jvpp.core.dto.ProxyArpIntfcEnableDisable;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.interfaces._interface.ProxyArp;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ProxyArpCustomizer extends FutureJVppCustomizer implements WriterCustomizer<ProxyArp>, JvppReplyConsumer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ProxyArpCustomizer.class);
+    private final NamingContext interfaceContext;
+
+    public ProxyArpCustomizer(final FutureJVppCore vppApi, final NamingContext interfaceContext) {
+        super(vppApi);
+        this.interfaceContext = interfaceContext;
+    }
+
+    @Override
+    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<ProxyArp> id,
+                                       @Nonnull final ProxyArp dataAfter,
+                                       @Nonnull final WriteContext writeContext) throws WriteFailedException {
+        final String swIfName = id.firstKeyOf(Interface.class).getName();
+        final int swIfIndex = interfaceContext.getIndex(swIfName, writeContext.getMappingContext());
+        final ProxyArpIntfcEnableDisable request = new ProxyArpIntfcEnableDisable();
+        request.swIfIndex = swIfIndex;
+        request.enableDisable = 1;
+        getReplyForWrite(getFutureJVpp().proxyArpIntfcEnableDisable(request).toCompletableFuture(), id);
+        LOG.debug("Proxy ARP was successfully enabled on interface {} (id={})", swIfName, swIfIndex);
+    }
+
+    @Override
+    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<ProxyArp> id,
+                                        @Nonnull final ProxyArp dataBefore,
+                                        @Nonnull final ProxyArp dataAfter, @Nonnull final WriteContext writeContext)
+        throws WriteFailedException {
+        throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter,
+            new UnsupportedOperationException("Proxy ARP feature update is not supported."));
+    }
+
+    @Override
+    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<ProxyArp> id,
+                                        @Nonnull final ProxyArp dataBefore,
+                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
+        final String swIfName = id.firstKeyOf(Interface.class).getName();
+        final int swIfIndex = interfaceContext.getIndex(swIfName, writeContext.getMappingContext());
+        final ProxyArpIntfcEnableDisable request = new ProxyArpIntfcEnableDisable();
+        request.swIfIndex = swIfIndex;
+        request.enableDisable = 0;
+        getReplyForDelete(getFutureJVpp().proxyArpIntfcEnableDisable(request).toCompletableFuture(), id);
+        LOG.debug("Proxy ARP was successfully disabled on interface {} (id={})", swIfName, swIfIndex);
+    }
+}
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/ProxyRangeCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/ProxyRangeCustomizer.java
new file mode 100644
index 000000000..b46289fb4
--- /dev/null
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/ip/v4/ProxyRangeCustomizer.java
@@ -0,0 +1,105 @@
+/*
+ * 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.
+ * 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.hc2vpp.v3po.interfaces.ip.v4;
+
+import com.google.common.net.InetAddresses;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
+import io.fd.honeycomb.translate.write.WriteContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.vpp.jvpp.core.dto.ProxyArpAddDel;
+import io.fd.vpp.jvpp.core.dto.ProxyArpAddDelReply;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import java.net.InetAddress;
+import java.util.concurrent.Future;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.proxy.ranges.ProxyRange;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.proxy.arp.rev170315.proxy.ranges.ProxyRangeKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ProxyRangeCustomizer extends FutureJVppCustomizer
+    implements ListWriterCustomizer<ProxyRange, ProxyRangeKey>, JvppReplyConsumer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ProxyRangeCustomizer.class);
+
+    public ProxyRangeCustomizer(final FutureJVppCore vppApi) {
+        super(vppApi);
+    }
+
+    @Override
+    public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<ProxyRange> id,
+                                       @Nonnull final ProxyRange dataAfter,
+                                       @Nonnull final WriteContext writeContext) throws WriteFailedException {
+        LOG.debug("Adding range of proxy ARP addresses: {}", dataAfter);
+        createProxyArp(getProxyArpRequestFuture(dataAfter, (byte) 1 /* 1 is add */), id, dataAfter);
+    }
+
+    @Override
+    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<ProxyRange> id,
+                                        @Nonnull final ProxyRange dataBefore,
+                                        @Nonnull final ProxyRange dataAfter, @Nonnull final WriteContext writeContext)
+        throws WriteFailedException {
+        throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter,
+            new UnsupportedOperationException("ARP proxy range update is not supported"));
+    }
+
+    @Override
+    public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<ProxyRange> id,
+                                        @Nonnull final ProxyRange dataBefore,
+                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
+        LOG.debug("Removing range of proxy ARP addresses: {}", dataBefore);
+        deleteProxyArp(getProxyArpRequestFuture(dataBefore, (byte) 0 /* 0 is delete */), id);
+    }
+
+    private Future<ProxyArpAddDelReply> getProxyArpRequestFuture(ProxyRange proxyArp, byte operation)
+        throws WriteFailedException {
+        final InetAddress srcAddress = InetAddresses.forString(proxyArp.getLowAddr().getValue());
+        final InetAddress dstAddress = InetAddresses.forString(proxyArp.getHighAddr().getValue());
+        final int vrfId = proxyArp.getVrfId().intValue();
+        return getFutureJVpp().proxyArpAddDel(
+            getProxyArpConfRequest(operation, srcAddress.getAddress(), dstAddress.getAddress(), vrfId))
+            .toCompletableFuture();
+    }
+
+    private void createProxyArp(final Future<ProxyArpAddDelReply> future,
+                                final InstanceIdentifier<ProxyRange> identifier,
+                                final ProxyRange data)
+        throws WriteFailedException {
+        final ProxyArpAddDelReply reply = getReplyForCreate(future, identifier, data);
+        LOG.debug("Proxy ARP setting create successful, with reply context:", reply.context);
+    }
+
+    private void deleteProxyArp(final Future<ProxyArpAddDelReply> future,
+                                final InstanceIdentifier<ProxyRange> identifier)
+        throws WriteFailedException {
+        final ProxyArpAddDelReply reply = getReplyForDelete(future, identifier);
+        LOG.debug("Proxy ARP setting delete successful, with reply context:", reply.context);
+    }
+
+    private static ProxyArpAddDel getProxyArpConfRequest(final byte isAdd, final byte[] lAddr, final byte[] hAddr,
+                                                         final int vrfId) {
+        final ProxyArpAddDel proxyArpAddDel = new ProxyArpAddDel();
+        proxyArpAddDel.isAdd = isAdd;
+        proxyArpAddDel.lowAddress = lAddr;
+        proxyArpAddDel.hiAddress = hAddr;
+        proxyArpAddDel.vrfId = vrfId;
+        return proxyArpAddDel;
+    }
+}