From: Vratko Polak <vrpolak@cisco.com>
Date: Mon, 6 Sep 2021 10:17:08 +0000 (+0200)
Subject: Fix in_mask values in nat44 udir suites
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=cd7342725b7a95ee530554eb768f94626c042cf4

Fix in_mask values in nat44 udir suites

New IPUtil.Vpp_Route_Add implementation detects wrong values,
as it refuses start addresses with host bits set.

Fixed by copying in_mask values from nearby ASTF suites.

Change-Id: I768c023bd004ce97b74199d70e5768c5e948d429
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.robot
index fb218ced81..73eb6b6a97 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.robot
@@ -75,7 +75,7 @@
 # NAT settings
 | ${nat_mode}= | endpoint-dependent
 | ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${8}
+| ${in_mask}= | ${22}
 | ${out_net}= | 68.142.68.0
 | ${out_net_end}= | 68.142.68.0
 | ${out_mask}= | ${32}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot
index 59e25b7e8e..6a3e8b4abe 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.robot
@@ -75,7 +75,7 @@
 # NAT settings
 | ${nat_mode}= | endpoint-dependent
 | ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${8}
+| ${in_mask}= | ${14}
 | ${out_net}= | 68.142.68.0
 | ${out_net_end}= | 68.142.68.255
 | ${out_mask}= | ${24}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.robot
index 8b6e19bc82..c391df4324 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-udir-ndrpdr.robot
@@ -75,7 +75,7 @@
 # NAT settings
 | ${nat_mode}= | endpoint-dependent
 | ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${8}
+| ${in_mask}= | ${20}
 | ${out_net}= | 68.142.68.0
 | ${out_net_end}= | 68.142.68.3
 | ${out_mask}= | ${30}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot
index 6368ea6df3..019ac77ef0 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.robot
@@ -75,7 +75,7 @@
 # NAT settings
 | ${nat_mode}= | endpoint-dependent
 | ${in_net}= | 192.168.0.0
-| ${in_mask}= | ${8}
+| ${in_mask}= | ${16}
 | ${out_net}= | 68.142.68.0
 | ${out_net_end}= | 68.142.68.63
 | ${out_mask}= | ${26}