diff options
Diffstat (limited to 'routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read')
3 files changed, 12 insertions, 12 deletions
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java index 43ec73bd1..61338e1e6 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizerTest.java @@ -111,7 +111,7 @@ public class ControlPlaneProtocolCustomizerTest getCustomizer().readCurrentAttributes(identifier, builder, ctx); assertEquals(ROUTE_PROTOCOL_NAME, builder.getName()); - assertEquals(ROUTE_PROTOCOL_NAME, builder.getKey().getName()); + assertEquals(ROUTE_PROTOCOL_NAME, builder.key().getName()); assertEquals(Static.class, builder.getType()); } diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java index 0ba1fe576..f64fac7ca 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizerTest.java @@ -229,7 +229,7 @@ public class Ipv4RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou assertTrue(hopOptions instanceof SimpleNextHop); SimpleNextHop hop = SimpleNextHop.class.cast(hopOptions); - assertEquals("192.168.2.1", hop.getAugmentation(SimpleNextHop1.class).getNextHopAddress().getValue()); + assertEquals("192.168.2.1", hop.augmentation(SimpleNextHop1.class).getNextHopAddress().getValue()); assertEquals("iface-1", hop.getOutgoingInterface()); } @@ -255,10 +255,10 @@ public class Ipv4RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou private boolean areEqual(final NextHop first, final NextHop second) { return new EqualsBuilder() - .append(true, first.getAugmentation(NextHop1.class).getNextHopAddress().getValue() - .equals(second.getAugmentation(NextHop1.class).getNextHopAddress().getValue())) + .append(true, first.augmentation(NextHop1.class).getNextHopAddress().getValue() + .equals(second.augmentation(NextHop1.class).getNextHopAddress().getValue())) .append(true, first.getIndex().equals(second.getIndex())) - .append(true, first.getKey().equals(second.getKey())) + .append(true, first.key().equals(second.key())) .append(true, first.getOutgoingInterface().equals(second.getOutgoingInterface())) .isEquals(); } @@ -267,7 +267,7 @@ public class Ipv4RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou return new NextHopBuilder() .setOutgoingInterface(iface) .setIndex(id) - .setKey(new NextHopKey(id)) + .withKey(new NextHopKey(id)) .addAugmentation(VppIpv4NextHopAugmentation.class, new VppIpv4NextHopAugmentationBuilder().setWeight((short) weight).build()) .addAugmentation(NextHop1.class, new NextHop1Builder().setNextHopAddress(new Ipv4Address(address)).build()) diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java index fd2844bd6..0b606a54a 100644 --- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java +++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizerTest.java @@ -272,7 +272,7 @@ public class Ipv6RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou assertTrue(hopOptions instanceof SimpleNextHop); SimpleNextHop hop = SimpleNextHop.class.cast(hopOptions); - assertEquals("2001:db8:a0b:12f0::1", hop.getAugmentation(SimpleNextHop1.class) + assertEquals("2001:db8:a0b:12f0::1", hop.augmentation(SimpleNextHop1.class) .getNextHopAddress().getValue()); assertEquals("iface-1", hop.getOutgoingInterface()); } @@ -289,7 +289,7 @@ public class Ipv6RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou assertTrue(hopOptions instanceof SimpleNextHop); SimpleNextHop hop = SimpleNextHop.class.cast(hopOptions); - assertEquals("2001:db8:a0b:12f0::1", hop.getAugmentation(SimpleNextHop1.class) + assertEquals("2001:db8:a0b:12f0::1", hop.augmentation(SimpleNextHop1.class) .getNextHopAddress().getValue()); assertEquals("iface-1", hop.getOutgoingInterface()); } @@ -318,10 +318,10 @@ public class Ipv6RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou private boolean areEqual(final NextHop first, final NextHop second) { return new EqualsBuilder() - .append(true, first.getAugmentation(NextHop1.class).getNextHopAddress().getValue() - .equals(second.getAugmentation(NextHop1.class).getNextHopAddress().getValue())) + .append(true, first.augmentation(NextHop1.class).getNextHopAddress().getValue() + .equals(second.augmentation(NextHop1.class).getNextHopAddress().getValue())) .append(true, first.getIndex().equals(second.getIndex())) - .append(true, first.getKey().equals(second.getKey())) + .append(true, first.key().equals(second.key())) .append(true, first.getOutgoingInterface().equals(second.getOutgoingInterface())) .isEquals(); } @@ -330,7 +330,7 @@ public class Ipv6RouteCustomizerTest extends ListReaderCustomizerTest<Route, Rou return new NextHopBuilder() .setOutgoingInterface(iface) .setIndex(id) - .setKey(new NextHopKey(id)) + .withKey(new NextHopKey(id)) .addAugmentation(NextHop1.class, new NextHop1Builder().setNextHopAddress(new Ipv6Address(address)).build()) .addAugmentation(VppIpv6NextHopAugmentation.class, new VppIpv6NextHopAugmentationBuilder().setWeight((short) weight).build()) |