1 files changed, 0 insertions, 43 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java
index 30885fc1e..e498e0cae 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/InterfaceRoutingCustomizer.java
@@ -16,22 +16,14 @@
 
 package io.fd.hc2vpp.v3po.interfaces;
 
-import static com.google.common.base.Preconditions.checkState;
-
-import java.util.Optional;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.honeycomb.translate.spi.write.WriterCustomizer;
-import io.fd.honeycomb.translate.util.RWUtils;
 import io.fd.honeycomb.translate.write.WriteContext;
 import io.fd.honeycomb.translate.write.WriteFailedException;
 import io.fd.jvpp.core.future.FutureJVppCore;
-import java.util.List;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.v3po.rev190502.interfaces._interface.Routing;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev180220.interfaces.Interface;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ip.rev140616.Interface1;
-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.Ipv6;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class InterfaceRoutingCustomizer extends RoutingCustomizer
@@ -46,10 +38,6 @@ public class InterfaceRoutingCustomizer extends RoutingCustomizer
     public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Routing> id,
                                        @Nonnull final Routing dataAfter, @Nonnull final WriteContext writeContext)
             throws WriteFailedException {
-
-        checkState(isAddressNotPresentForInterface(id, writeContext, true),
-                "Cannot change routing configuration, if address is present for interface");
-
         final String ifName = id.firstKeyOf(Interface.class).getName();
         setRouting(id, ifName, dataAfter, writeContext);
     }
@@ -59,9 +47,6 @@ public class InterfaceRoutingCustomizer extends RoutingCustomizer
                                         @Nonnull final Routing dataBefore, @Nonnull final Routing dataAfter,
                                         @Nonnull final WriteContext writeContext)
             throws WriteFailedException {
-        checkState(isAddressNotPresentForInterface(id, writeContext, true),
-                "Cannot change routing configuration, if address is present for interface");
-
         final String ifName = id.firstKeyOf(Interface.class).getName();
         setRouting(id, ifName, dataAfter, writeContext);
     }
@@ -70,35 +55,7 @@ public class InterfaceRoutingCustomizer extends RoutingCustomizer
     public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Routing> id,
                                         @Nonnull final Routing dataBefore, @Nonnull final WriteContext writeContext)
             throws WriteFailedException {
-        checkState(isAddressNotPresentForInterface(id, writeContext, false),
-                "Cannot change routing configuration, if address is present for interface");
-
         final String ifName = id.firstKeyOf(Interface.class).getName();
         disableRouting(id, ifName, writeContext);
     }
-
-    /**
-     * Returns true if interface does not have v4/v6 addresses configured
-     */
-    private boolean isAddressNotPresentForInterface(@Nonnull final InstanceIdentifier<Routing> id,
-                                                    @Nonnull final WriteContext ctx,
-                                                    boolean checkBefore) {
-        final Optional<Interface> interfaceData = checkBefore
-                ? ctx.readBefore(RWUtils.cutId(id, Interface.class))
-                : ctx.readAfter(RWUtils.cutId(id, Interface.class));
-
-        if (interfaceData.isPresent()) {
-            final java.util.Optional<Interface1> augData = java.util.Optional.of(interfaceData.get())
-                    .map(iface -> iface.augmentation(Interface1.class));
-
-            final boolean v4NotPresent =
-                    augData.map(Interface1::getIpv4).map(Ipv4::getAddress).map(List::isEmpty).orElse(true);
-
-            final boolean v6NotPresent =
-                    augData.map(Interface1::getIpv6).map(Ipv6::getAddress).map(List::isEmpty).orElse(true);
-
-            return v4NotPresent && v6NotPresent;
-        }
-        return true;
-    }
 }