diff options
author | Michal Cmarada <mcmarada@cisco.com> | 2019-04-01 11:39:35 +0200 |
---|---|---|
committer | Michal Cmarada <mcmarada@cisco.com> | 2019-04-08 13:39:49 +0200 |
commit | d726d0f173544c8d0078c5f918b5d086f6e85f79 (patch) | |
tree | 640e65411731b3a25abc2e7949de68dc625cf60e /v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate | |
parent | 89eeb336aebc92cd34c27b3fa325803c6478a461 (diff) |
HC2VPP-406: fix build errors after ODL bump to neon
This fixes build issues after ODL bump in Honeycomb (HONEYCOMB-443).
Change-Id: I3bf203dd60d12057595b15ce1ad59302dc14e2a0
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate')
5 files changed, 6 insertions, 6 deletions
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizer.java index edf3ab66f..ef15dbcdf 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/AfPacketCustomizer.java @@ -98,7 +98,7 @@ public class AfPacketCustomizer implements InitializingReaderCustomizer<AfPacket } final AfPacketDetailsReplyDump dump = afPacketDumpManager.getDump(id, ctx.getModificationCache()) - .or(new AfPacketDetailsReplyDump()); + .orElse(new AfPacketDetailsReplyDump()); // Relying here that parent InterfaceCustomizer was invoked first to fill in the context with initial ifc mapping final AfPacketDetails afPacketDetails = dump.afPacketDetails.stream() .filter(detail -> detail.swIfIndex == index) diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java index 8fe0f0379..44a22d9b1 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/InterconnectionReadUtils.java @@ -84,7 +84,7 @@ final class InterconnectionReadUtils implements InterfaceDataTranslator { LOG.debug("Interface details for interface: {}, details: {}", ifaceName, iface); final BridgeDomainDetailsReplyDump dumpReply = bdDumpManager.getDump(id, ctx.getModificationCache()) - .or(new BridgeDomainDetailsReplyDump()); + .orElse(new BridgeDomainDetailsReplyDump()); for (final BridgeDomainDetails bd : dumpReply.bridgeDomainDetails) { final Optional<BridgeDomainSwIf> bdIfAssignment = getBridgeDomainSwIf(ifaceId, bd); if (bdIfAssignment.isPresent()) { diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2Customizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2Customizer.java index 6919c94fe..1af4af64c 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2Customizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/TapV2Customizer.java @@ -105,7 +105,7 @@ public class TapV2Customizer extends FutureJVppCustomizer LOG.debug("Reading attributes for tapV2 interface: {}", key.getName()); final SwInterfaceTapV2DetailsReplyDump reply = tapV2DumpManager.getDump(id, ctx.getModificationCache()) - .or(new SwInterfaceTapV2DetailsReplyDump()); + .orElse(new SwInterfaceTapV2DetailsReplyDump()); final Optional<SwInterfaceTapV2Details> detail = reply.swInterfaceTapV2Details.stream() .filter(d -> d.swIfIndex == index) diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java index d0e8bd50a..561b06738 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/VhostUserCustomizer.java @@ -108,7 +108,7 @@ public class VhostUserCustomizer implements InitializingReaderCustomizer<VhostUs final SwInterfaceVhostUserDetailsReplyDump dump = vhostDumpManager.getDump(id, ctx.getModificationCache()) - .or(new SwInterfaceVhostUserDetailsReplyDump()); + .orElse(new SwInterfaceVhostUserDetailsReplyDump()); // Relying here that parent InterfaceCustomizer was invoked first to fill in the context with initial ifc mapping final SwInterfaceVhostUserDetails swInterfaceVhostUserDetails = dump.swInterfaceVhostUserDetails.stream() diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java index b6e850982..9e4c94d81 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheDumpManagerImpl.java @@ -96,7 +96,7 @@ final class InterfaceCacheDumpManagerImpl implements InterfaceCacheDumpManager { identifier); final SwInterfaceDetailsReplyDump reply = specificDumpManager.getDump(identifier, ctx.getModificationCache(), interfaceName) - .or(new SwInterfaceDetailsReplyDump()); + .orElse(new SwInterfaceDetailsReplyDump()); if (reply.swInterfaceDetails.isEmpty()) { return null; @@ -113,7 +113,7 @@ final class InterfaceCacheDumpManagerImpl implements InterfaceCacheDumpManager { LOG.debug("Performing dump[{}]", identifier); final SwInterfaceDetailsReplyDump dump = fullDumpManager.getDump(identifier, cache) - .or(new SwInterfaceDetailsReplyDump()); + .orElse(new SwInterfaceDetailsReplyDump()); // naming context initialization must be done here, as it is uses getName in next step, therefore it would // create artificial mapping for every interface, because this happens before interface dump is processed |