From 5c416ebacf4baad25de6213661c3cdfff31c0482 Mon Sep 17 00:00:00 2001 From: Tibor Král Date: Tue, 14 May 2019 12:19:44 +0200 Subject: HC2VPP-381: Validation support for V3PO module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If288d97dce15bcc6924d4dd65c640a20920f094d Signed-off-by: Tibor Král --- .../java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java') diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java index 3496fdd88..b13388102 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/GreCustomizer.java @@ -16,8 +16,6 @@ package io.fd.hc2vpp.v3po.interfaces; -import static com.google.common.base.Preconditions.checkArgument; - import io.fd.hc2vpp.common.translate.util.AbstractInterfaceTypeCustomizer; import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; @@ -125,15 +123,7 @@ public class GreCustomizer extends AbstractInterfaceTypeCustomizer implemen } private boolean isIpv6(final Gre gre) { - if (gre.getSrc().getIpv4AddressNoZone() == null) { - checkArgument(gre.getDst().getIpv4AddressNoZone() == null, "Inconsistent ip addresses: %s, %s", gre.getSrc(), - gre.getDst()); - return true; - } else { - checkArgument(gre.getDst().getIpv6AddressNoZone() == null, "Inconsistent ip addresses: %s, %s", gre.getSrc(), - gre.getDst()); - return false; - } + return gre.getSrc().getIpv4AddressNoZone() == null; } private void deleteGreTunnel(final InstanceIdentifier id, final String swIfName, final Gre gre, -- cgit 1.2.3-korg