From d9307b4011b14fe9fbb94ceee98f47c327a7919c Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Mon, 19 Jun 2017 12:37:56 +0200 Subject: HC2VPP-168 - Gpe native entries support(operational read) Change-Id: I50155013874a9e69d926a48a212d402e93945d9b Signed-off-by: Jan Srnicek --- .../lisp/gpe/translate/read/GpeReaderFactory.java | 18 ++ .../read/NativeForwardPathCustomizer.java | 182 +++++++++++++++++++++ .../read/NativeForwardPathsTableCustomizer.java | 160 ++++++++++++++++++ .../lisp/translate/read/MapResolverCustomizer.java | 6 - .../read/NativeForwardPathCustomizerTest.java | 151 +++++++++++++++++ .../NativeForwardPathsTableCustomizerTest.java | 107 ++++++++++++ .../common/translate/util/AddressTranslator.java | 7 + 7 files changed, 625 insertions(+), 6 deletions(-) create mode 100644 lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java create mode 100644 lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java create mode 100644 lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java create mode 100644 lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java index 734b4841b..2c5da177e 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/GpeReaderFactory.java @@ -31,6 +31,10 @@ 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.GpeState; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.GpeStateBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTablesState; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTablesStateBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTable; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._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.GpeEntryTableBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.gpe.entry.table.grouping.gpe.entry.table.GpeEntry; @@ -66,6 +70,10 @@ public class GpeReaderFactory implements ReaderFactory { @Named(GpeModule.GPE_TO_LOCATOR_PAIR_CTX) private GpeLocatorPairMappingContext gpeLocatorPairMappingContext; + @Inject + @Named("interface-context") + private NamingContext interfaceContext; + @Override public void init(@Nonnull final ModifiableReaderRegistryBuilder registry) { registry.addStructuralReader(GPE_STATE_ID, GpeStateBuilder.class); @@ -81,5 +89,15 @@ public class GpeReaderFactory implements ReaderFactory { new GenericInitListReader<>(GPE_ENTRY_ID, new GpeForwardEntryCustomizer(api, gpeStateCheckService, gpeEntryMappingContext, gpeLocatorPairMappingContext))); + + final InstanceIdentifier tablesId = + InstanceIdentifier.create(NativeForwardPathsTablesState.class); + registry.addStructuralReader(tablesId, NativeForwardPathsTablesStateBuilder.class); + + final InstanceIdentifier tableId = tablesId.child(NativeForwardPathsTable.class); + registry.add(new GenericInitListReader<>(tableId, new NativeForwardPathsTableCustomizer(api))); + + final InstanceIdentifier pathId = tableId.child(NativeForwardPath.class); + registry.add(new GenericInitListReader<>(pathId, new NativeForwardPathCustomizer(api, interfaceContext))); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java new file mode 100644 index 000000000..b8a59a181 --- /dev/null +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizer.java @@ -0,0 +1,182 @@ +/* + * 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.read; + +import static java.util.Arrays.stream; + +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.ModificationCache; +import io.fd.honeycomb.translate.read.ReadContext; +import io.fd.honeycomb.translate.read.ReadFailedException; +import io.fd.honeycomb.translate.spi.read.Initialized; +import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; +import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; +import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGet; +import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGetReply; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import io.fd.vpp.jvpp.core.types.GpeNativeFwdRpath; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.Stream; +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.NativeForwardPathsTables; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTableKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTable; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPath; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPathBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPathKey; +import org.opendaylight.yangtools.concepts.Builder; +import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; + +public class NativeForwardPathCustomizer extends FutureJVppCustomizer + implements InitializingListReaderCustomizer, + JvppReplyConsumer, AddressTranslator { + + private static final GpeNativeFwdRpathsGetReply DEFAULT_DUMP = new GpeNativeFwdRpathsGetReply(); + + private final NamingContext interfaceContext; + private final DumpCacheManager dumpCacheManager; + + public NativeForwardPathCustomizer(@Nonnull final FutureJVppCore futureJVppCore, + @Nonnull final NamingContext interfaceContext) { + super(futureJVppCore); + this.interfaceContext = interfaceContext; + dumpCacheManager = new DumpCacheManager.DumpCacheManagerBuilder() + .acceptOnly(GpeNativeFwdRpathsGetReply.class) + .withExecutor((identifier, params) -> { + final GpeNativeFwdRpathsGet request = new GpeNativeFwdRpathsGet(); + request.isIp4 = params.byteValue(); + return getReplyForRead(getFutureJVpp().gpeNativeFwdRpathsGet(request).toCompletableFuture(), + identifier); + }).build(); + } + + @Nonnull + @Override + public Initialized init(@Nonnull final InstanceIdentifier id, + @Nonnull final NativeForwardPath readValue, + @Nonnull final ReadContext ctx) { + final Long tableId = id.firstKeyOf(NativeForwardPathsTable.class).getTableId(); + final KeyedInstanceIdentifier + cfgId = InstanceIdentifier.create(NativeForwardPathsTables.class) + .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTable.class, + new NativeForwardPathsTableKey( + tableId)) + .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPath.class, + new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPathKey( + readValue.getNextHopAddress())); + + final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPath + cfgValue = + new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables._native.forward.paths.table.NativeForwardPathBuilder() + .setNextHopAddress(readValue.getNextHopAddress()) + .setNextHopInterface(readValue.getNextHopInterface()) + .build(); + return Initialized.create(cfgId, cfgValue); + } + + @Nonnull + @Override + public List getAllIds(@Nonnull final InstanceIdentifier id, + @Nonnull final ReadContext context) throws ReadFailedException { + + final ModificationCache modificationCache = context.getModificationCache(); + final Long tableId = id.firstKeyOf(NativeForwardPathsTable.class).getTableId(); + return Stream.concat( + stream(v6Dump(id, modificationCache, dumpCacheManager).entries), + stream(v4Dump(id, modificationCache, dumpCacheManager).entries)) + // fib index temporally returns table id to be able to filter by table id + // field will be renamed in future + .filter(gpeNativeFwdRpath -> isFromFib(tableId, gpeNativeFwdRpath)) + .map(gpeNativeFwdRpath -> arrayToIpAddress(!byteToBoolean(gpeNativeFwdRpath.isIp4), + gpeNativeFwdRpath.nhAddr)) + .map(NativeForwardPathKey::new) + .collect(Collectors.toList()); + } + + @Override + public void merge(@Nonnull final Builder builder, + @Nonnull final List readData) { + ((NativeForwardPathsTableBuilder) builder).setNativeForwardPath(readData); + } + + @Nonnull + @Override + public NativeForwardPathBuilder getBuilder(@Nonnull final InstanceIdentifier id) { + return new NativeForwardPathBuilder(); + } + + @Override + public void readCurrentAttributes(@Nonnull final InstanceIdentifier id, + @Nonnull final NativeForwardPathBuilder builder, + @Nonnull final ReadContext ctx) + throws ReadFailedException { + final IpAddress nextHopAddress = id.firstKeyOf(NativeForwardPath.class).getNextHopAddress(); + final ModificationCache modificationCache = ctx.getModificationCache(); + final boolean ipv6 = isIpv6(nextHopAddress); + final Long tableId = id.firstKeyOf(NativeForwardPathsTable.class).getTableId(); + + // dumps only needed address family + final Optional foundPath = Arrays.stream(ipv6 + ? v6Dump(id, modificationCache, dumpCacheManager).entries + : v4Dump(id, modificationCache, dumpCacheManager).entries) + .filter(gpeNativeFwdRpath -> isFromFib(tableId, gpeNativeFwdRpath)) + // TODO - HC2VPP-169 - use equals after resolving this issue + .filter(gpeNativeFwdRpath -> addressesEqual(nextHopAddress, + arrayToIpAddress(ipv6, gpeNativeFwdRpath.nhAddr))) + .findAny(); + + if (foundPath.isPresent()) { + final GpeNativeFwdRpath path = foundPath.get(); + builder.setNextHopAddress(arrayToIpAddress(ipv6, path.nhAddr)); + if (path.nhSwIfIndex != ~0) { + builder.setNextHopInterface(interfaceContext.getName(path.nhSwIfIndex, ctx.getMappingContext())); + } + } + } + + private static boolean isFromFib(final Long tableId, final GpeNativeFwdRpath gpeNativeFwdRpath) { + // fibIndex is temporally used to return table id + // ~0 is default, and 0 will be used internally in vpp + return gpeNativeFwdRpath.fibIndex == ~0 + ? 0 == tableId + : gpeNativeFwdRpath.fibIndex == tableId; + } + + private static GpeNativeFwdRpathsGetReply v4Dump(final @Nonnull InstanceIdentifier id, + final ModificationCache modificationCache, + final DumpCacheManager dumpCacheManager) + throws ReadFailedException { + return dumpCacheManager.getDump(id, modificationCache, 1).or(DEFAULT_DUMP); + } + + private static GpeNativeFwdRpathsGetReply v6Dump(final @Nonnull InstanceIdentifier id, + final ModificationCache modificationCache, + final DumpCacheManager dumpCacheManager) + throws ReadFailedException { + return dumpCacheManager.getDump(id, modificationCache, 0).or(DEFAULT_DUMP); + } +} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java new file mode 100644 index 000000000..055f38ae8 --- /dev/null +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizer.java @@ -0,0 +1,160 @@ +/* + * 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.read; + +import static io.fd.honeycomb.translate.util.read.cache.EntityDumpExecutor.NO_PARAMS; + +import com.google.common.primitives.UnsignedInts; +import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; +import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; +import io.fd.honeycomb.translate.read.ReadContext; +import io.fd.honeycomb.translate.read.ReadFailedException; +import io.fd.honeycomb.translate.spi.read.Initialized; +import io.fd.honeycomb.translate.spi.read.InitializingListReaderCustomizer; +import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; +import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager.DumpCacheManagerBuilder; +import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.vpp.jvpp.core.dto.Ip6FibDump; +import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; +import io.fd.vpp.jvpp.core.dto.IpFibDump; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; +import java.util.List; +import java.util.OptionalLong; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.annotation.Nonnull; +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.NativeForwardPathsTablesStateBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTable; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableKey; +import org.opendaylight.yangtools.concepts.Builder; +import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; + +public class NativeForwardPathsTableCustomizer extends FutureJVppCustomizer implements + InitializingListReaderCustomizer, + JvppReplyConsumer { + + // no need to recreate, has no params + private static final IpFibDump REQUEST_V4 = new IpFibDump(); + private static final Ip6FibDump REQUEST_V6 = new Ip6FibDump(); + private static final IpFibDetailsReplyDump DEFAULT_REPLY_V4 = new IpFibDetailsReplyDump(); + private static final Ip6FibDetailsReplyDump DEFAULT_REPLY_V6 = new Ip6FibDetailsReplyDump(); + private DumpCacheManager dumpCacheManagerV4; + private DumpCacheManager dumpCacheManagerV6; + + public NativeForwardPathsTableCustomizer(@Nonnull final FutureJVppCore futureJVppCore) { + super(futureJVppCore); + + // there's no lisp specific dump for tables created by gpe_add_del_iface, + // so have to use standard fib dump + dumpCacheManagerV4 = new DumpCacheManagerBuilder() + .acceptOnly(IpFibDetailsReplyDump.class) + .withExecutor((identifier, params) -> getReplyForRead( + getFutureJVpp().ipFibDump(REQUEST_V4).toCompletableFuture(), + identifier)).build(); + + dumpCacheManagerV6 = new DumpCacheManagerBuilder() + .acceptOnly(Ip6FibDetailsReplyDump.class) + .withExecutor((identifier, params) -> getReplyForRead( + getFutureJVpp().ip6FibDump(REQUEST_V6).toCompletableFuture(), + identifier)).build(); + } + + @Nonnull + @Override + public Initialized init(@Nonnull final InstanceIdentifier id, + @Nonnull final NativeForwardPathsTable readValue, + @Nonnull final ReadContext ctx) { + final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTable + cfgValue = + new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTableBuilder() + .setTableId(readValue.getTableId()) + .build(); + + final KeyedInstanceIdentifier + cfgKey = InstanceIdentifier.create(NativeForwardPathsTables.class) + .child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTable.class, + new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.NativeForwardPathsTableKey( + cfgValue.getKey())); + + return Initialized.create(cfgKey, cfgValue); + } + + @Nonnull + @Override + public List getAllIds(@Nonnull final InstanceIdentifier id, + @Nonnull final ReadContext context) throws ReadFailedException { + + return Stream.concat(v4FibsStream(id, context), v6FibsStream(id, context)) + .mapToLong(UnsignedInts::toLong) + .distinct() + .mapToObj(NativeForwardPathsTableKey::new) + .collect(Collectors.toList()); + } + + + @Override + public void merge(@Nonnull final Builder builder, + @Nonnull final List readData) { + ((NativeForwardPathsTablesStateBuilder) builder).setNativeForwardPathsTable(readData); + } + + @Nonnull + @Override + public NativeForwardPathsTableBuilder getBuilder(@Nonnull final InstanceIdentifier id) { + return new NativeForwardPathsTableBuilder(); + } + + @Override + public void readCurrentAttributes(@Nonnull final InstanceIdentifier id, + @Nonnull final NativeForwardPathsTableBuilder builder, + @Nonnull final ReadContext ctx) + throws ReadFailedException { + final Long tableId = id.firstKeyOf(NativeForwardPathsTable.class).getTableId(); + + final OptionalLong optionalTable = Stream.concat(v4FibsStream(id, ctx), v6FibsStream(id, ctx)) + .mapToLong(UnsignedInts::toLong) + .distinct() + .filter(tblId -> tblId == tableId) + .findAny(); + + if (optionalTable.isPresent()) { + final long existingTableId = optionalTable.getAsLong(); + builder.setTableId(existingTableId); + builder.setKey(new NativeForwardPathsTableKey(existingTableId)); + } + } + + private Stream v4FibsStream(final InstanceIdentifier id, + final ReadContext ctx) throws ReadFailedException { + + return dumpCacheManagerV4.getDump(id, ctx.getModificationCache(), NO_PARAMS).or(DEFAULT_REPLY_V4) + .ipFibDetails.stream() + .map(ipFibDetails -> ipFibDetails.tableId); + } + + private Stream v6FibsStream(final InstanceIdentifier id, + final ReadContext ctx) throws ReadFailedException { + + return dumpCacheManagerV6.getDump(id, ctx.getModificationCache(), NO_PARAMS).or(DEFAULT_REPLY_V6) + .ip6FibDetails.stream() + .map(ip6FibDetails -> ip6FibDetails.tableId); + } +} diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java index 41de38333..85d520868 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/read/MapResolverCustomizer.java @@ -105,12 +105,6 @@ public class MapResolverCustomizer extends CheckedLispCustomizer arrayToIpAddress(byteToBoolean(mapResolverDetails.isIpv6), mapResolverDetails.ipAddress)); } - // safest way to compare addresses - prevents returning false while using different types from hierarchy - // Ex. Key for MapResolver contains Ipv4Address as value but we translate addresses from binary data to Ipv4AddressNoZone - private boolean addressesEqual(final IpAddress left, final IpAddress right) { - return Arrays.equals(left.getValue(), right.getValue()); - } - @Override public List getAllIds(InstanceIdentifier id, ReadContext context) throws ReadFailedException { diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java new file mode 100644 index 000000000..6dfe3883f --- /dev/null +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathCustomizerTest.java @@ -0,0 +1,151 @@ +/* + * 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.read; + +import static io.fd.hc2vpp.lisp.gpe.translate.read.NativeForwardPathsTableCustomizerTest.TABLE_0_IDX; +import static io.fd.hc2vpp.lisp.gpe.translate.read.NativeForwardPathsTableCustomizerTest.TABLE_1_IDX; +import static io.fd.hc2vpp.lisp.gpe.translate.read.NativeForwardPathsTableCustomizerTest.TABLE_2_IDX; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.when; + +import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; +import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.honeycomb.translate.read.ReadFailedException; +import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; +import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGet; +import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGetReply; +import io.fd.vpp.jvpp.core.types.GpeNativeFwdRpath; +import java.util.List; +import org.junit.Test; +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.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTablesState; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTable; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPath; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPathBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state._native.forward.paths.table.NativeForwardPathKey; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; + +public class NativeForwardPathCustomizerTest + extends + InitializingListReaderCustomizerTest { + + private static final String IFC_CTX = "ifc-ctx"; + private static final String ETH_0 = "eth-0"; + private static final String ETH_1 = "eth-1"; + private static final int ETH_0_IDX = 2; + private static final int ETH_1_IDX = 7; + + private NamingContext interfaceContext; + private KeyedInstanceIdentifier validId; + private KeyedInstanceIdentifier defaultTableId; + + public NativeForwardPathCustomizerTest() { + super(NativeForwardPath.class, NativeForwardPathsTableBuilder.class); + } + + @Override + protected void setUp() throws Exception { + interfaceContext = new NamingContext("iface", IFC_CTX); + final GpeNativeFwdRpathsGet requestV4 = new GpeNativeFwdRpathsGet(); + requestV4.isIp4 = 1; + final GpeNativeFwdRpathsGet requestV6 = new GpeNativeFwdRpathsGet(); + requestV6.isIp4 = 0; + when(api.gpeNativeFwdRpathsGet(requestV4)).thenReturn(future(getReplyV4())); + when(api.gpeNativeFwdRpathsGet(requestV6)).thenReturn(future(getReplyV6())); + validId = InstanceIdentifier.create(NativeForwardPathsTablesState.class) + .child(NativeForwardPathsTable.class, new NativeForwardPathsTableKey((long) TABLE_0_IDX)) + .child(NativeForwardPath.class, + new NativeForwardPathKey(new IpAddress(new Ipv4Address("192.168.2.1")))); + defaultTableId = InstanceIdentifier.create(NativeForwardPathsTablesState.class) + .child(NativeForwardPathsTable.class, new NativeForwardPathsTableKey((long) 0)) + .child(NativeForwardPath.class, + new NativeForwardPathKey(new IpAddress(new Ipv4Address("192.168.2.7")))); + defineMapping(mappingContext, ETH_0, ETH_0_IDX, IFC_CTX); + defineMapping(mappingContext, ETH_1, ETH_1_IDX, IFC_CTX); + } + + @Test + public void testGetAll() throws ReadFailedException { + final List allIds = getCustomizer().getAllIds(validId, ctx); + assertEquals(2, allIds.size()); + final String firstAddress = allIds.get(0).getNextHopAddress().getIpv6Address().getValue(); + final String secondAddress = allIds.get(1).getNextHopAddress().getIpv4Address().getValue(); + assertEquals("2001:db8:a0b:12f0::1", firstAddress); + assertEquals("192.168.2.1", secondAddress); + } + + @Test + public void testGetAllDefaultTable() throws ReadFailedException { + final List allIds = getCustomizer().getAllIds(defaultTableId, ctx); + assertEquals(1, allIds.size()); + final String firstAddress = allIds.get(0).getNextHopAddress().getIpv4Address().getValue(); + assertEquals("192.168.3.7", firstAddress); + } + + @Test + public void testReadCurrent() throws ReadFailedException { + final NativeForwardPathBuilder builder = new NativeForwardPathBuilder(); + getCustomizer().readCurrentAttributes(validId, builder, ctx); + + assertEquals("192.168.2.1", builder.getNextHopAddress().getIpv4Address().getValue()); + assertEquals(ETH_1, builder.getNextHopInterface()); + } + + private GpeNativeFwdRpathsGetReply getReplyV4() { + GpeNativeFwdRpathsGetReply reply = new GpeNativeFwdRpathsGetReply(); + GpeNativeFwdRpath table0Path1 = new GpeNativeFwdRpath(); + table0Path1.fibIndex = TABLE_0_IDX; + table0Path1.nhAddr = new byte[]{-64, -88, 2, 1}; + table0Path1.isIp4 = 1; + table0Path1.nhSwIfIndex = ETH_1_IDX; + GpeNativeFwdRpath table2Path1 = new GpeNativeFwdRpath(); + table2Path1.fibIndex = TABLE_2_IDX; + table2Path1.nhAddr = new byte[]{-64, -88, 3, 2}; + table2Path1.isIp4 = 1; + GpeNativeFwdRpath tableDefaultPath1 = new GpeNativeFwdRpath(); + tableDefaultPath1.fibIndex = ~0; + tableDefaultPath1.nhAddr = new byte[]{-64, -88, 3, 7}; + tableDefaultPath1.isIp4 = 1; + + reply.entries = new GpeNativeFwdRpath[]{table0Path1, table2Path1, tableDefaultPath1}; + return reply; + } + + private GpeNativeFwdRpathsGetReply getReplyV6() { + GpeNativeFwdRpathsGetReply reply = new GpeNativeFwdRpathsGetReply(); + GpeNativeFwdRpath table0Path2 = new GpeNativeFwdRpath(); + table0Path2.fibIndex = TABLE_0_IDX; + table0Path2.nhAddr = new byte[]{32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 0, 1}; + table0Path2.isIp4 = 0; + GpeNativeFwdRpath table1Path1 = new GpeNativeFwdRpath(); + table1Path1.fibIndex = TABLE_1_IDX; + table1Path1.nhAddr = new byte[]{32, 1, 13, -72, 10, 11, 18, -16, 0, 0, 0, 0, 0, 0, 3, 2}; + table1Path1.isIp4 = 0; + table1Path1.nhSwIfIndex = ETH_0_IDX; + reply.entries = new GpeNativeFwdRpath[]{table0Path2, table1Path1}; + return reply; + } + + @Override + protected ReaderCustomizer initCustomizer() { + return new NativeForwardPathCustomizer(api, interfaceContext); + } +} \ No newline at end of file diff --git a/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java new file mode 100644 index 000000000..33ebee7f1 --- /dev/null +++ b/lisp/lisp2vpp/src/test/java/io/fd/hc2vpp/lisp/gpe/translate/read/NativeForwardPathsTableCustomizerTest.java @@ -0,0 +1,107 @@ +/* + * 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.read; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; + +import io.fd.hc2vpp.common.test.read.InitializingListReaderCustomizerTest; +import io.fd.honeycomb.translate.read.ReadFailedException; +import io.fd.honeycomb.translate.spi.read.ReaderCustomizer; +import io.fd.vpp.jvpp.core.dto.GpeNativeFwdRpathsGet; +import io.fd.vpp.jvpp.core.dto.Ip6FibDetails; +import io.fd.vpp.jvpp.core.dto.Ip6FibDetailsReplyDump; +import io.fd.vpp.jvpp.core.dto.IpFibDetails; +import io.fd.vpp.jvpp.core.dto.IpFibDetailsReplyDump; +import java.util.Arrays; +import java.util.List; +import org.junit.Test; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTablesState; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518.NativeForwardPathsTablesStateBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTable; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.gpe.rev170518._native.forward.paths.tables.state.NativeForwardPathsTableKey; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +public class NativeForwardPathsTableCustomizerTest extends + InitializingListReaderCustomizerTest { + + static final int TABLE_0_IDX = 1; + static final int TABLE_1_IDX = 2; + static final int TABLE_2_IDX = 3; + + InstanceIdentifier validId; + + public NativeForwardPathsTableCustomizerTest() { + super(NativeForwardPathsTable.class, NativeForwardPathsTablesStateBuilder.class); + } + + @Override + protected void setUp() throws Exception { + final GpeNativeFwdRpathsGet requestV4 = new GpeNativeFwdRpathsGet(); + requestV4.isIp4 = 0; + final GpeNativeFwdRpathsGet requestV6 = new GpeNativeFwdRpathsGet(); + requestV6.isIp4 = 1; + when(api.ipFibDump(any())).thenReturn(future(getReplyV4())); + when(api.ip6FibDump(any())).thenReturn(future(getReplyV6())); + validId = InstanceIdentifier.create(NativeForwardPathsTablesState.class) + .child(NativeForwardPathsTable.class, new NativeForwardPathsTableKey((long) TABLE_0_IDX)); + } + + @Test + public void testGetAll() throws ReadFailedException { + final List allIds = getCustomizer().getAllIds(validId, ctx); + assertEquals(3, allIds.size()); + assertTrue(allIds.contains(new NativeForwardPathsTableKey((long) TABLE_0_IDX))); + assertTrue(allIds.contains(new NativeForwardPathsTableKey((long) TABLE_1_IDX))); + assertTrue(allIds.contains(new NativeForwardPathsTableKey((long) TABLE_2_IDX))); + } + + @Test + public void testReadCurrent() throws ReadFailedException { + NativeForwardPathsTableBuilder builder = new NativeForwardPathsTableBuilder(); + getCustomizer().readCurrentAttributes(validId, builder, ctx); + final long lTableId = TABLE_0_IDX; + assertEquals(lTableId, builder.getTableId().intValue()); + assertEquals(lTableId, builder.getKey().getTableId().intValue()); + } + + private IpFibDetailsReplyDump getReplyV4() { + IpFibDetailsReplyDump reply = new IpFibDetailsReplyDump(); + IpFibDetails table0 = new IpFibDetails(); + table0.tableId = TABLE_0_IDX; + IpFibDetails table2 = new IpFibDetails(); + table2.tableId = TABLE_2_IDX; + reply.ipFibDetails = Arrays.asList(table0, table2); + return reply; + } + + private Ip6FibDetailsReplyDump getReplyV6() { + Ip6FibDetailsReplyDump reply = new Ip6FibDetailsReplyDump(); + Ip6FibDetails table1 = new Ip6FibDetails(); + table1.tableId = TABLE_1_IDX; + reply.ip6FibDetails = Arrays.asList(table1); + return reply; + } + + @Override + protected ReaderCustomizer initCustomizer() { + return new NativeForwardPathsTableCustomizer(api); + } +} \ No newline at end of file diff --git a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java index 170ff43e5..b602dc569 100644 --- a/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java +++ b/vpp-common/vpp-translate-utils/src/main/java/io/fd/hc2vpp/common/translate/util/AddressTranslator.java @@ -18,6 +18,7 @@ package io.fd.hc2vpp.common.translate.util; import static com.google.common.base.Preconditions.checkNotNull; +import java.util.Arrays; 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; @@ -68,4 +69,10 @@ public interface AddressTranslator extends Ipv4Translator, Ipv6Translator, MacTr return new IpAddress(arrayToIpv4AddressNoZone(ip)); } } + + // safest way to compare addresses - prevents returning false while using different types from hierarchy + // Ex. Key for MapResolver contains Ipv4Address as value but we translate addresses from binary data to Ipv4AddressNoZone + default boolean addressesEqual(final IpAddress left, final IpAddress right) { + return Arrays.equals(left.getValue(), right.getValue()); + } } -- cgit 1.2.3-korg