diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2018-05-16 12:02:01 +0200 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2018-05-17 05:20:09 +0000 |
| commit | f031dcade0a8a9b8b7d6af4f4afe0d690e9246bc (patch) | |
| tree | 45f6fde0a687ec5d42feafe84990d9ef0fe09e14 /nat/nat2vpp/src/main/java/io/fd/hc2vpp | |
| parent | bbf4b6b301975700d8f70fa96bf8080f9d2e00f6 (diff) | |
HC2VPP-322: ensure at most one nat64-prefix is configured per NAT instance
Change-Id: Ic52b386475836e8f1a749cccaafe3bb4e192d0b7
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'nat/nat2vpp/src/main/java/io/fd/hc2vpp')
| -rw-r--r-- | nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizer.java | 2 | ||||
| -rw-r--r-- | nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/PolicyCustomizer.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizer.java index 33dad0d1b..438adae91 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/Nat64PrefixesCustomizer.java @@ -57,8 +57,6 @@ final class Nat64PrefixesCustomizer final int natInstanceId = id.firstKeyOf(Instance.class).getId().intValue(); LOG.debug("Configuring nat64 prefix: {} for nat-instance(vrf): {}", dataAfter, natInstanceId); - // TODO(HC2VPP-320): ensure at most one prefix is configured per NAT instance - // VPP does not support configuring different nat64-prefixes depending on ipv4 destination prefix: final List<DestinationIpv4Prefix> destinationIpv4PrefixList = dataAfter.getDestinationIpv4Prefix(); checkArgument(destinationIpv4PrefixList == null || destinationIpv4PrefixList.isEmpty(), diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/PolicyCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/PolicyCustomizer.java index ecc340f38..43f529042 100644 --- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/PolicyCustomizer.java +++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/PolicyCustomizer.java @@ -44,6 +44,11 @@ final class PolicyCustomizer implements ListWriterCustomizer<Policy, PolicyKey> final Long policyId = id.firstKeyOf(Policy.class).getId(); checkArgument(policyId == 0, "Only single policy per NAT instance (VRF) is supported (expected id=0, but %s given)", policyId); + + if (dataAfter.getNat64Prefixes() != null) { + final int prefixCount = dataAfter.getNat64Prefixes().size(); + checkArgument(prefixCount <= 1, "Only single nat64-prefix is supported, but %s given", prefixCount); + } } @Override |