diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-08-23 16:19:41 +0200 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2017-08-28 11:02:30 +0200 |
commit | 7e90b6c5f8a605470dd388bf3c31d9f5beb2724c (patch) | |
tree | f209149bfbb7525558c0ac3f9370cbcb78eeb7c1 /nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java | |
parent | fe05c59bb2328bb6494cc3f0c994e8f10178f136 (diff) |
DumpCacheManager: make dumpParams optional
Requires https://gerrit.fd.io/r/#/c/8185/
Change-Id: Ib2d529366bd3cf6bb292014026ab8053a19c0ed7
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java')
-rw-r--r-- | nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java index 0fd149e5a..77b5b2cf6 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/read/ExternalIpPoolCustomizer.java @@ -99,7 +99,7 @@ final class ExternalIpPoolCustomizer implements final Long poolId = id.firstKeyOf(ExternalIpAddressPool.class).getPoolId(); final List<Nat44AddressDetails> nat44Details = - nat44DumpMgr.getDump(id, ctx.getModificationCache(), null) + nat44DumpMgr.getDump(id, ctx.getModificationCache()) .or(new Nat44AddressDetailsReplyDump()).nat44AddressDetails; final int nat44PoolCount = nat44Details.size(); @@ -109,7 +109,7 @@ final class ExternalIpPoolCustomizer implements readPoolIp(builder, detail.ipAddress); setPoolType(builder, NatPoolType.Nat44); } else { - final List<Nat64PoolAddrDetails> nat64Details = nat64DumpMgr.getDump(id, ctx.getModificationCache(), null) + final List<Nat64PoolAddrDetails> nat64Details = nat64DumpMgr.getDump(id, ctx.getModificationCache()) .or(new Nat64PoolAddrDetailsReplyDump()).nat64PoolAddrDetails; final int nat64PoolCount = nat64Details.size(); final int nat64PoolPosition = Math.toIntExact(poolId) - nat44PoolCount; @@ -152,14 +152,14 @@ final class ExternalIpPoolCustomizer implements // That's why the write and read is not symmetrical in terms of data structure, instead, // this customizer also returns every single address as a 32 prefix and assigns an artificial key to them - long addressCount = nat44DumpMgr.getDump(id, ctx.getModificationCache(), null) + long addressCount = nat44DumpMgr.getDump(id, ctx.getModificationCache()) .or(new Nat44AddressDetailsReplyDump()).nat44AddressDetails.stream() .count(); // The ietf-nat model groups address pools for Nat44 and Nat64 under the same list, // but VPP uses different APIs, so we need an other dump: - addressCount += nat64DumpMgr.getDump(id, ctx.getModificationCache(), null) + addressCount += nat64DumpMgr.getDump(id, ctx.getModificationCache()) .or(new Nat64PoolAddrDetailsReplyDump()).nat64PoolAddrDetails.stream() .count(); |