From 09df17bb630b5bf594efbd9f869ef17da5e2b6ac Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Mon, 26 Sep 2016 08:28:20 +0200 Subject: HONEYCOMB-195: increase v3po coverage over 80%. WIP Change-Id: Ibe14d7203bdaf53b925e4d16b598942b62b65bae Signed-off-by: Marek Gradzki --- .../translate/v3po/InterfacesWriterFactory.java | 2 +- .../translate/v3po/interfaces/ProxyArpCustomizer.java | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) (limited to 'v3po/v3po2vpp/src/main/java/io/fd/honeycomb') diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java index 39e328a9e..baccf619f 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/InterfacesWriterFactory.java @@ -176,7 +176,7 @@ public final class InterfacesWriterFactory implements WriterFactory { SubinterfaceAugmentationWriterFactory.SUB_IFC_ID); // Proxy Arp (execute after specific interface customizers) registry.addAfter( - new GenericWriter<>(VPP_IFC_AUG_ID.child(ProxyArp.class), new ProxyArpCustomizer(jvpp, ifcNamingContext)), + new GenericWriter<>(VPP_IFC_AUG_ID.child(ProxyArp.class), new ProxyArpCustomizer(jvpp)), specificIfcTypes); // ACL (execute after classify table and session writers) // also handles L2Acl, Ip4Acl and Ip6Acl: diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizer.java index 002cc4c77..229902cdb 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ProxyArpCustomizer.java @@ -20,7 +20,6 @@ import com.google.common.net.InetAddresses; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.v3po.util.FutureJVppCustomizer; import io.fd.honeycomb.translate.v3po.util.JvppReplyConsumer; -import io.fd.honeycomb.translate.v3po.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; import java.net.InetAddress; @@ -37,15 +36,12 @@ import org.openvpp.jvpp.core.future.FutureJVppCore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public class ProxyArpCustomizer extends FutureJVppCustomizer implements WriterCustomizer, JvppReplyConsumer { private static final Logger LOG = LoggerFactory.getLogger(ProxyArpCustomizer.class); - private final NamingContext interfaceContext; - public ProxyArpCustomizer(final FutureJVppCore vppApi, final NamingContext interfaceContext) { + public ProxyArpCustomizer(final FutureJVppCore vppApi) { super(vppApi); - this.interfaceContext = interfaceContext; } @Override @@ -54,10 +50,10 @@ public class ProxyArpCustomizer extends FutureJVppCustomizer implements WriterCu final String swIfName = id.firstKeyOf(Interface.class).getName(); try { - setProxyArp(id, swIfName, dataAfter, writeContext, (byte) 1 /* 1 is add */); + setProxyArp(id, swIfName, dataAfter, (byte) 1 /* 1 is add */); } catch (VppBaseCallException e) { LOG.error("Failed to set Proxy ARP settings: {}, for interface: {}", dataAfter, swIfName); - throw new WriteFailedException(id, dataAfter.toString(), e); + throw new WriteFailedException.CreateFailedException(id, dataAfter, e); } } @@ -75,16 +71,15 @@ public class ProxyArpCustomizer extends FutureJVppCustomizer implements WriterCu final String swIfName = id.firstKeyOf(Interface.class).getName(); try { - setProxyArp(id, swIfName, dataBefore, writeContext, (byte) 0 /* 0 is delete */); + setProxyArp(id, swIfName, dataBefore, (byte) 0 /* 0 is delete */); } catch (VppBaseCallException e) { LOG.debug("Failed to delete Proxy ARP settings: {}, for interface: {}", dataBefore, swIfName); throw new WriteFailedException.DeleteFailedException(id, e); } } - private void setProxyArp(InstanceIdentifier id, String swIfName, ProxyArp proxyArp, WriteContext - writeContext, byte operation) throws VppBaseCallException, WriteFailedException { - + private void setProxyArp(InstanceIdentifier id, String swIfName, ProxyArp proxyArp, byte operation) + throws VppBaseCallException, 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())); -- cgit 1.2.3-korg