diff options
Diffstat (limited to 'srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write')
-rw-r--r-- | srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java | 5 | ||||
-rw-r--r-- | srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java | 27 |
2 files changed, 28 insertions, 4 deletions
diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java index 5dea50f48..d9f022970 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/Srv6WriterFactory.java @@ -19,6 +19,7 @@ package io.fd.hc2vpp.srv6.write; import com.google.common.collect.ImmutableSet; import com.google.inject.Inject; import io.fd.hc2vpp.srv6.Srv6IIds; +import io.fd.hc2vpp.srv6.util.LocatorContextManager; import io.fd.hc2vpp.srv6.util.function.LocalSidFunctionWriteBindingRegistry; import io.fd.hc2vpp.srv6.write.encap.source.EncapsulationSourceCustomizer; import io.fd.hc2vpp.srv6.write.sid.LocatorCustomizer; @@ -36,6 +37,8 @@ public class Srv6WriterFactory implements WriterFactory { private FutureJVppCore futureJVppCore; @Inject private LocalSidFunctionWriteBindingRegistry bindingRegistry; + @Inject + protected LocatorContextManager locatorContext; @Override public void init(@Nonnull final ModifiableWriterRegistryBuilder registry) { @@ -43,7 +46,7 @@ public class Srv6WriterFactory implements WriterFactory { registry.add(new GenericWriter<>(Srv6IIds.RT_SRV6, new Srv6Customizer())); registry.subtreeAdd(ImmutableSet.of(Srv6IIds.LOC_PREFIX, Srv6IIds.LOC_FT_AUG, Srv6IIds.LOC_FT), - new GenericWriter<>(Srv6IIds.RT_SRV6_LOCS_LOCATOR, new LocatorCustomizer(futureJVppCore))); + new GenericWriter<>(Srv6IIds.RT_SRV6_LOCS_LOCATOR, new LocatorCustomizer(futureJVppCore, locatorContext))); registry.add(new GenericWriter<>(Srv6IIds.RT_SRV6_ENCAP, new EncapsulationSourceCustomizer(futureJVppCore))); diff --git a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java index 86ab3599c..41e838ee7 100644 --- a/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java +++ b/srv6/srv6-impl/src/main/java/io/fd/hc2vpp/srv6/write/sid/LocatorCustomizer.java @@ -16,30 +16,51 @@ package io.fd.hc2vpp.srv6.write.sid; +import com.google.common.base.Preconditions; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; +import io.fd.hc2vpp.srv6.util.LocatorContextManager; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; 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.inet.types.rev130715.Ipv6Address; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6.base.rev180301.srv6.locators.locators.Locator; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.srv6.base.rev180301.srv6.locators.locators.LocatorKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class LocatorCustomizer extends FutureJVppCustomizer implements ListWriterCustomizer<Locator, LocatorKey> { - public LocatorCustomizer(@Nonnull final FutureJVppCore futureJVppCore) { + private final LocatorContextManager locatorCtx; + + public LocatorCustomizer(@Nonnull final FutureJVppCore futureJVppCore, + @Nonnull final LocatorContextManager locatorContext) { super(futureJVppCore); + this.locatorCtx = locatorContext; } @Override public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Locator> instanceIdentifier, @Nonnull final Locator locator, @Nonnull final WriteContext writeContext) { - // noop + Preconditions.checkNotNull(locator.getPrefix(), "Prefix should not be empty in locator: {}", locator); + Preconditions.checkNotNull(locator.getPrefix().getLength(), + "Length in prefix should not be empty for locator: {}", locator); + Ipv6Address locAddress = Preconditions.checkNotNull(locator.getPrefix().getAddress(), + "Address in prefix should not be empty for locator: {}", locator); + Short locLength = Preconditions.checkNotNull(locator.getPrefix().getLength().getValue(), + "Length in prefix should not be empty for locator: {}", locator); + + locatorCtx.addLocator(locAddress.getValue(), new Ipv6Prefix(locAddress.getValue() + "/" + locLength), + writeContext.getMappingContext()); } @Override public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Locator> instanceIdentifier, @Nonnull final Locator locator, @Nonnull final WriteContext writeContext) { - // noop + Preconditions.checkNotNull(locator.getPrefix(), "Prefix should not be empty in locator: {}", locator); + Ipv6Address locAddress = Preconditions.checkNotNull(locator.getPrefix().getAddress(), + "Address in prefix should not be empty for locator: {}", locator); + + locatorCtx.removeLocator(locAddress.getValue(), writeContext.getMappingContext()); } } |