diff options
author | 2017-11-22 14:02:58 +0100 | |
---|---|---|
committer | 2017-11-23 12:17:34 +0000 | |
commit | 1715b92455356a52e01ff5c4f2a42fe5336b9088 (patch) | |
tree | 11ca6a495bb77cef44f7dbdb65f47ce4a9e0cb61 /mpls/impl/src/main/java/io | |
parent | 69a47bd63d00230a6eb80da1e6358865e2f62a9a (diff) |
HC2VPP-259: add support for ipv4 lookup
Change-Id: Ic6a2da08a8839bb42366b124737bb5243671815b
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'mpls/impl/src/main/java/io')
-rw-r--r-- | mpls/impl/src/main/java/io/fd/hc2vpp/mpls/Ipv4LookupWriter.java | 92 | ||||
-rw-r--r-- | mpls/impl/src/main/java/io/fd/hc2vpp/mpls/StaticLspCustomizer.java | 6 |
2 files changed, 97 insertions, 1 deletions
diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/Ipv4LookupWriter.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/Ipv4LookupWriter.java new file mode 100644 index 000000000..7ac164a96 --- /dev/null +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/Ipv4LookupWriter.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2017 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.fd.hc2vpp.mpls; + +import static com.google.common.base.Preconditions.checkArgument; + +import io.fd.honeycomb.translate.MappingContext; +import io.fd.honeycomb.translate.write.WriteFailedException; +import io.fd.vpp.jvpp.core.dto.MplsRouteAddDel; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import javax.annotation.Nonnull; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.mpls._static.rev170310.StaticLspConfig; +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.in.segment.type.MplsLabel; +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.opendaylight.params.xml.ns.yang.vpp.mpls.rev171120.LookupType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vpp.mpls.rev171120.StaticLspVppLookupAugmentation; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +/** + * Translates {@link StaticLspConfig.Operation#PopAndLookup} operation with {@link LookupType#Ipv4} to + * mpls_route_add_del API. + * + * @see <a href="https://git.fd.io/vpp/tree/src/vnet/mpls/mpls.api">mpls_route_add_del</a> definition + */ +final class Ipv4LookupWriter implements LspWriter { + private static final byte IPV4_PROTOCOL = (byte) LookupType.Ipv4.getIntValue(); + + private final FutureJVppCore vppApi; + + Ipv4LookupWriter(@Nonnull final FutureJVppCore vppApi) { + this.vppApi = vppApi; + } + + @Override + public void write(@Nonnull final InstanceIdentifier<StaticLsp> id, @Nonnull final StaticLsp data, + @Nonnull final MappingContext ctx, final boolean isAdd) throws WriteFailedException { + final Config config = data.getConfig(); + final MplsRouteAddDel request = new MplsRouteAddDel(); + + request.mrIsAdd = booleanToByte(isAdd); + + translate(request, config); + translate(request, config.getAugmentation(StaticLspVppLookupAugmentation.class)); + + // default values based on inspecting VPP's CLI and make test code + request.mrClassifyTableIndex = -1; + request.mrNextHopProto = IPV4_PROTOCOL; + request.mrNextHopWeight = 1; + request.mrNextHop = new byte[0]; // no next hop since we POP + request.mrNextHopOutLabelStack = new int[0]; // no new labels + request.mrNextHopSwIfIndex = -1; + request.mrNextHopViaLabel = MPLS_LABEL_INVALID; + + getReplyForWrite(vppApi.mplsRouteAddDel(request).toCompletableFuture(), id); + } + + private void translate(@Nonnull final MplsRouteAddDel request, @Nonnull final Config config) { + final InSegment inSegment = config.getInSegment(); + checkArgument(inSegment != null, "Configuring ipv4 pop-and-lookup, but in-segment is missing."); + + checkArgument(inSegment.getType() instanceof MplsLabel, "Expecting mpls-label in-segment type, but %s given.", + inSegment.getType()); + final Long label = ((MplsLabel) inSegment.getType()).getIncomingLabel().getValue(); + request.mrLabel = label.intValue(); + } + + private void translate(@Nonnull final MplsRouteAddDel request, + @Nonnull final StaticLspVppLookupAugmentation vppLabelLookup) { + // IPv4 lookup should only happen if there is no more labels to process, so setting the EOS bit: + request.mrEos = 1; + final Long lookupInTable = vppLabelLookup.getLabelLookup().getIp4LookupInTable(); + checkArgument(lookupInTable != null, + "Configuring pop and ipv4 lookup, but ipv4 lookup table was not given"); + request.mrNextHopTableId = lookupInTable.intValue(); + } +} diff --git a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/StaticLspCustomizer.java b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/StaticLspCustomizer.java index b9e48cd60..54653b9c1 100644 --- a/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/StaticLspCustomizer.java +++ b/mpls/impl/src/main/java/io/fd/hc2vpp/mpls/StaticLspCustomizer.java @@ -46,12 +46,14 @@ final class StaticLspCustomizer implements ListWriterCustomizer<StaticLsp, Stati private static final Logger LOG = LoggerFactory.getLogger(StaticLspCustomizer.class); private final ImposeAndForwardWriter imposeAndForward; private final MplsLookupWriter mplsLookup; + private final Ipv4LookupWriter ipv4Lookup; StaticLspCustomizer(@Nonnull final FutureJVppCore vppApi, @Nonnull NamingContext interfaceContext) { checkNotNull(vppApi, "vppApi should not be null"); checkNotNull(interfaceContext, "interfaceContext should not be null"); this.imposeAndForward = new ImposeAndForwardWriter(vppApi, interfaceContext); this.mplsLookup = new MplsLookupWriter(vppApi); + this.ipv4Lookup = new Ipv4LookupWriter(vppApi); } @Override @@ -85,7 +87,9 @@ final class StaticLspCustomizer implements ListWriterCustomizer<StaticLsp, Stati checkArgument(vppAttributes != null && vppAttributes.getLabelLookup() != null, "Configuring pop-and-lookup operation but label-lookup leaf is missing"); final LookupType type = vppAttributes.getLabelLookup().getType(); - if (LookupType.Mpls.equals(type)) { + if (LookupType.Ipv4.equals(type)) { + ipv4Lookup.write(id, data, ctx, isAdd); + } else if (LookupType.Mpls.equals(type)) { mplsLookup.write(id, data, ctx, isAdd); } else { throw new IllegalArgumentException("Unsupported lookup type: " + type); |