From b8cf23cd61c2d3f57f9450570236534bce69232e Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Tue, 15 Aug 2017 11:30:28 +0200 Subject: HONEYCOMB-386 - Hc2vpp Customizers update Utilizes new default update implementation Change-Id: I9bf8473336274ba5fcfc18804f7b414937b3708e Signed-off-by: Jan Srnicek --- .../io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java | 9 --------- .../io/fd/hc2vpp/routing/write/RoutingCustomizer.java | 7 ------- .../hc2vpp/routing/write/RoutingInstanceCustomizer.java | 9 --------- .../hc2vpp/routing/write/RoutingProtocolCustomizer.java | 9 --------- .../hc2vpp/routing/write/Ipv6RouteCustomizerTest.java | 17 ++++------------- .../routing/write/RoutingInstanceCustomizerTest.java | 12 ++---------- .../routing/write/RoutingProtocolCustomizerTest.java | 10 ++-------- 7 files changed, 8 insertions(+), 65 deletions(-) (limited to 'routing/routing-impl') diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java index 9d87a5bea..b8d34edc7 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizer.java @@ -101,15 +101,6 @@ public class Ipv6RouteCustomizer extends FutureJVppCustomizer routesContext.addName(routeName, writeContext.getMappingContext()); } - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier instanceIdentifier, - @Nonnull final Route route, - @Nonnull final Route d1, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - throw new WriteFailedException(instanceIdentifier, - new UnsupportedOperationException("Operation not supported")); - } - @Override public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier instanceIdentifier, @Nonnull final Route route, diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingCustomizer.java index bd50ce77b..0e99aeead 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingCustomizer.java @@ -39,13 +39,6 @@ public class RoutingCustomizer implements WriterCustomizer { LOG.debug("Writing {}", instanceIdentifier); } - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier instanceIdentifier, - @Nonnull final Routing before, @Nonnull final Routing after, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - LOG.debug("Updating {} to {}", instanceIdentifier, after); - } - @Override public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier instanceIdentifier, @Nonnull final Routing routing, @Nonnull final WriteContext writeContext) diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizer.java index fa6885d5d..7d63647e0 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizer.java @@ -46,15 +46,6 @@ public class RoutingInstanceCustomizer implements ListWriterCustomizer id, - @Nonnull final RoutingInstance dataBefore, - @Nonnull final RoutingInstance dataAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter, - new UnsupportedOperationException("Operation not supported")); - } - @Override public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier id, @Nonnull final RoutingInstance dataBefore, diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java index 69b8e509e..d79f9d666 100644 --- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java +++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizer.java @@ -71,15 +71,6 @@ public class RoutingProtocolCustomizer } } - @Override - public void updateCurrentAttributes(@Nonnull final InstanceIdentifier instanceIdentifier, - @Nonnull final RoutingProtocol routingProtocolBefore, - @Nonnull final RoutingProtocol routingProtocolAfter, - @Nonnull final WriteContext writeContext) throws WriteFailedException { - throw new WriteFailedException.UpdateFailedException(instanceIdentifier, routingProtocolBefore, - routingProtocolAfter, new UnsupportedOperationException("Operation not supported")); - } - @Override public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier instanceIdentifier, @Nonnull final RoutingProtocol routingProtocol, diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java index dc932cd0f..8a52b8cc6 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv6RouteCustomizerTest.java @@ -18,8 +18,6 @@ package io.fd.hc2vpp.routing.write; import static io.fd.hc2vpp.routing.helpers.InterfaceTestHelper.INTERFACE_INDEX; import static io.fd.hc2vpp.routing.helpers.InterfaceTestHelper.INTERFACE_NAME; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; @@ -119,17 +117,10 @@ public class Ipv6RouteCustomizerTest extends WriterCustomizerTest requestCaptor); } - @Test - public void testUpdate() { - try { - customizer.updateCurrentAttributes(validId, Ipv6RouteData.IPV6_ROUTE_WITH_CLASSIFIER_BLACKHOLE_HOP, - Ipv6RouteData.IPV6_ROUTE_WITH_CLASSIFIER_RECEIVE_HOP, writeContext); - } catch (WriteFailedException e) { - assertTrue(e.getCause() instanceof UnsupportedOperationException); - verifyNotInvoked(api); - return; - } - fail("Test should have thrown exception"); + @Test(expected = UnsupportedOperationException.class) + public void testUpdate() throws WriteFailedException { + customizer.updateCurrentAttributes(validId, Ipv6RouteData.IPV6_ROUTE_WITH_CLASSIFIER_BLACKHOLE_HOP, + Ipv6RouteData.IPV6_ROUTE_WITH_CLASSIFIER_RECEIVE_HOP, writeContext); } @Test diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizerTest.java index 68fcba5ac..2e073d726 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingInstanceCustomizerTest.java @@ -15,13 +15,11 @@ */ package io.fd.hc2vpp.routing.write; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.routing.RoutingConfiguration; -import io.fd.honeycomb.translate.write.WriteFailedException; import org.junit.Test; import org.mockito.Mock; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev140524.routing.RoutingInstance; @@ -67,15 +65,9 @@ public class RoutingInstanceCustomizerTest extends WriterCustomizerTest { customizer.writeCurrentAttributes(id, invalidData, writeContext); } - @Test + @Test(expected = UnsupportedOperationException.class) public void updateCurrentAttributes() throws Exception { - try { - customizer.updateCurrentAttributes(id, validData, validData, writeContext); - } catch (WriteFailedException.UpdateFailedException e) { - assertTrue(e.getCause() instanceof UnsupportedOperationException); - return; - } - fail("Test should throw WriteFailedException.UpdateFailedException"); + customizer.updateCurrentAttributes(id, validData, validData, writeContext); } @Test diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizerTest.java index 21a2bdc14..6174f8473 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RoutingProtocolCustomizerTest.java @@ -125,14 +125,8 @@ public class RoutingProtocolCustomizerTest extends WriterCustomizerTest { fail("Test should have thrown exception"); } - @Test + @Test(expected = UnsupportedOperationException.class) public void testUpdate() throws WriteFailedException { - try { - customizer.updateCurrentAttributes(validId, validData, validData, writeContext); - } catch (Exception e) { - assertTrue(e.getCause() instanceof UnsupportedOperationException); - return; - } - fail("Test should have thrown exception"); + customizer.updateCurrentAttributes(validId, validData, validData, writeContext); } } -- cgit 1.2.3-korg