1 files changed, 30 insertions, 16 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 2ed0df12e..1205ffa6b 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
@@ -16,7 +16,6 @@
 
 package io.fd.hc2vpp.routing.naming;
 
-
 import io.fd.hc2vpp.common.translate.util.NamingContext;
 import io.fd.hc2vpp.routing.trait.RouteMapper;
 import io.fd.hc2vpp.routing.write.trait.RouteRequestProducer;
@@ -29,14 +28,16 @@ import java.util.Arrays;
 import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv4.unicast.routing.rev170917.routing.routing.instance.routing.protocols.routing.protocol._static.routes.ipv4.Route;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv4.unicast.routing.rev170917.routing.routing.instance.routing.protocols.routing.protocol._static.routes.ipv4.route.next.hop.options.next.hop.list.next.hop.list.NextHop;
-
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv4.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv4.Route;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipv4.unicast.routing.rev180313.routing.control.plane.protocols.control.plane.protocol._static.routes.ipv4.route.next.hop.NextHop1;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.rev180313.next.hop.content.next.hop.options.next.hop.list.next.hop.list.NextHop;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.vpp.ipv4.unicast.routing.rev180319.VppIpv4NextHopAugmentation;
 
 public final class Ipv4RouteNamesFactory implements RouteMapper, RouteRequestProducer {
 
     private static final String DOT = ".";
-    private static final String EMPTY = "";
+    private static final String DASH = "-";
+    private static final String UNDERSCORE = "_";
 
     private final NamingContext interfaceContext;
     private final NamingContext routingProtocolContext;
@@ -52,7 +53,7 @@ public final class Ipv4RouteNamesFactory implements RouteMapper, RouteRequestPro
      */
     public String uniqueRouteName(@Nonnull final String parentProtocolName, @Nonnull final Route route) {
         return bindName(parentProtocolName, dotlessAddress(route.getDestinationPrefix()),
-                String.valueOf(extractPrefix(route.getDestinationPrefix())));
+                        String.valueOf(extractPrefix(route.getDestinationPrefix())));
     }
 
     /**
@@ -60,22 +61,31 @@ public final class Ipv4RouteNamesFactory implements RouteMapper, RouteRequestPro
      */
     public String uniqueRouteName(@Nonnull final IpFibDetails details, @Nonnull final MappingContext mappingContext) {
         return bindName(routingProtocolContext.getName(details.tableId, mappingContext),
-                dotlessAddress(details.address),
-                String.valueOf(details.addressLength));
+                        dotlessAddress(details.address), String.valueOf(details.addressLength));
+    }
+
+    /**
+     * Construct unique name from provided parentProtocolName and {@code Ipv4Prefix}
+     */
+    public String uniqueRouteName(@Nonnull final String parentProtocolName, @Nonnull final Ipv4Prefix prefix) {
+        return bindName(parentProtocolName, dotlessAddress(prefix),
+                String.valueOf(Byte.toUnsignedInt(extractPrefix(prefix))));
     }
 
+    public Ipv4Prefix ipv4PrefixFromUniqueRouteName(@Nonnull final String uniqueName) {
+        String[] parts = uniqueName.split(UNDERSCORE);
+        return new Ipv4Prefix(dotted(parts[1]) + "/" + parts[2]);
+    }
 
     public String uniqueRouteHopName(@Nonnull final NextHop hop) {
         return bindName(hop.getOutgoingInterface(),
-                dotlessAddress(hop.getAddress()),
-                String.valueOf(hop.getWeight()));
+                        dotlessAddress(hop.getAugmentation(NextHop1.class).getNextHopAddress()),
+                        String.valueOf(hop.getAugmentation(VppIpv4NextHopAugmentation.class).getWeight()));
     }
 
-
-    public String uniqueRouteHopName(@Nonnull final FibPath path,
-                                     @Nonnull final MappingContext mappingContext) {
-        return bindName(interfaceContext.getName(path.swIfIndex, mappingContext),
-                dotlessAddress(path.nextHop), String.valueOf(path.weight));
+    public String uniqueRouteHopName(@Nonnull final FibPath path, @Nonnull final MappingContext mappingContext) {
+        return bindName(interfaceContext.getName(path.swIfIndex, mappingContext), dotlessAddress(path.nextHop),
+                        String.valueOf(path.weight));
     }
 
     private String dotlessAddress(final byte[] address) {
@@ -103,6 +113,10 @@ public final class Ipv4RouteNamesFactory implements RouteMapper, RouteRequestPro
     }
 
     private String dotless(@Nonnull final String input) {
-        return input.replace(DOT, EMPTY);
+        return input.replace(DOT, DASH);
+    }
+
+    private String dotted(@Nonnull final String input) {
+        return input.replace(DASH, DOT);
     }
 }