diff options
Diffstat (limited to 'nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc')
10 files changed, 167 insertions, 65 deletions
diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java index c3c81ffb8..5079f1630 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractInterfaceNatCustomizer.java @@ -25,6 +25,8 @@ import io.fd.honeycomb.translate.read.ReadContext; import io.fd.honeycomb.translate.read.ReadFailedException; import io.fd.honeycomb.translate.spi.read.InitializingReaderCustomizer; import io.fd.honeycomb.translate.util.read.cache.DumpCacheManager; +import io.fd.vpp.jvpp.snat.dto.Nat64InterfaceDetailsReplyDump; +import io.fd.vpp.jvpp.snat.dto.Nat64InterfaceDump; import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDetailsReplyDump; import io.fd.vpp.jvpp.snat.dto.SnatInterfaceDump; import io.fd.vpp.jvpp.snat.dto.SnatInterfaceOutputFeatureDetailsReplyDump; @@ -40,21 +42,31 @@ import org.slf4j.Logger; abstract class AbstractInterfaceNatCustomizer<C extends DataObject, B extends Builder<C>> implements InitializingReaderCustomizer<C, B>, JvppReplyConsumer { - private final FutureJVppSnatFacade jvppSnat; - private final DumpCacheManager<SnatInterfaceDetailsReplyDump, Void> preRoutingDumpMgr; - private final DumpCacheManager<SnatInterfaceOutputFeatureDetailsReplyDump, Void> postRoutingDumpMgr; + private final DumpCacheManager<SnatInterfaceDetailsReplyDump, Void> preRoutingNat44DumpMgr; + private final DumpCacheManager<Nat64InterfaceDetailsReplyDump, Void> preRoutingNat64DumpMgr; + private final DumpCacheManager<SnatInterfaceOutputFeatureDetailsReplyDump, Void> postRoutingNat44DumpMgr; private final NamingContext ifcContext; + private final VppAttributesBuilder vppAttributesBuilder; AbstractInterfaceNatCustomizer(@Nonnull final FutureJVppSnatFacade jvppSnat, - @Nonnull final NamingContext ifcContext) { - this.jvppSnat = requireNonNull(jvppSnat, "jvppSnat should not be null"); + @Nonnull final NamingContext ifcContext, + @Nonnull final VppAttributesBuilder vppAttributesBuilder) { + requireNonNull(jvppSnat, "jvppSnat should not be null"); this.ifcContext = requireNonNull(ifcContext, "ifcContext should not be null"); - this.preRoutingDumpMgr = new DumpCacheManager.DumpCacheManagerBuilder<SnatInterfaceDetailsReplyDump, Void>() - .withExecutor((id, params) -> getReplyForRead( - jvppSnat.snatInterfaceDump(new SnatInterfaceDump()).toCompletableFuture(), id)) - .acceptOnly(SnatInterfaceDetailsReplyDump.class) - .build(); - this.postRoutingDumpMgr = + this.vppAttributesBuilder = requireNonNull(vppAttributesBuilder, "ifcContext should not be null"); + this.preRoutingNat44DumpMgr = + new DumpCacheManager.DumpCacheManagerBuilder<SnatInterfaceDetailsReplyDump, Void>() + .withExecutor((id, params) -> getReplyForRead( + jvppSnat.snatInterfaceDump(new SnatInterfaceDump()).toCompletableFuture(), id)) + .acceptOnly(SnatInterfaceDetailsReplyDump.class) + .build(); + this.preRoutingNat64DumpMgr = + new DumpCacheManager.DumpCacheManagerBuilder<Nat64InterfaceDetailsReplyDump, Void>() + .withExecutor((id, params) -> getReplyForRead( + jvppSnat.nat64InterfaceDump(new Nat64InterfaceDump()).toCompletableFuture(), id)) + .acceptOnly(Nat64InterfaceDetailsReplyDump.class) + .build(); + this.postRoutingNat44DumpMgr = new DumpCacheManager.DumpCacheManagerBuilder<SnatInterfaceOutputFeatureDetailsReplyDump, Void>() .withExecutor((id, params) -> getReplyForRead( jvppSnat.snatInterfaceOutputFeatureDump(new SnatInterfaceOutputFeatureDump()) @@ -71,39 +83,51 @@ abstract class AbstractInterfaceNatCustomizer<C extends DataObject, B extends Bu getLog().debug("Reading NAT features on interface: {}", ifcName); final int index = ifcContext.getIndex(ifcName, ctx.getMappingContext()); - // There are no additional attributes for pre routing NAT, so it is enough to read post routing ifc mapping: - final Optional<SnatInterfaceOutputFeatureDetailsReplyDump> postRoutingDump = - postRoutingDumpMgr.getDump(id, ctx.getModificationCache(), null); + // Each of the following cases uses different VPP API, but we store them under single node. + // Not all combinations are possible, but we don't validate on read and rely on VPP. + readPreRoutingNat44(id, index, builder, ctx); + readPreRoutingNat64(id, index, builder, ctx); + readPostRoutingNat44(id, index, builder, ctx); + } + + private void readPreRoutingNat44(final InstanceIdentifier<C> id, final int index, final B builder, + final ReadContext ctx) throws ReadFailedException { + final Optional<SnatInterfaceDetailsReplyDump> dump = + preRoutingNat44DumpMgr.getDump(id, ctx.getModificationCache(), null); - postRoutingDump.or(new SnatInterfaceOutputFeatureDetailsReplyDump()).snatInterfaceOutputFeatureDetails.stream() + dump.or(new SnatInterfaceDetailsReplyDump()).snatInterfaceDetails.stream() .filter(snatIfcDetail -> snatIfcDetail.swIfIndex == index) .filter(snatIfcDetail -> isExpectedNatType(snatIfcDetail.isInside)) - .findFirst() - .ifPresent(snatIfcDetail -> setPostRouting(builder)); + .findAny() + .ifPresent(snatIfcDetail -> vppAttributesBuilder.enableNat44(builder)); + // do not modify builder is feature is absent (inbound/outbound are presence containers) } - @Override - public boolean isPresent(final InstanceIdentifier<C> id, final C built, final ReadContext ctx) - throws ReadFailedException { - // In the post routing case, we can reuse default implementation: - if (InitializingReaderCustomizer.super.isPresent(id, built, ctx)) { - // post routing was set - return true; - } - // In the pre routing case, we need to inspect pre routing dump: - final String ifcName = getName(id); - getLog().debug("Checking NAT presence for interface: {}", ifcName); - final int index = ifcContext.getIndex(ifcName, ctx.getMappingContext()); + private void readPreRoutingNat64(final InstanceIdentifier<C> id, final int index, final B builder, + final ReadContext ctx) throws ReadFailedException { + final Optional<Nat64InterfaceDetailsReplyDump> dump = + preRoutingNat64DumpMgr.getDump(id, ctx.getModificationCache(), null); - // Cache dump for each interface under the same key since this is all ifc dump: - final Optional<SnatInterfaceDetailsReplyDump> preRoutingDump = - preRoutingDumpMgr.getDump(id, ctx.getModificationCache(), null); + dump.or(new Nat64InterfaceDetailsReplyDump()).nat64InterfaceDetails.stream() + .filter(snatIfcDetail -> snatIfcDetail.swIfIndex == index) + .filter(snatIfcDetail -> isExpectedNatType(snatIfcDetail.isInside)) + .findAny() + .ifPresent(snatIfcDetail -> vppAttributesBuilder.enableNat64(builder)); + // do not modify builder is feature is absent (inbound/outbound are presence containers) + } - // Find entries for current ifc and if is marked as inside set the builder to return presence container: - return preRoutingDump.or(new SnatInterfaceDetailsReplyDump()).snatInterfaceDetails.stream() + private void readPostRoutingNat44(final InstanceIdentifier<C> id, final int index, final B builder, + final ReadContext ctx) throws ReadFailedException { + final Optional<SnatInterfaceOutputFeatureDetailsReplyDump> dump = + postRoutingNat44DumpMgr.getDump(id, ctx.getModificationCache(), null); + + dump.or(new SnatInterfaceOutputFeatureDetailsReplyDump()).snatInterfaceOutputFeatureDetails + .stream() .filter(snatIfcDetail -> snatIfcDetail.swIfIndex == index) - .anyMatch(snatIfcDetail -> isExpectedNatType(snatIfcDetail.isInside)); - // Not setting data, just marking the builder to propagate empty container to indicate presence. + .filter(snatIfcDetail -> isExpectedNatType(snatIfcDetail.isInside)) + .findAny() + .ifPresent(snatIfcDetail -> vppAttributesBuilder.enablePostRouting(builder)); + // do not modify builder is feature is absent (inbound/outbound are presence containers) } protected String getName(final InstanceIdentifier<C> id) { @@ -113,6 +137,4 @@ abstract class AbstractInterfaceNatCustomizer<C extends DataObject, B extends Bu abstract Logger getLog(); abstract boolean isExpectedNatType(final int isInside); - - abstract void setPostRouting(final B builder); } diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractSubInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractSubInterfaceNatCustomizer.java index f3872c44e..449d57e7d 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractSubInterfaceNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/AbstractSubInterfaceNatCustomizer.java @@ -30,8 +30,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; abstract class AbstractSubInterfaceNatCustomizer<C extends DataObject, B extends Builder<C>> extends AbstractInterfaceNatCustomizer<C, B> { AbstractSubInterfaceNatCustomizer(@Nonnull final FutureJVppSnatFacade jvppSnat, - @Nonnull final NamingContext ifcContext) { - super(jvppSnat, ifcContext); + @Nonnull final NamingContext ifcContext, + @Nonnull final VppAttributesBuilder vppAttributesBuilder) { + super(jvppSnat, ifcContext, vppAttributesBuilder); } @Override diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java index 51150dc1d..86dc605ce 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/IfcNatReaderFactory.java @@ -16,7 +16,6 @@ package io.fd.hc2vpp.nat.read.ifc; - import com.google.inject.Inject; import com.google.inject.name.Named; import io.fd.hc2vpp.common.translate.util.NamingContext; diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InboundAttributesBuilder.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InboundAttributesBuilder.java new file mode 100644 index 000000000..b8b9db8c7 --- /dev/null +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InboundAttributesBuilder.java @@ -0,0 +1,36 @@ +/* + * 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.nat.read.ifc; + +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev170816._interface.nat.attributes.nat.InboundBuilder; + +final class InboundAttributesBuilder implements VppAttributesBuilder<InboundBuilder> { + @Override + public void enableNat44(final InboundBuilder builder) { + builder.setNat44Support(true); + } + + @Override + public void enableNat64(final InboundBuilder builder) { + builder.setNat64Support(true); + } + + @Override + public void enablePostRouting(final InboundBuilder builder) { + builder.setPostRouting(true); + } +} diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java index 006190610..cabdd0f8b 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceInboundNatCustomizer.java @@ -41,7 +41,7 @@ final class InterfaceInboundNatCustomizer extends AbstractInterfaceNatCustomizer InterfaceInboundNatCustomizer(@Nonnull final FutureJVppSnatFacade jvppSnat, @Nonnull final NamingContext ifcContext) { - super(jvppSnat, ifcContext); + super(jvppSnat, ifcContext, new InboundAttributesBuilder()); } @Override @@ -54,11 +54,6 @@ final class InterfaceInboundNatCustomizer extends AbstractInterfaceNatCustomizer return isInside == 1; } - @Override - void setPostRouting(final InboundBuilder builder) { - builder.setPostRouting(true); - } - @Nonnull @Override public InboundBuilder getBuilder(@Nonnull final InstanceIdentifier<Inbound> id) { diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java index 2fb2a9282..438e43862 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/InterfaceOutboundNatCustomizer.java @@ -41,7 +41,7 @@ final class InterfaceOutboundNatCustomizer extends AbstractInterfaceNatCustomize InterfaceOutboundNatCustomizer(@Nonnull final FutureJVppSnatFacade jvppSnat, @Nonnull final NamingContext ifcContext) { - super(jvppSnat, ifcContext); + super(jvppSnat, ifcContext, new OutboundAttributesReader()); } @Override @@ -54,11 +54,6 @@ final class InterfaceOutboundNatCustomizer extends AbstractInterfaceNatCustomize return isInside == 0; } - @Override - void setPostRouting(final OutboundBuilder builder) { - builder.setPostRouting(true); - } - @Nonnull @Override public OutboundBuilder getBuilder(@Nonnull final InstanceIdentifier<Outbound> id) { diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/OutboundAttributesReader.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/OutboundAttributesReader.java new file mode 100644 index 000000000..16ab317a2 --- /dev/null +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/OutboundAttributesReader.java @@ -0,0 +1,36 @@ +/* + * 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.nat.read.ifc; + +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev170816._interface.nat.attributes.nat.OutboundBuilder; + +final class OutboundAttributesReader implements VppAttributesBuilder<OutboundBuilder> { + @Override + public void enableNat44(final OutboundBuilder builder) { + builder.setNat44Support(true); + } + + @Override + public void enableNat64(final OutboundBuilder builder) { + builder.setNat64Support(true); + } + + @Override + public void enablePostRouting(final OutboundBuilder builder) { + builder.setPostRouting(true); + } +} diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceInboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceInboundNatCustomizer.java index f9550e1e2..39ee7c9f3 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceInboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceInboundNatCustomizer.java @@ -45,7 +45,7 @@ final class SubInterfaceInboundNatCustomizer extends AbstractSubInterfaceNatCust SubInterfaceInboundNatCustomizer(@Nonnull final FutureJVppSnatFacade jvppSnat, @Nonnull final NamingContext ifcContext) { - super(jvppSnat, ifcContext); + super(jvppSnat, ifcContext, new InboundAttributesBuilder()); } @Override @@ -58,11 +58,6 @@ final class SubInterfaceInboundNatCustomizer extends AbstractSubInterfaceNatCust return isInside == 1; } - @Override - void setPostRouting(final InboundBuilder builder) { - builder.setPostRouting(true); - } - @Nonnull @Override public InboundBuilder getBuilder(@Nonnull final InstanceIdentifier<Inbound> id) { diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceOutboundNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceOutboundNatCustomizer.java index 9b6dce766..330e4c4b3 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceOutboundNatCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/SubInterfaceOutboundNatCustomizer.java @@ -45,7 +45,7 @@ final class SubInterfaceOutboundNatCustomizer extends AbstractSubInterfaceNatCus SubInterfaceOutboundNatCustomizer(@Nonnull final FutureJVppSnatFacade jvppSnat, @Nonnull final NamingContext ifcContext) { - super(jvppSnat, ifcContext); + super(jvppSnat, ifcContext, new OutboundAttributesReader()); } @Override @@ -58,11 +58,6 @@ final class SubInterfaceOutboundNatCustomizer extends AbstractSubInterfaceNatCus return isInside == 0; } - @Override - void setPostRouting(final OutboundBuilder builder) { - builder.setPostRouting(true); - } - @Nonnull @Override public OutboundBuilder getBuilder(@Nonnull final InstanceIdentifier<Outbound> id) { diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/VppAttributesBuilder.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/VppAttributesBuilder.java new file mode 100644 index 000000000..57c24fa4b --- /dev/null +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ifc/VppAttributesBuilder.java @@ -0,0 +1,28 @@ +/* + * 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.nat.read.ifc; + +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.nat.rev170816.InterfaceNatVppFeatureAttributes; +import org.opendaylight.yangtools.concepts.Builder; + +interface VppAttributesBuilder<B extends Builder<? extends InterfaceNatVppFeatureAttributes>> { + void enableNat44(final B builder); + + void enableNat64(final B builder); + + void enablePostRouting(final B builder); +} |