From 482e75efafbc43ec4c7e5a0516b688dee721fc27 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 27 Sep 2016 14:55:32 +0200 Subject: HONEYCOMB-180: mark read/write of ipv4 leaves unsupported Change-Id: Ifa774054646a59e39e4cc017df3be1e9e64233de Signed-off-by: Marek Gradzki --- .../translate/v3po/InterfacesWriterFactory.java | 2 +- .../v3po/interfaces/ip/Ipv4Customizer.java | 22 ++++++---------------- .../v3po/interfacesstate/ip/Ipv4Customizer.java | 3 +-- 3 files changed, 8 insertions(+), 19 deletions(-) (limited to 'v3po') 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 bb5ffb484..db089c0c2 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 @@ -126,7 +126,7 @@ public final class InterfacesWriterFactory implements WriterFactory { ifcId); // Ipv4(after interface) final InstanceIdentifier ipv4Id = ifc1AugId.child(Ipv4.class); - registry.addAfter(new GenericWriter<>(ipv4Id, new Ipv4Customizer(jvpp, ifcNamingContext)), + registry.addAfter(new GenericWriter<>(ipv4Id, new Ipv4Customizer(jvpp)), ifcId); // Address(after Ipv4) = final InstanceIdentifier
ipv4AddressId = ipv4Id.child(Address.class); diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Customizer.java index 1a9ed303a..0dca721ae 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfaces/ip/Ipv4Customizer.java @@ -18,11 +18,8 @@ package io.fd.honeycomb.translate.v3po.interfaces.ip; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.vpp.util.FutureJVppCustomizer; -import io.fd.honeycomb.translate.vpp.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; -import io.fd.honeycomb.translate.write.WriteFailedException; 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.ietf.params.xml.ns.yang.ietf.ip.rev140616.interfaces._interface.Ipv4; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.openvpp.jvpp.core.future.FutureJVppCore; @@ -32,35 +29,28 @@ import org.slf4j.LoggerFactory; public class Ipv4Customizer extends FutureJVppCustomizer implements WriterCustomizer { private static final Logger LOG = LoggerFactory.getLogger(Ipv4Customizer.class); - private final NamingContext interfaceContext; - public Ipv4Customizer(final FutureJVppCore vppApi, final NamingContext interfaceContext) { + public Ipv4Customizer(final FutureJVppCore vppApi) { super(vppApi); - this.interfaceContext = interfaceContext; } @Override public void writeCurrentAttributes(@Nonnull final InstanceIdentifier id, - @Nonnull final Ipv4 dataAfter, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - - //TODO - add subnet validation after HONEYCOMB-201 + @Nonnull final Ipv4 dataAfter, @Nonnull final WriteContext writeContext) { + LOG.debug("Handling Ipv4 leaves (mtu, forwarding) is not supported by VPP API. Ignoring configuration"); } @Override public void updateCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final Ipv4 dataBefore, @Nonnull final Ipv4 dataAfter, - @Nonnull final WriteContext writeContext) - throws WriteFailedException { - final String ifcName = id.firstKeyOf(Interface.class).getName(); - - // TODO handle update in a better way + @Nonnull final WriteContext writeContext) { + LOG.debug("Handling Ipv4 leaves (mtu, forwarding) is not supported by VPP API. Ignoring configuration"); } @Override public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final Ipv4 dataBefore, @Nonnull final WriteContext writeContext) { - // TODO HONEYCOMB-180 implement delete + LOG.debug("Handling Ipv4 leaves (mtu, forwarding) is not supported by VPP API. Ignoring configuration"); } } diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java index a14422d8e..6296d01cc 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/interfacesstate/ip/Ipv4Customizer.java @@ -53,8 +53,7 @@ public class Ipv4Customizer extends FutureJVppCustomizer implements ReaderCustom @Override public void readCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final Ipv4Builder builder, @Nonnull final ReadContext ctx) throws ReadFailedException { - //TODO HONEYCOMB-180 add reading of isForwarding flag when there is dump for it - LOG.warn("Operation not supported"); + LOG.debug("Reading Ipv4 leaves (mtu, forwarding) is not supported by VPP API"); } } -- cgit 1.2.3-korg