Fix bugs after bumping to Fluorine ODL dependencies (HONEYCOMB-433)

Change-Id: I99b630f97144770849679a04efccaf7fc9868cb6
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>

24 files changed, 64 insertions, 66 deletions

diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv4RouteNamesFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv4RouteNamesFactory.java
index 1205ffa6b..996f781b6 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv4RouteNamesFactory.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv4RouteNamesFactory.java
@@ -79,8 +79,8 @@ public final class Ipv4RouteNamesFactory implements RouteMapper, RouteRequestPro
 
     public String uniqueRouteHopName(@Nonnull final NextHop hop) {
         return bindName(hop.getOutgoingInterface(),
-                        dotlessAddress(hop.getAugmentation(NextHop1.class).getNextHopAddress()),
-                        String.valueOf(hop.getAugmentation(VppIpv4NextHopAugmentation.class).getWeight()));
+                        dotlessAddress(hop.augmentation(NextHop1.class).getNextHopAddress()),
+                        String.valueOf(hop.augmentation(VppIpv4NextHopAugmentation.class).getWeight()));
     }
 
     public String uniqueRouteHopName(@Nonnull final FibPath path, @Nonnull final MappingContext mappingContext) {
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv6RouteNamesFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv6RouteNamesFactory.java
index 91370c7fd..297964418 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv6RouteNamesFactory.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/naming/Ipv6RouteNamesFactory.java
@@ -84,8 +84,8 @@ public final class Ipv6RouteNamesFactory implements RouteMapper, RouteRequestPro
 
     public String uniqueRouteHopName(@Nonnull final NextHop hop) {
         return bindName(hop.getOutgoingInterface(),
-                doubleDotlessAddress(hop.getAugmentation(NextHop1.class).getNextHopAddress()),
-                String.valueOf(hop.getAugmentation(VppIpv6NextHopAugmentation.class).getWeight()));
+                doubleDotlessAddress(hop.augmentation(NextHop1.class).getNextHopAddress()),
+                String.valueOf(hop.augmentation(VppIpv6NextHopAugmentation.class).getWeight()));
     }
 
     public String uniqueRouteHopName(@Nonnull final FibPath path, @Nonnull final MappingContext mappingContext) {
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java
index deb32d382..cf4909181 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/ControlPlaneProtocolCustomizer.java
@@ -125,7 +125,7 @@ final class ControlPlaneProtocolCustomizer
         final ControlPlaneProtocolKey key = instanceIdentifier.firstKeyOf(ControlPlaneProtocol.class);
         routingProtocolBuilder
             .setName(key.getName())
-            .setKey(key)
+            .withKey(key)
             .setType(Static.class)
             .addAugmentation(RoutingProtocolVppAttr.class, new RoutingProtocolVppAttrBuilder().setVppProtocolAttributes(
                 new VppProtocolAttributesBuilder()
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java
index 1c5665839..fcc2758a6 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv4RouteCustomizer.java
@@ -157,7 +157,7 @@ final class Ipv4RouteCustomizer
                 routeBuilder.setNextHop(
                         resolveHopType(mappedName, Arrays.asList(detail.path), interfaceContext, routeHopContext,
                                 readContext.getMappingContext(), namesFactory))
-                        .setKey(key)
+                        .withKey(key)
                         .setDestinationPrefix(toIpv4Prefix(detail.address, toJavaByte(detail.addressLength)))
                         .addAugmentation(VppIpv4RouteAttributesAugmentation.class,
                                          new VppIpv4RouteAttributesAugmentationBuilder()
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java
index 6003cf88b..daa3e29aa 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/read/Ipv6RouteCustomizer.java
@@ -154,7 +154,7 @@ final class Ipv6RouteCustomizer
                 routeBuilder.setNextHop(
                         resolveHopType(mappedName, Arrays.asList(detail.path), interfaceContext, routeHopContext,
                                 readContext.getMappingContext(), namesFactory))
-                        .setKey(key)
+                        .withKey(key)
                         .setDestinationPrefix(key.getDestinationPrefix())
                         .setDestinationPrefix(toIpv6Prefix(detail.address, toJavaByte(detail.addressLength)))
                         .addAugmentation(VppIpv6RouteAttributesAugmentation.class,
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizer.java
index 67a907326..6521845c8 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizer.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizer.java
@@ -50,7 +50,7 @@ final class ControlPlaneProtocolCustomizer
     }
 
     static Long extractTableId(final ControlPlaneProtocol protocol) {
-        final RoutingProtocolVppAttr vppAttr = protocol.getAugmentation(RoutingProtocolVppAttr.class);
+        final RoutingProtocolVppAttr vppAttr = protocol.augmentation(RoutingProtocolVppAttr.class);
 
         checkState(vppAttr != null && vppAttr.getVppProtocolAttributes() != null,
                 "Vpp routing protocol attributes not defined");
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/PrefixCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/PrefixCustomizer.java
index ee34ee9fa..cb8dcd040 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/PrefixCustomizer.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/PrefixCustomizer.java
@@ -88,7 +88,7 @@ final class PrefixCustomizer extends FutureJVppCustomizer
         if (isDelete) {
             request.isNo = 1;
         } else {
-            parseControlAdvPrefixes(request, prefix.getControlAdvPrefixes(), prefix.getAugmentation(
+            parseControlAdvPrefixes(request, prefix.getControlAdvPrefixes(), prefix.augmentation(
                 ControlAdvPrefixesVppAugmentation.class));
         }
         LOG.debug("Setting Prefix for interface {}(id={}): {}", ifcName, ifcIndex, request);
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizer.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizer.java
index 3d43afbd4..ff89e6a06 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizer.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizer.java
@@ -97,7 +97,7 @@ final class RouterAdvertisementsCustomizer extends FutureJVppCustomizer
         request.managed = booleanToByte(dataAfter.isManagedFlag());
         request.other = booleanToByte(dataAfter.isOtherConfigFlag());
         final Ipv6RouterAdvertisementsVppAugmentation vppAugmentation =
-            dataAfter.getAugmentation(Ipv6RouterAdvertisementsVppAugmentation.class);
+            dataAfter.augmentation(Ipv6RouterAdvertisementsVppAugmentation.class);
         if (vppAugmentation != null) {
             request.llOption = booleanToByte(vppAugmentation.isSuppressLinkLayer());
             request.sendUnicast = booleanToByte(vppAugmentation.isSendUnicast());
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java
index 62e4f4525..160b3c949 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/MultipathHopRequestFactory.java
@@ -61,8 +61,8 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement
                                                        @Nonnull final NextHop hop,
                                                        @Nonnull final MappingContext mappingContext) {
 
-        final VppIpv4Route routingAttributes = route.getAugmentation(VppIpv4RouteAttributesAugmentation.class) != null ?
-            route.getAugmentation(VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
+        final VppIpv4Route routingAttributes = route.augmentation(VppIpv4RouteAttributesAugmentation.class) != null ?
+            route.augmentation(VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
 
         final int nextHopInterfaceIndex =
                 getInterfaceNamingContext().getIndex(hop.getOutgoingInterface(), mappingContext);
@@ -72,8 +72,8 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement
             return getMultipathHopRequest(add,
                     route.getDestinationPrefix(),
                     nextHopInterfaceIndex,
-                    hop.getAugmentation(NextHop1.class).getNextHopAddress(),
-                    hop.getAugmentation(VppIpv4NextHopAugmentation.class).getWeight().byteValue(),
+                    hop.augmentation(NextHop1.class).getNextHopAddress(),
+                    hop.augmentation(VppIpv4NextHopAugmentation.class).getWeight().byteValue(),
                     getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext),
                     DEFAULT_VNI,
                     classifyTableIndex(routingAttributes.getClassifyTable(), getVppClassifierContextManager(),
@@ -83,8 +83,8 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement
             return getMultipathHopRequest(add,
                     route.getDestinationPrefix(),
                     nextHopInterfaceIndex,
-                    hop.getAugmentation(NextHop1.class).getNextHopAddress(),
-                    hop.getAugmentation(VppIpv4NextHopAugmentation.class).getWeight().byteValue(),
+                    hop.augmentation(NextHop1.class).getNextHopAddress(),
+                    hop.augmentation(VppIpv4NextHopAugmentation.class).getWeight().byteValue(),
                     getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext),
                     DEFAULT_VNI,
                     0,
@@ -97,8 +97,8 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement
                                                        @Nonnull final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.Route route,
                                                        @Nonnull final NextHop hop,
                                                        @Nonnull final MappingContext mappingContext) {
-        final VppIpv6Route routingAttributes = route.getAugmentation(VppIpv6RouteAttributesAugmentation.class) != null ?
-            route.getAugmentation(VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
+        final VppIpv6Route routingAttributes = route.augmentation(VppIpv6RouteAttributesAugmentation.class) != null ?
+            route.augmentation(VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
 
         final int nextHopInterfaceIndex =
                 getInterfaceNamingContext().getIndex(hop.getOutgoingInterface(), mappingContext);
@@ -108,8 +108,8 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement
             return getMultipathHopRequest(add,
                     route.getDestinationPrefix(),
                     nextHopInterfaceIndex,
-                    hop.getAugmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.NextHop1.class).getNextHopAddress(),
-                    hop.getAugmentation(VppIpv6NextHopAugmentation.class).getWeight().byteValue(),
+                    hop.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.NextHop1.class).getNextHopAddress(),
+                    hop.augmentation(VppIpv6NextHopAugmentation.class).getWeight().byteValue(),
                     getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext),
                     DEFAULT_VNI,
                     classifyTableIndex(routingAttributes.getClassifyTable(), getVppClassifierContextManager(),
@@ -119,8 +119,8 @@ public class MultipathHopRequestFactory extends BasicHopRequestFactory implement
             return getMultipathHopRequest(add,
                     route.getDestinationPrefix(),
                     nextHopInterfaceIndex,
-                    hop.getAugmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.NextHop1.class).getNextHopAddress(),
-                    hop.getAugmentation(VppIpv6NextHopAugmentation.class).getWeight().byteValue(),
+                    hop.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.NextHop1.class).getNextHopAddress(),
+                    hop.augmentation(VppIpv6NextHopAugmentation.class).getWeight().byteValue(),
                     getRoutingProtocolContext().getIndex(parentProtocolName, mappingContext),
                     DEFAULT_VNI,
                     0,
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactory.java
index 079c953a3..076d9acce 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactory.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactory.java
@@ -58,14 +58,14 @@ public class SimpleHopRequestFactory extends BasicHopRequestFactory implements R
                                                     @Nonnull final Route route,
                                                     @Nonnull final MappingContext mappingContext) {
         SimpleNextHop simpleNextHop = (SimpleNextHop) route.getNextHop().getNextHopOptions();
-        SimpleNextHop1 hop = simpleNextHop.getAugmentation(SimpleNextHop1.class);
+        SimpleNextHop1 hop = simpleNextHop.augmentation(SimpleNextHop1.class);
 
         final int nextHopInterfaceIndex =
                 getInterfaceNamingContext().getIndex(simpleNextHop.getOutgoingInterface(), mappingContext);
 
         final VppIpv4Route routingAttributes =
-            route.getAugmentation(VppIpv4RouteAttributesAugmentation.class) != null ?
-                route.getAugmentation(VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
+            route.augmentation(VppIpv4RouteAttributesAugmentation.class) != null ?
+                route.augmentation(VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
 
         if (routingAttributes != null &&
                 classifyTablePresent(routingAttributes.getClassifyTable(), getVppClassifierContextManager(),
@@ -97,12 +97,12 @@ public class SimpleHopRequestFactory extends BasicHopRequestFactory implements R
                                                     @Nonnull final MappingContext mappingContext) {
         SimpleNextHop simpleNextHop = (SimpleNextHop) route.getNextHop().getNextHopOptions();
         final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.SimpleNextHop1
-                hop = simpleNextHop.getAugmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.SimpleNextHop1.class);
+                hop = simpleNextHop.augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.route.next.hop.SimpleNextHop1.class);
         final int nextHopInterfaceIndex =
                 getInterfaceNamingContext().getIndex(simpleNextHop.getOutgoingInterface(), mappingContext);
 
         VppIpv6Route routingAttributes =
-            route.getAugmentation(VppIpv6RouteAttributesAugmentation.class) != null ? route.getAugmentation(
+            route.augmentation(VppIpv6RouteAttributesAugmentation.class) != null ? route.augmentation(
                 VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
 
         if (routingAttributes != null &&
diff --git a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/TableLookupRequestFactory.java b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/TableLookupRequestFactory.java
index 99b2b1f10..89b0bc3ea 100644
--- a/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/TableLookupRequestFactory.java
+++ b/routing/routing-impl/src/main/java/io/fd/hc2vpp/routing/write/factory/TableLookupRequestFactory.java
@@ -77,7 +77,7 @@ public class TableLookupRequestFactory extends BasicHopRequestFactory implements
         }
 
         VppIpv4Route vppIpv4Route =
-            route.getAugmentation(VppIpv4RouteAttributesAugmentation.class) != null ? route.getAugmentation(
+            route.augmentation(VppIpv4RouteAttributesAugmentation.class) != null ? route.augmentation(
                 VppIpv4RouteAttributesAugmentation.class).getVppIpv4Route() : null;
 
         final Optional<String> optClassifyTable = Optional.ofNullable(vppIpv4Route)
@@ -118,8 +118,8 @@ public class TableLookupRequestFactory extends BasicHopRequestFactory implements
                     String.format("Lookup table: %s not found for route: %s", secondaryTableId, route));
         }
 
-        VppIpv6Route vppIpv6Route = route.getAugmentation(VppIpv6RouteAttributesAugmentation.class) != null
-            ? route.getAugmentation(VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
+        VppIpv6Route vppIpv6Route = route.augmentation(VppIpv6RouteAttributesAugmentation.class) != null
+            ? route.augmentation(VppIpv6RouteAttributesAugmentation.class).getVppIpv6Route() : null;
 
         final Optional<String> optClassifyTable = Optional.ofNullable(vppIpv6Route)
                 .map(VppRouteAttributes::getClassifyTable);
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
index fa166cb44..052a7f2ec 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/helpers/RoutingRequestTestHelper.java
@@ -141,7 +141,7 @@ public interface RoutingRequestTestHelper extends ByteDataTranslator, FutureProd
     }
 
     default Route getIpv4RouteWithId(final StaticRoutes staticRoutes, final Ipv4Prefix id) {
-        return staticRoutes.getAugmentation(StaticRoutes1.class)
+        return staticRoutes.augmentation(StaticRoutes1.class)
                 .getIpv4()
                 .getRoute()
                 .stream()
@@ -155,13 +155,13 @@ public interface RoutingRequestTestHelper extends ByteDataTranslator, FutureProd
                 .cast(route.getNextHop().getNextHopOptions())
                 .getNextHopList().getNextHop()
                 .stream()
-                .filter(nextHop -> Integer.valueOf(nextHop.getKey().getIndex()) == id)
+                .filter(nextHop -> Integer.valueOf(nextHop.key().getIndex()) == id)
                 .collect(RWUtils.singleItemCollector());
     }
 
     default org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv6.Route getIpv6RouteWithId(
             final StaticRoutes staticRoutes, final Ipv6Prefix id) {
-        return staticRoutes.getAugmentation(
+        return staticRoutes.augmentation(
                 org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv6.unicast.routing.rev180313.StaticRoutes1.class)
                 .getIpv6()
                 .getRoute()
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())
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizerTest.java
index 8d49f810d..6cd0e2fd8 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizerTest.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/ControlPlaneProtocolCustomizerTest.java
@@ -113,10 +113,10 @@ public class ControlPlaneProtocolCustomizerTest extends WriterCustomizerTest {
         KeyedInstanceIdentifier<Table, TableKey> invalidVrfIidV6 =
                 FibManagementIIds.FM_FIB_TABLES.child(Table.class, invalidKeyV6);
         when(writeContext.readAfter(vrfIidV4)).thenReturn(Optional.of(
-                new TableBuilder().setKey(keyV4).setAddressFamily(keyV4.getAddressFamily())
+                new TableBuilder().withKey(keyV4).setAddressFamily(keyV4.getAddressFamily())
                         .setTableId(keyV4.getTableId()).setName("VRF-IPV4-1").build()));
         when(writeContext.readAfter(vrfIidV6)).thenReturn(Optional.of(
-                new TableBuilder().setKey(keyV6).setAddressFamily(keyV6.getAddressFamily())
+                new TableBuilder().withKey(keyV6).setAddressFamily(keyV6.getAddressFamily())
                         .setTableId(keyV6.getTableId()).setName("VRF-IPV6-1").build()));
         when(writeContext.readAfter(invalidVrfIidV4)).thenReturn(Optional.absent());
         when(writeContext.readAfter(invalidVrfIidV6)).thenReturn(Optional.absent());
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java
index 36e0aed6d..fbf1fd79f 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/Ipv4RouteCustomizerTest.java
@@ -63,7 +63,7 @@ public class Ipv4RouteCustomizerTest extends RouteCustomizerTest {
             SEC_TABLE_ID);
     private static final Table
             IPV4_TABLE = new TableBuilder().setName("VRF-IPV4-4")
-            .setKey(SEC_TABLE_KEY).setTableId(SEC_TABLE_KEY.getTableId())
+            .withKey(SEC_TABLE_KEY).setTableId(SEC_TABLE_KEY.getTableId())
             .setAddressFamily(SEC_TABLE_KEY.getAddressFamily()).build();
 
     private static final InstanceIdentifier<Route> ROUTE_IID = CONTROL_PROTOCOL_IID
@@ -127,7 +127,7 @@ public class Ipv4RouteCustomizerTest extends RouteCustomizerTest {
     @Test
     public void testWriteTableLookup() throws WriteFailedException {
         final Route route = new RouteBuilder()
-                .setKey(new RouteKey(new Ipv4Prefix("192.168.2.1/24")))
+                .withKey(new RouteKey(new Ipv4Prefix("192.168.2.1/24")))
                 .setDestinationPrefix(new Ipv4Prefix("192.168.2.1/24"))
                 .setNextHop(new NextHopBuilder().setNextHopOptions(
                     new TableLookupCaseBuilder()
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 0e724b874..77f25c541 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
@@ -57,7 +57,7 @@ public class Ipv6RouteCustomizerTest extends RouteCustomizerTest {
             SEC_TABLE_ID);
     private static final Table
             IPV6_TABLE = new TableBuilder().setName("VRF-IPV6-4")
-            .setKey(SEC_TABLE_KEY).setTableId(SEC_TABLE_KEY.getTableId())
+            .withKey(SEC_TABLE_KEY).setTableId(SEC_TABLE_KEY.getTableId())
             .setAddressFamily(SEC_TABLE_KEY.getAddressFamily()).build();
     private static final Ipv6Prefix IPV_6_PREFIX = new Ipv6Prefix("2001:0db8:0a0b:12f0:0000:0000:0000:0001/64");
     private static final Ipv6Prefix IPV_6_PREFIX_128 = new Ipv6Prefix("2001:0db8:0a0b:12f0:0000:0000:0000:0001/128");
@@ -127,7 +127,7 @@ public class Ipv6RouteCustomizerTest extends RouteCustomizerTest {
     @Test
     public void testWriteTableLookup() throws WriteFailedException {
         final Route route = new RouteBuilder()
-                .setKey(new RouteKey(IPV_6_PREFIX))
+                .withKey(new RouteKey(IPV_6_PREFIX))
                 .setDestinationPrefix(IPV_6_PREFIX)
                 .setNextHop(new NextHopBuilder().setNextHopOptions(new TableLookupCaseBuilder()
                         .setSecondaryVrf(new VniReference(4L))
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouteCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouteCustomizerTest.java
index ad1613f35..4e4a8822d 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouteCustomizerTest.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouteCustomizerTest.java
@@ -99,7 +99,7 @@ abstract class RouteCustomizerTest extends WriterCustomizerTest implements Routi
         whenAddRouteThenSuccess(api);
 
         when(writeContext.readAfter(CONTROL_PROTOCOL_IID)).thenReturn(Optional.of(new ControlPlaneProtocolBuilder()
-                .setKey(CONTROL_PLANE_PROTOCOL_KEY).setName(ROUTE_PROTOCOL_NAME).setType(Static.class)
+                .withKey(CONTROL_PLANE_PROTOCOL_KEY).setName(ROUTE_PROTOCOL_NAME).setType(Static.class)
                 .addAugmentation(RoutingProtocolVppAttr.class, new RoutingProtocolVppAttrBuilder()
                         .setVppProtocolAttributes(new VppProtocolAttributesBuilder()
                                 .setPrimaryVrf(new VniReference(TABLE_ID))
@@ -107,7 +107,7 @@ abstract class RouteCustomizerTest extends WriterCustomizerTest implements Routi
                 .build()));
 
         when(writeContext.readAfter(CONTROL_PROTOCOL_INVALID_IID)).thenReturn(Optional.of(
-                new ControlPlaneProtocolBuilder().setKey(CONTROL_PLANE_PROTOCOL_INVALID_KEY)
+                new ControlPlaneProtocolBuilder().withKey(CONTROL_PLANE_PROTOCOL_INVALID_KEY)
                         .setName(ROUTE_PROTOCOL_INVALID_NAME).setType(Static.class)
                         .addAugmentation(RoutingProtocolVppAttr.class, new RoutingProtocolVppAttrBuilder()
                                 .setVppProtocolAttributes(new VppProtocolAttributesBuilder()
@@ -115,10 +115,10 @@ abstract class RouteCustomizerTest extends WriterCustomizerTest implements Routi
                         .build()));
 
         when(writeContext.readAfter(TABLE_V4_IID)).thenReturn(Optional.of(
-                new TableBuilder().setKey(IPV4_TABLE_KEY).setAddressFamily(Ipv4.class)
+                new TableBuilder().withKey(IPV4_TABLE_KEY).setAddressFamily(Ipv4.class)
                         .setTableId(IPV4_TABLE_KEY.getTableId()).build()));
         when(writeContext.readAfter(TABLE_V6_IID)).thenReturn(Optional.of(
-                new TableBuilder().setKey(IPV6_TABLE_KEY).setAddressFamily(Ipv6.class)
+                new TableBuilder().withKey(IPV6_TABLE_KEY).setAddressFamily(Ipv6.class)
                         .setTableId(IPV6_TABLE_KEY.getTableId()).build()));
         when(writeContext.readAfter(INVALID_TABLE_V4_IID)).thenReturn(Optional.absent());
         when(writeContext.readAfter(INVALID_TABLE_V6_IID)).thenReturn(Optional.absent());
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java
index 7e92d1654..1bec72e19 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/RouterAdvertisementsCustomizerTest.java
@@ -107,9 +107,9 @@ public class RouterAdvertisementsCustomizerTest extends WriterCustomizerTest imp
     private static Ipv6RouterAdvertisements getRA(final Interfaces ifc) {
         return ifc.getInterface()
             .get(0)
-            .getAugmentation(Interface1.class)
+            .augmentation(Interface1.class)
             .getIpv6()
-            .getAugmentation(Ipv61.class)
+            .augmentation(Ipv61.class)
             .getIpv6RouterAdvertisements();
     }
 }
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java
index 6457feba2..5f3632b77 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv4Test.java
@@ -84,7 +84,7 @@ public class SimpleHopRequestFactoryIpv4Test
                     StaticRoutes ipv4StaticRouteWithoutClassifier) {
         final IpAddDelRoute request =
                 factory.createIpv4SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
-                        ipv4StaticRouteWithoutClassifier.getAugmentation(StaticRoutes1.class).getIpv4().getRoute()
+                        ipv4StaticRouteWithoutClassifier.augmentation(StaticRoutes1.class).getIpv4().getRoute()
                                 .get(0), mappingContext);
 
         assertEquals(
@@ -99,7 +99,7 @@ public class SimpleHopRequestFactoryIpv4Test
                     StaticRoutes ipv4StaticRouteWithoutRouteAttrs) {
         final IpAddDelRoute request =
                 factory.createIpv4SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
-                        ipv4StaticRouteWithoutRouteAttrs.getAugmentation(StaticRoutes1.class).getIpv4().getRoute()
+                        ipv4StaticRouteWithoutRouteAttrs.augmentation(StaticRoutes1.class).getIpv4().getRoute()
                                 .get(0), mappingContext);
 
         assertEquals(
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java
index eadb3995d..f0a2998e3 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SimpleHopRequestFactoryIpv6Test.java
@@ -70,7 +70,7 @@ public class SimpleHopRequestFactoryIpv6Test
                     StaticRoutes ipv6StaticRouteWithClassifier) {
         final IpAddDelRoute request =
                 factory.createIpv6SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
-                        ipv6StaticRouteWithClassifier.getAugmentation(StaticRoutes1.class).getIpv6().getRoute().get(0),
+                        ipv6StaticRouteWithClassifier.augmentation(StaticRoutes1.class).getIpv6().getRoute().get(0),
                         mappingContext);
 
         assertEquals(desiredFlaglessResult(0, 1, 0, Ipv6RouteData.FIRST_ADDRESS_AS_ARRAY, 64,
@@ -84,8 +84,7 @@ public class SimpleHopRequestFactoryIpv6Test
                     StaticRoutes ipv6StaticRouteWithoutClassifier) {
         final IpAddDelRoute request =
                 factory.createIpv6SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
-                        ipv6StaticRouteWithoutClassifier.getAugmentation(StaticRoutes1.class).getIpv6().getRoute()
-                                .get(0),
+                        ipv6StaticRouteWithoutClassifier.augmentation(StaticRoutes1.class).getIpv6().getRoute().get(0),
                         mappingContext);
 
         assertEquals(desiredFlaglessResult(0, 1, 0, Ipv6RouteData.FIRST_ADDRESS_AS_ARRAY, 64,
@@ -97,8 +96,7 @@ public class SimpleHopRequestFactoryIpv6Test
                                                       StaticRoutes ipv6StaticRouteWithoutRouteAttrs) {
         final IpAddDelRoute request =
                 factory.createIpv6SimpleHopRequest(false, ROUTE_PROTOCOL_NAME,
-                        ipv6StaticRouteWithoutRouteAttrs.getAugmentation(StaticRoutes1.class).getIpv6().getRoute()
-                                .get(0),
+                        ipv6StaticRouteWithoutRouteAttrs.augmentation(StaticRoutes1.class).getIpv6().getRoute().get(0),
                         mappingContext);
 
         assertEquals(desiredFlaglessResult(0, 1, 0, Ipv6RouteData.FIRST_ADDRESS_AS_ARRAY, 64,
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java
index bce1b5167..c8cffa7e5 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv4Test.java
@@ -132,7 +132,7 @@ public class SpecialNextHopRequestFactoryIpv4Test
     }
 
     private Route extractSingleRoute(final StaticRoutes staticRoutes, final Ipv4Prefix id) {
-        return staticRoutes.getAugmentation(StaticRoutes1.class).getIpv4().getRoute().stream()
+        return staticRoutes.augmentation(StaticRoutes1.class).getIpv4().getRoute().stream()
                 .filter(route -> route.getDestinationPrefix().getValue().equals(id.getValue()))
                 .collect(RWUtils.singleItemCollector());
     }
diff --git a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java
index 4e0a0efd5..9f435d21b 100644
--- a/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java
+++ b/routing/routing-impl/src/test/java/io/fd/hc2vpp/routing/write/factory/SpecialNextHopRequestFactoryIpv6Test.java
@@ -131,7 +131,7 @@ public class SpecialNextHopRequestFactoryIpv6Test
     }
 
     private Route extractSingleRoute(final StaticRoutes staticRoutes, final Ipv6Prefix id) {
-        return staticRoutes.getAugmentation(StaticRoutes1.class).getIpv6().getRoute().stream()
+        return staticRoutes.augmentation(StaticRoutes1.class).getIpv6().getRoute().stream()
                 .filter(route -> route.getDestinationPrefix().getValue().equals(id.getValue())).collect(
                         RWUtils.singleItemCollector());
     }