diff options
Diffstat (limited to 'lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write')
16 files changed, 81 insertions, 84 deletions
diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java index 37a05f108..df5f431be 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/AdjacencyCustomizer.java @@ -21,17 +21,17 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static io.fd.hc2vpp.lisp.translate.read.dump.executor.params.MappingsDumpParams.EidType; +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.hc2vpp.lisp.context.util.AdjacenciesMappingContext; import io.fd.hc2vpp.lisp.context.util.EidMappingContext; import io.fd.hc2vpp.lisp.translate.util.EidTranslator; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; -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.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelAdjacency; +import io.fd.vpp.jvpp.core.dto.OneAddDelAdjacency; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; @@ -138,7 +138,7 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer checkArgument(localEidType == remoteEidType, "Local[%s] and Remote[%s] eid types must be the same", localEidType, remoteEidType); - LispAddDelAdjacency request = new LispAddDelAdjacency(); + OneAddDelAdjacency request = new OneAddDelAdjacency(); request.isAdd = booleanToByte(add); request.leid = getEidAsByteArray(localEid); @@ -148,7 +148,7 @@ public class AdjacencyCustomizer extends FutureJVppCustomizer request.eidType = (byte) localEidType.getValue(); request.vni = vni; - getReply(getFutureJVpp().lispAddDelAdjacency(request).toCompletableFuture()); + getReply(getFutureJVpp().oneAddDelAdjacency(request).toCompletableFuture()); } private LocalEid verifiedLocalEid(final LocalEid localEid, final WriteContext writeContext) { diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java index 93a8267d6..b3b8d8a77 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/InterfaceCustomizer.java @@ -20,13 +20,16 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static java.nio.charset.StandardCharsets.UTF_8; -import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; 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.hc2vpp.common.translate.util.NamingContext; +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.VppBaseCallException; +import io.fd.vpp.jvpp.core.dto.OneAddDelLocator; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.io.UnsupportedEncodingException; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; @@ -34,9 +37,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.locator.sets.grouping.locator.sets.locator.set.Interface; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.locator.sets.grouping.locator.sets.locator.set.InterfaceKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocator; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** @@ -109,7 +109,7 @@ public class InterfaceCustomizer extends FutureJVppCustomizer private void addDelInterfaceAndReply(boolean add, Interface data, int interfaceIndex, String locatorSetName) throws VppBaseCallException, TimeoutException, UnsupportedEncodingException { - LispAddDelLocator request = new LispAddDelLocator(); + OneAddDelLocator request = new OneAddDelLocator(); request.isAdd = booleanToByte(add); request.priority = data.getPriority().byteValue(); @@ -117,6 +117,6 @@ public class InterfaceCustomizer extends FutureJVppCustomizer request.swIfIndex = interfaceIndex; request.locatorSetName = locatorSetName.getBytes(UTF_8); - getReply(getFutureJVpp().lispAddDelLocator(request).toCompletableFuture()); + getReply(getFutureJVpp().oneAddDelLocator(request).toCompletableFuture()); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java index 71be3c749..90dc0efb6 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/ItrRemoteLocatorSetCustomizer.java @@ -25,7 +25,7 @@ import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapRequestItrRlocs; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapRequestItrRlocs; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeoutException; @@ -77,10 +77,10 @@ public class ItrRemoteLocatorSetCustomizer extends CheckedLispCustomizer impleme throws TimeoutException, VppBaseCallException { lispStateCheckService.checkLispEnabled(context); - LispAddDelMapRequestItrRlocs request = new LispAddDelMapRequestItrRlocs(); + OneAddDelMapRequestItrRlocs request = new OneAddDelMapRequestItrRlocs(); request.isAdd = booleanToByte(add); request.locatorSetName = data.getRemoteLocatorSetName().getBytes(StandardCharsets.UTF_8); - getReply(getFutureJVpp().lispAddDelMapRequestItrRlocs(request).toCompletableFuture()); + getReply(getFutureJVpp().oneAddDelMapRequestItrRlocs(request).toCompletableFuture()); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java index 8f0ffbf65..671614567 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LispCustomizer.java @@ -17,21 +17,21 @@ package io.fd.hc2vpp.lisp.translate.write; import com.google.common.base.Preconditions; -import io.fd.honeycomb.translate.spi.write.WriterCustomizer; 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.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; +import io.fd.vpp.jvpp.VppBaseCallException; +import io.fd.vpp.jvpp.core.dto.OneEnableDisable; +import io.fd.vpp.jvpp.core.dto.OneEnableDisableReply; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.Lisp; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispEnableDisable; -import io.fd.vpp.jvpp.core.dto.LispEnableDisableReply; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; /** @@ -84,14 +84,14 @@ public class LispCustomizer extends FutureJVppCustomizer private void enableDisableLisp(final boolean enable) throws VppBaseCallException, TimeoutException { - final CompletionStage<LispEnableDisableReply> lispEnableDisableReplyCompletionStage = - getFutureJVpp().lispEnableDisable(getRequest(enable)); - getReply(lispEnableDisableReplyCompletionStage.toCompletableFuture()); + final CompletionStage<OneEnableDisableReply> oneEnableDisableReplyCompletionStage = + getFutureJVpp().oneEnableDisable(getRequest(enable)); + getReply(oneEnableDisableReplyCompletionStage.toCompletableFuture()); } - private LispEnableDisable getRequest(final boolean enable) { - final LispEnableDisable lispEnableDisable = new LispEnableDisable(); - lispEnableDisable.isEn = booleanToByte(enable); - return lispEnableDisable; + private OneEnableDisable getRequest(final boolean enable) { + final OneEnableDisable oneEnableDisable = new OneEnableDisable(); + oneEnableDisable.isEn = booleanToByte(enable); + return oneEnableDisable; } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java index 494afd3cb..582a37756 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocalMappingCustomizer.java @@ -32,7 +32,7 @@ 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.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelLocalEid; +import io.fd.vpp.jvpp.core.dto.OneAddDelLocalEid; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; @@ -116,7 +116,7 @@ public class LocalMappingCustomizer extends FutureJVppCustomizer private void addDelMappingAndReply(boolean add, LocalMapping data, int vni) throws VppBaseCallException, TimeoutException, UnsupportedEncodingException { - LispAddDelLocalEid request = new LispAddDelLocalEid(); + OneAddDelLocalEid request = new OneAddDelLocalEid(); request.isAdd = booleanToByte(add); request.eid = getEidAsByteArray(data.getEid()); @@ -139,7 +139,7 @@ public class LocalMappingCustomizer extends FutureJVppCustomizer "HMAC key type not specified").getIntValue(); } - getReply(getFutureJVpp().lispAddDelLocalEid(request).toCompletableFuture()); + getReply(getFutureJVpp().oneAddDelLocalEid(request).toCompletableFuture()); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java index 5a606bc37..04ca7262e 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/LocatorSetCustomizer.java @@ -30,7 +30,7 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; 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.LispAddDelLocatorSet; +import io.fd.vpp.jvpp.core.dto.OneAddDelLocatorSet; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.Collection; import java.util.Collections; @@ -146,11 +146,11 @@ public class LocatorSetCustomizer extends CheckedLispCustomizer private int addDelLocatorSetAndReply(final boolean add, final String name, final InstanceIdentifier<LocatorSet> id) throws WriteFailedException { - LispAddDelLocatorSet addDelSet = new LispAddDelLocatorSet(); + OneAddDelLocatorSet addDelSet = new OneAddDelLocatorSet(); addDelSet.isAdd = booleanToByte(add); addDelSet.locatorSetName = name.getBytes(UTF_8); - return getReplyForWrite(getFutureJVpp().lispAddDelLocatorSet(addDelSet).toCompletableFuture(), id).lsIndex; + return getReplyForWrite(getFutureJVpp().oneAddDelLocatorSet(addDelSet).toCompletableFuture(), id).lsIndex; } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizer.java index 298b14358..ff306e51c 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRegisterCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispMapRegisterEnableDisable; +import io.fd.vpp.jvpp.core.dto.OneMapRegisterEnableDisable; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.map.register.grouping.MapRegister; @@ -62,8 +62,8 @@ public class MapRegisterCustomizer extends CheckedLispCustomizer private void enableDisableMapRegister(final boolean enable, @Nonnull final InstanceIdentifier<MapRegister> id, @Nonnull final WriteContext context) throws WriteFailedException { lispStateCheckService.checkLispEnabled(context); - LispMapRegisterEnableDisable request = new LispMapRegisterEnableDisable(); + OneMapRegisterEnableDisable request = new OneMapRegisterEnableDisable(); request.isEnabled = booleanToByte(enable); - getReplyForWrite(getFutureJVpp().lispMapRegisterEnableDisable(request).toCompletableFuture(), id); + getReplyForWrite(getFutureJVpp().oneMapRegisterEnableDisable(request).toCompletableFuture(), id); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizer.java index d61cd0cfb..64e66b2d4 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapRequestModeCustomizer.java @@ -24,8 +24,8 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispMapRequestMode; -import io.fd.vpp.jvpp.core.dto.LispMapRequestModeReply; +import io.fd.vpp.jvpp.core.dto.OneMapRequestMode; +import io.fd.vpp.jvpp.core.dto.OneMapRequestModeReply; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.concurrent.CompletableFuture; import javax.annotation.Nonnull; @@ -65,11 +65,11 @@ public class MapRequestModeCustomizer extends CheckedLispCustomizer throw new UnsupportedOperationException("Map request mode cannot be deleted"); } - private CompletableFuture<LispMapRequestModeReply> mapRequestModeRequestFuture( + private CompletableFuture<OneMapRequestModeReply> mapRequestModeRequestFuture( @Nonnull final MapRequestMode mapRequestMode) { - LispMapRequestMode request = new LispMapRequestMode(); + OneMapRequestMode request = new OneMapRequestMode(); request.mode = (byte) checkNotNull(mapRequestMode.getMode(), "Mode not specified").getIntValue(); - return getFutureJVpp().lispMapRequestMode(request).toCompletableFuture(); + return getFutureJVpp().oneMapRequestMode(request).toCompletableFuture(); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java index 94b45ae21..934cc218a 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapResolverCustomizer.java @@ -26,7 +26,7 @@ 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.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelMapResolver; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapResolver; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; @@ -87,7 +87,7 @@ public class MapResolverCustomizer extends CheckedLispCustomizer private void addDelMapResolverAndReply(boolean add, MapResolver data) throws VppBaseCallException, TimeoutException { - LispAddDelMapResolver request = new LispAddDelMapResolver(); + OneAddDelMapResolver request = new OneAddDelMapResolver(); request.isAdd = booleanToByte(add); @@ -96,6 +96,6 @@ public class MapResolverCustomizer extends CheckedLispCustomizer request.isIpv6 = booleanToByte(ipv6); request.ipAddress = ipAddressToArray(ipv6, data.getIpAddress()); - getReply(getFutureJVpp().lispAddDelMapResolver(request).toCompletableFuture()); + getReply(getFutureJVpp().oneAddDelMapResolver(request).toCompletableFuture()); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizer.java index ec2b3b37a..6dc201516 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/MapServerCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; 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.LispAddDelMapServer; +import io.fd.vpp.jvpp.core.dto.OneAddDelMapServer; 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.IpAddress; @@ -66,7 +66,7 @@ public class MapServerCustomizer extends CheckedLispCustomizer private void addDelMapServer(final boolean add, @Nonnull final InstanceIdentifier<MapServer> id, @Nonnull final MapServer data) throws WriteFailedException { - LispAddDelMapServer request = new LispAddDelMapServer(); + OneAddDelMapServer request = new OneAddDelMapServer(); final IpAddress ipAddress = data.getIpAddress(); @@ -74,6 +74,6 @@ public class MapServerCustomizer extends CheckedLispCustomizer request.isIpv6 = booleanToByte(isIpv6(ipAddress)); request.ipAddress = ipAddressToArray(ipAddress); - getReplyForWrite(getFutureJVpp().lispAddDelMapServer(request).toCompletableFuture(), id); + getReplyForWrite(getFutureJVpp().oneAddDelMapServer(request).toCompletableFuture(), id); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizer.java index 728de8fca..6c985ff0e 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PetrCfgCustomizer.java @@ -25,7 +25,7 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispUsePetr; +import io.fd.vpp.jvpp.core.dto.OneUsePetr; 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.IpAddress; @@ -68,18 +68,18 @@ public class PetrCfgCustomizer extends CheckedLispCustomizer } private void enablePetrCfg(@Nonnull final InstanceIdentifier<PetrCfg> id, @Nonnull final PetrCfg data) throws WriteFailedException { - LispUsePetr request = new LispUsePetr(); + OneUsePetr request = new OneUsePetr(); final IpAddress petrAddress = checkNotNull(data.getPetrAddress(), "PETR address not defined"); request.isAdd = 1; request.address = ipAddressToArray(petrAddress); request.isIp4 = booleanToByte(!isIpv6(petrAddress)); - getReplyForWrite(getFutureJVpp().lispUsePetr(request).toCompletableFuture(), id); + getReplyForWrite(getFutureJVpp().oneUsePetr(request).toCompletableFuture(), id); } private void disablePetrCfg(@Nonnull final InstanceIdentifier<PetrCfg> id) throws WriteFailedException { - LispUsePetr request = new LispUsePetr(); + OneUsePetr request = new OneUsePetr(); request.isAdd = 0; - getReplyForDelete(getFutureJVpp().lispUsePetr(request).toCompletableFuture(), id); + getReplyForDelete(getFutureJVpp().oneUsePetr(request).toCompletableFuture(), id); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java index 39986e152..6944940c1 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/PitrCfgCustomizer.java @@ -27,7 +27,7 @@ import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispPitrSetLocatorSet; +import io.fd.vpp.jvpp.core.dto.OnePitrSetLocatorSet; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; @@ -100,11 +100,11 @@ public class PitrCfgCustomizer extends CheckedLispCustomizer return; } - LispPitrSetLocatorSet request = new LispPitrSetLocatorSet(); + OnePitrSetLocatorSet request = new OnePitrSetLocatorSet(); request.isAdd = booleanToByte(add); request.lsName = data.getLocatorSet().getBytes(UTF_8); - getReply(getFutureJVpp().lispPitrSetLocatorSet(request).toCompletableFuture()); + getReply(getFutureJVpp().onePitrSetLocatorSet(request).toCompletableFuture()); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java index 423625d97..056dcde1d 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RemoteMappingCustomizer.java @@ -17,6 +17,12 @@ package io.fd.hc2vpp.lisp.translate.write; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkNotNull; +import static com.google.common.base.Preconditions.checkState; +import static io.fd.hc2vpp.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.NEGATIVE; +import static io.fd.hc2vpp.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.POSITIVE; + import com.google.common.base.Preconditions; import io.fd.hc2vpp.common.translate.util.AddressTranslator; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; @@ -28,9 +34,13 @@ 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.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispAddDelRemoteMapping; +import io.fd.vpp.jvpp.core.dto.OneAddDelRemoteMapping; import io.fd.vpp.jvpp.core.future.FutureJVppCore; -import io.fd.vpp.jvpp.core.types.RemoteLocator; +import io.fd.vpp.jvpp.core.types.OneRemoteLocator; +import java.io.IOException; +import java.util.Optional; +import java.util.concurrent.TimeoutException; +import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.MapReplyAction; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.MappingId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.dp.subtable.grouping.remote.mappings.RemoteMapping; @@ -42,15 +52,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.eid.table.grouping.eid.table.VniTable; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import javax.annotation.Nonnull; -import java.io.IOException; -import java.util.Optional; -import java.util.concurrent.TimeoutException; - -import static com.google.common.base.Preconditions.*; -import static io.fd.hc2vpp.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.NEGATIVE; -import static io.fd.hc2vpp.lisp.translate.write.RemoteMappingCustomizer.LocatorListType.POSITIVE; - /** * Customizer for {@link RemoteMapping} @@ -119,7 +120,7 @@ public class RemoteMappingCustomizer extends FutureJVppCustomizer private void addDelRemoteMappingAndReply(boolean add, RemoteMapping data, int vni) throws VppBaseCallException, TimeoutException, IOException { - LispAddDelRemoteMapping request = new LispAddDelRemoteMapping(); + OneAddDelRemoteMapping request = new OneAddDelRemoteMapping(); request.isAdd = booleanToByte(add); request.vni = vni; @@ -133,13 +134,13 @@ public class RemoteMappingCustomizer extends FutureJVppCustomizer .equals(resolveType(data.getLocatorList()))) { request.action = (byte) extractAction(data.getLocatorList()).getIntValue(); } else { - Rlocs rlocs = extractRemoteLocators(data.getLocatorList()); + Rlocs rlocs = extractOneRemoteLocators(data.getLocatorList()); checkArgument(rlocs != null, "No remote locators set for Positive mapping"); request.rlocs = rlocs.getLocator().stream() .map(locator -> { - RemoteLocator remoteLocator = new RemoteLocator(); + OneRemoteLocator remoteLocator = new OneRemoteLocator(); remoteLocator.addr = ipAddressToArray(locator.getAddress()); remoteLocator.isIp4 = booleanToByte(!isIpv6(locator.getAddress())); Optional.ofNullable(locator.getPriority()) @@ -148,11 +149,11 @@ public class RemoteMappingCustomizer extends FutureJVppCustomizer .ifPresent(weight -> remoteLocator.weight = weight.byteValue()); return remoteLocator; - }).toArray(RemoteLocator[]::new); + }).toArray(OneRemoteLocator[]::new); request.rlocNum = Integer.valueOf(rlocs.getLocator().size()).byteValue(); } - getReply(getFutureJVpp().lispAddDelRemoteMapping(request).toCompletableFuture()); + getReply(getFutureJVpp().oneAddDelRemoteMapping(request).toCompletableFuture()); } private static LocatorListType resolveType(LocatorList locatorList) { @@ -173,7 +174,7 @@ public class RemoteMappingCustomizer extends FutureJVppCustomizer return ((NegativeMapping) locatorList).getMapReply().getMapReplyAction(); } - private static Rlocs extractRemoteLocators(LocatorList locatorList) { + private static Rlocs extractOneRemoteLocators(LocatorList locatorList) { checkNotNull(locatorList, "Locator List cannot be null"); Preconditions.checkArgument(POSITIVE.equals(resolveType(locatorList)), "RLocs can be extracted only from Positive Mapping"); diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizer.java index e60563454..e984a16d1 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/RlocProbeCustomizer.java @@ -23,7 +23,7 @@ import io.fd.hc2vpp.lisp.translate.util.CheckedLispCustomizer; import io.fd.honeycomb.translate.spi.write.WriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.LispRlocProbeEnableDisable; +import io.fd.vpp.jvpp.core.dto.OneRlocProbeEnableDisable; import io.fd.vpp.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.rloc.probing.grouping.RlocProbe; @@ -63,10 +63,10 @@ public class RlocProbeCustomizer extends CheckedLispCustomizer } private void enableDisableRlocProbe(final boolean enable, @Nonnull final InstanceIdentifier<RlocProbe> id) throws WriteFailedException { - LispRlocProbeEnableDisable request = new LispRlocProbeEnableDisable(); + OneRlocProbeEnableDisable request = new OneRlocProbeEnableDisable(); request.isEnabled = booleanToByte(enable); - getReplyForWrite(getFutureJVpp().lispRlocProbeEnableDisable(request).toCompletableFuture(), id); + getReplyForWrite(getFutureJVpp().oneRlocProbeEnableDisable(request).toCompletableFuture(), id); } } diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java index 05956d998..e6fe3db45 100755 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/VniTableCustomizer.java @@ -30,8 +30,6 @@ import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.eid.table.grouping.eid.table.VniTable; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.eid.table.grouping.eid.table.VniTableKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** @@ -40,8 +38,6 @@ import org.slf4j.LoggerFactory; */ public class VniTableCustomizer extends CheckedLispCustomizer implements ListWriterCustomizer<VniTable, VniTableKey> { - private static final Logger LOG = LoggerFactory.getLogger(VniTableCustomizer.class); - public VniTableCustomizer(@Nonnull final FutureJVppCore futureJvpp, @Nonnull final LispStateCheckService lispStateCheckService) { super(futureJvpp, lispStateCheckService); diff --git a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java index df285f7da..cb6445804 100644 --- a/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java +++ b/lisp/lisp2vpp/src/main/java/io/fd/hc2vpp/lisp/translate/write/trait/SubtableWriter.java @@ -21,6 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull; import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; +import io.fd.vpp.jvpp.VppBaseCallException; +import io.fd.vpp.jvpp.core.dto.OneEidTableAddDelMap; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; import java.util.concurrent.TimeoutException; import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.eid.table.grouping.eid.table.VniTable; @@ -28,9 +31,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.lisp.rev170315.eid.table.grouping.eid.table.vni.table.VrfSubtable; import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.VppBaseCallException; -import io.fd.vpp.jvpp.core.dto.LispEidTableAddDelMap; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; import org.slf4j.Logger; /** @@ -64,14 +64,14 @@ public interface SubtableWriter extends ByteDataTranslator, JvppReplyConsumer { checkNotNull(vppApi, "VPP Api refference cannot be null"); - LispEidTableAddDelMap request = new LispEidTableAddDelMap(); + OneEidTableAddDelMap request = new OneEidTableAddDelMap(); request.isAdd = booleanToByte(addDel); request.vni = vni; request.dpTable = tableId; request.isL2 = booleanToByte(isL2); - getReply(vppApi.lispEidTableAddDelMap(request).toCompletableFuture()); + getReply(vppApi.oneEidTableAddDelMap(request).toCompletableFuture()); } default int extractVni(@Nonnull final InstanceIdentifier<? extends ChildOf<VniTable>> id) { |