From 140fe3d19adcc23dc2a819eb34dfd09b843e4eac Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 31 Jan 2018 14:39:29 +0100 Subject: HC2VPP-280: make next-hop optional for impose-and-forward Next hop address is not mandatory in VPP CLI, e.g. ip route add 192.0.2.11/32 via loop0 out-labels 3 Also hc2vpp-ietf-routing-types@2017-02-27.yang defines it as optional. Change-Id: I6bd63a3ac75d40b14ae553e128b7ebe43dee5118 Signed-off-by: Marek Gradzki (cherry picked from commit 710a7932be189a6bfc342b471efa1044f8a9798a) --- .../io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'mpls/impl/src/main/java/io/fd/hc2vpp/mpls/ImposeAndForwardWriter.java') 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 14053b63d..861ab9ddf 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 @@ -103,12 +103,15 @@ final class ImposeAndForwardWriter implements LspWriter, Ipv4Translator { private String translate(@Nonnull final SimplePath path, @Nonnull final IpAddDelRoute request) { final IpAddress nextHop = path.getNextHop(); - checkArgument(nextHop != null, "Configuring impose-and-forward, but next-hop is missing."); // TODO(HC2VPP-264): add support for mpls + v6 - final Ipv4Address address = nextHop.getIpv4Address(); - checkArgument(address != null, "Only IPv4 next-hop address is supported."); - request.nextHopAddress = ipv4AddressNoZoneToArray(address.getValue()); + if (nextHop != null) { + final Ipv4Address address = nextHop.getIpv4Address(); + checkArgument(address != null, "Only IPv4 next-hop address is supported."); + request.nextHopAddress = ipv4AddressNoZoneToArray(address.getValue()); + } else { + request.nextHopAddress = new byte[0]; + } final MplsLabel outgoingLabel = path.getOutgoingLabel(); checkArgument(outgoingLabel != null, "Configuring impose-and-forward, but outgoing-label is missing."); @@ -122,12 +125,15 @@ final class ImposeAndForwardWriter implements LspWriter, Ipv4Translator { 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(); - checkArgument(nextHop != null, "Configuring impose-and-forward, but next-hop is missing."); // TODO(HC2VPP-264): add support for mpls + v6 - final Ipv4Address address = nextHop.getIpv4Address(); - checkArgument(address != null, "Only IPv4 next-hop address is supported."); - request.nextHopAddress = ipv4AddressNoZoneToArray(address.getValue()); + if (nextHop != null) { + final Ipv4Address address = nextHop.getIpv4Address(); + checkArgument(address != null, "Only IPv4 next-hop address is supported."); + request.nextHopAddress = ipv4AddressNoZoneToArray(address.getValue()); + } else { + request.nextHopAddress = new byte[0]; + } final List labels = paths.getOutgoingLabels(); final int numberOfLabels = labels.size(); -- cgit 1.2.3-korg