1 files changed, 30 insertions, 27 deletions
diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java
index 5e384305c..6a09b3eb7 100644
--- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java
+++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java
@@ -31,21 +31,22 @@ import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 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.mpls._static.rev170310.StaticLspConfig.Operation;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310._static.lsp.Config;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310._static.lsp_config.InSegment;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310._static.lsp_config.OutSegment;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310._static.lsp_config.in.segment.Type;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310._static.lsp_config.in.segment.type.IpPrefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310._static.lsp_config.out.segment.PathList;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310._static.lsp_config.out.segment.SimplePath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310._static.lsp_config.out.segment.path.list.Paths;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310.routing.mpls._static.lsps.StaticLsp;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.MplsOperationsType;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702._static.lsp.paths.OutSegment;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702._static.lsp.paths.out.segment.MultiplePaths;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702._static.lsp.paths.out.segment.SimplePath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702._static.lsp.paths.out.segment.multiple.paths.Paths;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702._static.lsp.top.Config;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.in.segment.InSegment;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.in.segment_config.Type;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.in.segment_config.type.IpPrefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.path.outgoing.labels.outgoing.labels.OutgoingLabels;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170702.routing.mpls._static.lsps.StaticLsp;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.routing.types.rev171204.MplsLabel;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**
- * Translates {@link Operation#ImposeAndForward ImposeAndForward} operation to ip_add_del_route API.
+ * Translates {@link MplsOperationsType#ImposeAndForward ImposeAndForward} operation to ip_add_del_route API.
  *
  * @see <a href="https://git.fd.io/vpp/tree/src/vnet/ip/ip.api">ip_add_del_route</a> definition
  */
@@ -66,7 +67,7 @@ final class ImposeAndForwardWriter implements LspWriter, Ipv4Translator, MplsLab
         request.isAdd = booleanToByte(isAdd);
 
         translate(config.getInSegment(), request);
-        translate(config.getOutSegment(), request, ctx);
+        translate(data.getOutSegment(), request, ctx);
 
         // default values based on inspecting VPP's CLI and make test code
         request.nextHopWeight = 1;
@@ -76,8 +77,9 @@ final class ImposeAndForwardWriter implements LspWriter, Ipv4Translator, MplsLab
     }
 
     private void translate(@Nonnull final InSegment inSegment, @Nonnull final IpAddDelRoute request) {
-        checkArgument(inSegment != null, "Configuring impose-and-forward, but in-segment is missing.");
-        final Type type = inSegment.getType();
+        checkArgument(inSegment.getConfig() != null,
+                "Configuring impose-and-forward, but in-segment config is missing.");
+        final Type type = inSegment.getConfig().getType();
         checkArgument(type instanceof IpPrefix, "Only ip-prefix type is supported, but %s given.", type);
 
         // TODO(HC2VPP-264): add support for mpls + v6
@@ -93,8 +95,8 @@ final class ImposeAndForwardWriter implements LspWriter, Ipv4Translator, MplsLab
         final String outgoingInterface;
         if (outSegment instanceof SimplePath) {
             outgoingInterface = translate((SimplePath) outSegment, request);
-        } else if (outSegment instanceof PathList) {
-            outgoingInterface = translate((PathList) outSegment, request);
+        } else if (outSegment instanceof MultiplePaths) {
+            outgoingInterface = translate((MultiplePaths) outSegment, request);
         } else {
             throw new IllegalArgumentException("Unsupported out-segment type: " + outSegment);
         }
@@ -104,7 +106,7 @@ final class ImposeAndForwardWriter implements LspWriter, Ipv4Translator, MplsLab
     }
 
     private String translate(@Nonnull final SimplePath path, @Nonnull final IpAddDelRoute request) {
-        final IpAddress nextHop = path.getNextHop();
+        final IpAddress nextHop = path.getSimplePath().getConfig().getNextHop();
 
         // TODO(HC2VPP-264): add support for mpls + v6
         if (nextHop != null) {
@@ -115,18 +117,19 @@ final class ImposeAndForwardWriter implements LspWriter, Ipv4Translator, MplsLab
             request.nextHopAddress = new byte[0];
         }
 
-        final MplsLabel outgoingLabel = path.getOutgoingLabel();
+        final MplsLabel outgoingLabel = path.getSimplePath().getConfig().getOutgoingLabel();
         checkArgument(outgoingLabel != null, "Configuring impose-and-forward, but outgoing-label is missing.");
         request.nextHopOutLabelStack = new FibMplsLabel[] {translate(outgoingLabel.getValue())};
         request.nextHopNOutLabels = 1;
 
-        return path.getOutgoingInterface();
+        return path.getSimplePath().getConfig().getOutgoingInterface();
     }
 
-    private String translate(@Nonnull final PathList pathList, @Nonnull final IpAddDelRoute request) {
-        checkArgument(pathList.getPaths() != null && pathList.getPaths().size() == 1, "Only single path is supported");
-        final Paths paths = pathList.getPaths().get(0);
-        final IpAddress nextHop = paths.getNextHop();
+    private String translate(@Nonnull final MultiplePaths pathList, @Nonnull final IpAddDelRoute request) {
+        checkArgument(pathList.getPaths() != null && pathList.getPaths().getPath().size() == 1,
+                      "Only single path is supported");
+        final Paths paths = pathList.getPaths();
+        final IpAddress nextHop = paths.getPath().get(0).getConfig().getNextHop();
 
         // TODO(HC2VPP-264): add support for mpls + v6
         if (nextHop != null) {
@@ -137,14 +140,14 @@ final class ImposeAndForwardWriter implements LspWriter, Ipv4Translator, MplsLab
             request.nextHopAddress = new byte[0];
         }
 
-        final List<MplsLabel> labels = paths.getOutgoingLabels();
+        final List<OutgoingLabels> labels = paths.getOutgoingLabels().getOutgoingLabels();
         final int numberOfLabels = labels.size();
         checkArgument(numberOfLabels > 0 && numberOfLabels < MAX_LABELS, "Number of labels (%s) not in range (0, %s].",
             numberOfLabels, MAX_LABELS, numberOfLabels);
         request.nextHopNOutLabels = (byte) numberOfLabels;
-        request.nextHopOutLabelStack =
-            labels.stream().map(label -> translate(label.getValue())).toArray(FibMplsLabel[]::new);
+        request.nextHopOutLabelStack = labels.stream().map(label -> translate(label.getConfig().getLabel().getValue()))
+                .toArray(FibMplsLabel[]::new);
 
-        return paths.getOutgoingInterface();
+        return paths.getPath().get(0).getConfig().getOutgoingInterface();
     }
 }