From dd802680b2c15b2e1b541d45d177d2c643bb43ed Mon Sep 17 00:00:00 2001
From: Frode Nordahl <fnordahl@ubuntu.com>
Date: Thu, 2 Jan 2025 22:34:42 +0100
Subject: [PATCH] tests: Use IPv6 prefix reserved for documentation.

The test suite currently have references to 2001:1db8:: prefixes,
while RFC 3849 reserves 2001:db8::/32 for documentation.

Signed-off-by: Frode Nordahl <fnordahl@ubuntu.com>
Signed-off-by: Dumitru Ceara <dceara@redhat.com>
(cherry picked from commit 29980127b4af576c3671ce4f4ba9b24ae04dc64c)
---
 tests/system-common-macros.at | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at
index 07c1e1d433..19d378c071 100644
--- a/tests/system-common-macros.at
+++ b/tests/system-common-macros.at
@@ -383,8 +383,8 @@ ADD_NAMESPACES(sw11)
 ADD_VETH(sw11, sw11, br-int, "192.168.2.2/24", "f0:00:00:02:02:03", \
          "192.168.2.1")
 ADD_NAMESPACES(server)
-ADD_VETH(s1, server, br-ext, "2001:1db8:3333::2/64", "f0:00:00:01:02:05", \
-         "2001:1db8:3333::1", "nodad")
+ADD_VETH(s1, server, br-ext, "2001:db8:3333::2/64", "f0:00:00:01:02:05", \
+         "2001:db8:3333::1", "nodad")
 
 if test X"$1" = X"GR"; then
    check_uuid ovn-nbctl create Logical_Router name=R1 options:chassis=hv1
@@ -438,8 +438,8 @@ check ovn-nbctl --wait=hv sync
 cat > /etc/dhcp/dhcpd.conf <<EOF
 option dhcp-rebinding-time 10;
 option dhcp-renewal-time 5;
-subnet6 2001:1db8:3333::/56 {
-    prefix6 2001:1db8:3333:100:: 2001:1db8:3333:111:: /64;
+subnet6 2001:db8:3333::/56 {
+    prefix6 2001:db8:3333:100:: 2001:db8:3333:111:: /64;
 }
 EOF
 rm -f /var/lib/dhcp/dhcpd6.leases
@@ -455,14 +455,14 @@ check ovn-nbctl --wait=hv sync
 OVS_WAIT_WHILE([test "$(ovn-nbctl get logical_router_port rp-public ipv6_prefix | cut -c4-15)" = ""])
 OVS_WAIT_WHILE([test "$(ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix | cut -c4-15)" = ""])
 
-AT_CHECK([ovn-nbctl get logical_router_port rp-public ipv6_prefix | cut -c3-16], [0], [dnl
-[2001:1db8:3333]
+AT_CHECK([ovn-nbctl get logical_router_port rp-public ipv6_prefix | cut -c3-15], [0], [dnl
+[2001:db8:3333]
 ])
-AT_CHECK([ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix | cut -c3-16], [0], [dnl
-[2001:1db8:3333]
+AT_CHECK([ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix | cut -c3-15], [0], [dnl
+[2001:db8:3333]
 ])
 
-hex_prefix=0x20011db8
+hex_prefix=0x20010db8
 ovn-nbctl list logical_router_port rp-public > /tmp/rp-public
 
 # Wait for 2 renew on each port.
@@ -498,8 +498,8 @@ OVS_WAIT_UNTIL([
 
 check ovn-nbctl set logical_router_port rp-sw0 options:prefix=false
 check ovn-nbctl clear logical_router_port rp-sw0 ipv6_prefix
-OVS_WAIT_WHILE([test "$(ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix | cut -c3-16)" = "[2001:1db8:3333]"])
-AT_CHECK([ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix | cut -c3-16], [0], [dnl
+OVS_WAIT_WHILE([test "$(ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix | cut -c3-15)" = "[2001:db8:3333]"])
+AT_CHECK([ovn-nbctl get logical_router_port rp-sw0 ipv6_prefix | cut -c3-15], [0], [dnl
 []
 ])