From f031dcade0a8a9b8b7d6af4f4afe0d690e9246bc Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 16 May 2018 12:02:01 +0200 Subject: HC2VPP-322: ensure at most one nat64-prefix is configured per NAT instance Change-Id: Ic52b386475836e8f1a749cccaafe3bb4e192d0b7 Signed-off-by: Marek Gradzki --- .../hc2vpp/nat/write/Nat64PrefixesCustomizer.java | 2 - .../io/fd/hc2vpp/nat/write/PolicyCustomizer.java | 5 ++ .../fd/hc2vpp/nat/write/PolicyCustomizerTest.java | 79 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/PolicyCustomizerTest.java (limited to 'nat') 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 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 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 diff --git a/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/PolicyCustomizerTest.java b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/PolicyCustomizerTest.java new file mode 100644 index 000000000..cde2c31f0 --- /dev/null +++ b/nat/nat2vpp/src/test/java/io/fd/hc2vpp/nat/write/PolicyCustomizerTest.java @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.fd.hc2vpp.nat.write; + +import static io.fd.hc2vpp.nat.NatIds.NAT_INSTANCES_ID; +import static org.mockito.Mockito.mock; + +import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; +import io.fd.honeycomb.translate.write.WriteFailedException; +import java.util.Arrays; +import java.util.Collections; +import org.junit.Test; +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.nat.rev180223.nat.instances.Instance; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180223.nat.instances.InstanceKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180223.nat.instances.instance.Policy; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180223.nat.instances.instance.PolicyBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180223.nat.instances.instance.PolicyKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180223.nat.instances.instance.policy.Nat64Prefixes; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.nat.rev180223.nat.instances.instance.policy.Nat64PrefixesBuilder; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +public class PolicyCustomizerTest extends WriterCustomizerTest { + + private static final long VRF_ID = 123; + private static final InstanceIdentifier NAT_INSTANCE_ID = + NAT_INSTANCES_ID.child(Instance.class, new InstanceKey(VRF_ID)); + private static final InstanceIdentifier INVALID_POLICY_ID = + NAT_INSTANCE_ID.child(Policy.class, new PolicyKey(1L)); + private static final InstanceIdentifier DEFAULT_POLICY_ID = + NAT_INSTANCE_ID.child(Policy.class, new PolicyKey(0L)); + private static final Nat64Prefixes P1 = + new Nat64PrefixesBuilder().setNat64Prefix(new Ipv6Prefix("2001:db8::1/32")).build(); + private static final Nat64Prefixes P2 = + new Nat64PrefixesBuilder().setNat64Prefix(new Ipv6Prefix("2001:db8::2/32")).build(); + + private PolicyCustomizer customizer; + + @Override + protected void setUpTest() throws Exception { + customizer = new PolicyCustomizer(); + } + + @Test(expected = IllegalArgumentException.class) + public void testInvalidPolicyId() throws WriteFailedException { + customizer.writeCurrentAttributes(INVALID_POLICY_ID, mock(Policy.class), writeContext); + } + + @Test + public void testNoNat64Prefixes() throws WriteFailedException { + customizer.writeCurrentAttributes(DEFAULT_POLICY_ID, mock(Policy.class), writeContext); + } + + @Test + public void testSingleNat64Prefix() throws WriteFailedException { + final Policy policy = new PolicyBuilder().setNat64Prefixes(Collections.singletonList(P1)).build(); + customizer.writeCurrentAttributes(DEFAULT_POLICY_ID, policy, writeContext); + } + + @Test(expected = IllegalArgumentException.class) + public void testTwoNat64Prefixes() throws WriteFailedException { + final Policy policy = new PolicyBuilder().setNat64Prefixes(Arrays.asList(P1, P2)).build(); + customizer.writeCurrentAttributes(DEFAULT_POLICY_ID, policy, writeContext); + } +} \ No newline at end of file -- cgit 1.2.3-korg