summaryrefslogtreecommitdiffstats
path: root/lisp/lisp2vpp/src/main/java
diff options
context:
space:
mode:
authorJan Srnicek <jsrnicek@cisco.com>2017-06-16 08:32:59 +0200
committerMarek Gradzki <mgradzki@cisco.com>2017-06-19 05:36:32 +0000
commit71b28394e5024ecc87c2a8dc5adbabd812cae740 (patch)
tree9d0efe4d8dddf1acd32c2930369f63c2a6be1110 /lisp/lisp2vpp/src/main/java
parent351c2a3f03c1bea10030dfce99d0a2a9cba72bb6 (diff)
HC2VPP-168 - Gpe native entries support(write only)
requires https://gerrit.fd.io/r/#/c/7168 to be merged Change-Id: I5b734af662e651df5753f64f14b6b44d863ecbe8 Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'lisp/lisp2vpp/src/main/java')
-rw-r--r--lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java18
-rw-r--r--lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizer.java110
-rw-r--r--lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java101
3 files changed, 227 insertions, 2 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java
index ae5db0269..18bea7c9d 100644
--- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/GpeWriterFactory.java
@@ -32,6 +32,9 @@ import javax.annotation.Nonnull;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.Gpe;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTables;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPath;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.GpeEntryTable;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.gpe.entry.table.GpeEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.gpe.entry.table.gpe.entry.LocalEid;
@@ -52,7 +55,7 @@ public class GpeWriterFactory implements WriterFactory {
GPE_FEATURE_ID = GPE_ID.child(GpeFeatureData.class);
private static final InstanceIdentifier<GpeEntry>
GPE_ENTRY_ID = GPE_FEATURE_ID.child(GpeEntryTable.class).child(GpeEntry.class);
- public static final InstanceIdentifier<Interface>
+ private static final InstanceIdentifier<Interface>
IFC_ID = InstanceIdentifier.create(Interfaces.class).child(Interface.class);
@Inject
@@ -69,6 +72,10 @@ public class GpeWriterFactory implements WriterFactory {
@Named(GpeModule.GPE_TO_LOCATOR_PAIR_CTX)
private GpeLocatorPairMappingContext gpeLocatorPairMappingContext;
+ @Inject
+ @Named("interface-context")
+ private NamingContext interfaceContext;
+
@Override
public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) {
@@ -92,6 +99,13 @@ public class GpeWriterFactory implements WriterFactory {
IFC_ID.augmentation(SubinterfaceAugmentation.class).child(SubInterfaces.class)
.child(SubInterface.class));
-
+ final InstanceIdentifier<NativeForwardPathsTable> nativeEntryTableId =
+ InstanceIdentifier.create(NativeForwardPathsTables.class).child(NativeForwardPathsTable.class);
+ // gpe_add_del_iface is used to create fib table, so must be written before interfaces, to ensure
+ // byproduct iface is created before there's an attempt to set its flags
+ registry.addBefore(new GenericListWriter<>(nativeEntryTableId, new NativeForwardPathsTableCustomizer(api)),
+ IFC_ID);
+ registry.add(new GenericListWriter<>(nativeEntryTableId.child(NativeForwardPath.class),
+ new NativeForwardPathCustomizer(api, interfaceContext)));
}
}
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizer.java
new file mode 100644
index 000000000..0dcb434e4
--- /dev/null
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathCustomizer.java
@@ -0,0 +1,110 @@
+/*
+ * 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.lisp.gpe.translate.write;
+
+import static io.fd.hc2vpp.lisp.gpe.translate.write.NativeForwardPathsTableCustomizer.tableId;
+
+import io.fd.hc2vpp.common.translate.util.AddressTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.honeycomb.translate.MappingContext;
+import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
+import io.fd.honeycomb.translate.write.WriteContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.vpp.jvpp.core.dto.GpeAddDelNativeFwdRpath;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import java.util.Optional;
+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.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPath;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPathKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
+public class NativeForwardPathCustomizer extends FutureJVppCustomizer
+ implements ListWriterCustomizer<NativeForwardPath, NativeForwardPathKey>, AddressTranslator, JvppReplyConsumer {
+
+ private final NamingContext interfaceContext;
+
+ public NativeForwardPathCustomizer(@Nonnull final FutureJVppCore futureJVppCore,
+ @Nonnull final NamingContext interfaceContext) {
+ super(futureJVppCore);
+ this.interfaceContext = interfaceContext;
+ }
+
+ @Override
+ public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<NativeForwardPath> id,
+ @Nonnull final NativeForwardPath dataAfter,
+ @Nonnull final WriteContext writeContext)
+ throws WriteFailedException {
+ createNativePath(id, dataAfter, writeContext);
+ }
+
+
+ @Override
+ public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<NativeForwardPath> id,
+ @Nonnull final NativeForwardPath dataBefore,
+ @Nonnull final NativeForwardPath dataAfter,
+ @Nonnull final WriteContext writeContext) throws WriteFailedException {
+ deleteNativePath(id, dataBefore, writeContext);
+ createNativePath(id, dataAfter, writeContext);
+ }
+
+ @Override
+ public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<NativeForwardPath> id,
+ @Nonnull final NativeForwardPath dataBefore,
+ @Nonnull final WriteContext writeContext)
+ throws WriteFailedException {
+ deleteNativePath(id, dataBefore, writeContext);
+ }
+
+ private GpeAddDelNativeFwdRpath getRequest(final boolean isAdd,
+ final int tableId,
+ final NativeForwardPath data,
+ final MappingContext mappingContext) {
+ GpeAddDelNativeFwdRpath request = new GpeAddDelNativeFwdRpath();
+
+ final IpAddress nextHopAddress = data.getNextHopAddress();
+
+ request.tableId = tableId;
+ request.isAdd = booleanToByte(isAdd);
+ request.isIp4 = booleanToByte(!isIpv6(nextHopAddress));
+ request.nhAddr = ipAddressToArray(nextHopAddress);
+ request.nhSwIfIndex = Optional.ofNullable(data.getNextHopInterface())
+ .map(String::trim)
+ .map(ifaceName -> interfaceContext.getIndex(ifaceName, mappingContext))
+ .orElse(~0);
+
+ return request;
+ }
+
+ private void createNativePath(final InstanceIdentifier<NativeForwardPath> id,
+ final NativeForwardPath data,
+ final WriteContext ctx) throws WriteFailedException {
+ getReplyForCreate(getFutureJVpp()
+ .gpeAddDelNativeFwdRpath(getRequest(true, tableId(id), data, ctx.getMappingContext()))
+ .toCompletableFuture(), id, data);
+ }
+
+ private void deleteNativePath(final InstanceIdentifier<NativeForwardPath> id,
+ final NativeForwardPath data,
+ final WriteContext ctx) throws WriteFailedException {
+ getReplyForDelete(getFutureJVpp()
+ .gpeAddDelNativeFwdRpath(getRequest(false, tableId(id), data, ctx.getMappingContext()))
+ .toCompletableFuture(), id);
+ }
+}
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java
new file mode 100644
index 000000000..a9030a7c4
--- /dev/null
+++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/write/NativeForwardPathsTableCustomizer.java
@@ -0,0 +1,101 @@
+/*
+ * 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.lisp.gpe.translate.write;
+
+import io.fd.hc2vpp.common.translate.util.ByteDataTranslator;
+import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer;
+import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer;
+import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer;
+import io.fd.honeycomb.translate.write.WriteContext;
+import io.fd.honeycomb.translate.write.WriteFailedException;
+import io.fd.vpp.jvpp.core.dto.GpeAddDelIface;
+import io.fd.vpp.jvpp.core.future.FutureJVppCore;
+import javax.annotation.Nonnull;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTable;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTableKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Uses api to create gpe interfaces, which creates fib table as by-product.
+ * There is currently no other lisp-specific way to define fib table, as native paths expects existing table id
+ */
+public class NativeForwardPathsTableCustomizer extends FutureJVppCustomizer
+ implements ListWriterCustomizer<NativeForwardPathsTable, NativeForwardPathsTableKey>, ByteDataTranslator,
+ JvppReplyConsumer {
+
+ private static final Logger LOG = LoggerFactory.getLogger(NativeForwardPathsTableCustomizer.class);
+
+ public NativeForwardPathsTableCustomizer(@Nonnull final FutureJVppCore futureJVppCore) {
+ super(futureJVppCore);
+ }
+
+ @Override
+ public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<NativeForwardPathsTable> id,
+ @Nonnull final NativeForwardPathsTable dataAfter,
+ @Nonnull final WriteContext writeContext)
+ throws WriteFailedException {
+ createFibTable(id, dataAfter);
+ }
+
+
+ @Override
+ public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<NativeForwardPathsTable> id,
+ @Nonnull final NativeForwardPathsTable dataBefore,
+ @Nonnull final NativeForwardPathsTable dataAfter,
+ @Nonnull final WriteContext writeContext)
+ throws WriteFailedException {
+ // not sure if update makes sense, but just in case
+ deleteFibTable(id);
+ createFibTable(id, dataAfter);
+ }
+
+ @Override
+ public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<NativeForwardPathsTable> id,
+ @Nonnull final NativeForwardPathsTable dataBefore,
+ @Nonnull final WriteContext writeContext)
+ throws WriteFailedException {
+ deleteFibTable(id);
+ }
+
+ private void createFibTable(final InstanceIdentifier<NativeForwardPathsTable> id,
+ final NativeForwardPathsTable data) throws WriteFailedException {
+ getReplyForCreate(getFutureJVpp().gpeAddDelIface(getRequest(true, id)).toCompletableFuture(), id, data);
+ }
+
+ private void deleteFibTable(final InstanceIdentifier<NativeForwardPathsTable> id) throws WriteFailedException {
+ getReplyForDelete(getFutureJVpp().gpeAddDelIface(getRequest(false, id)).toCompletableFuture(), id);
+ }
+
+ /**
+ * Maps dpTable and vni to tableId,this also allows to dump lisp specific tables by dumping vni's
+ */
+ private GpeAddDelIface getRequest(final boolean add, final InstanceIdentifier<NativeForwardPathsTable> id) {
+ GpeAddDelIface request = new GpeAddDelIface();
+ request.isL2 = 0;
+ // expects reversed order
+ request.dpTable = tableId(id);
+ request.vni = request.dpTable; // vni must be unique for every table
+ request.isAdd = booleanToByte(add);
+ return request;
+ }
+
+ static int tableId(final InstanceIdentifier<?> id) {
+ return id.firstKeyOf(NativeForwardPathsTable.class).getTableId().intValue();
+ }
+}