From 120814fa499b431e1da7c46e9648781483a894b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Fri, 24 Nov 2023 14:50:17 +0100
Subject: [PATCH] Add IPv6 support for network attachements
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When NETWORK_ISOLATION_IPV6 (default: false) is true, configure the NAD for IPv6.
Likewize NETWORK_ISOLATION_IPV4 (default: true) controls if IPv4 is configured.

Enabling both IPv6 and IPv4 should work for dual stack.

Signed-off-by: Harald Jensås <hjensas@redhat.com>
---
 scripts/gen-netatt.sh | 125 +++++++++++++++++++++++++++++-------------
 1 file changed, 88 insertions(+), 37 deletions(-)

diff --git a/scripts/gen-netatt.sh b/scripts/gen-netatt.sh
index 66df9df3c..e2041bd65 100644
--- a/scripts/gen-netatt.sh
+++ b/scripts/gen-netatt.sh
@@ -39,15 +39,6 @@ if [ -z "${VLAN_STEP}" ]; then
     echo "Please set VLAN_STEP"; exit 1
 fi
 
-if [ -z "$IPV4_ENABLED" ] && [ -z "$IPV6_ENABLED" ]; then
-    echo "Please enable either IPv4 or IPv6 by setting IPV4_ENABLED or IPV6_ENABLED"; exit 1
-fi
-
-if [ -n "$IPV4_ENABLED" ] && [ -n "$IPV6_ENABLED" ]; then
-    echo "Dual stack not supported, cannot enable both IPv4 and IPv6"; exit 1
-fi
-
-
 echo DEPLOY_DIR ${DEPLOY_DIR}
 echo INTERFACE ${INTERFACE}
 echo VLAN_START ${VLAN_START}
@@ -78,21 +69,36 @@ spec:
       "master": "${BRIDGE_NAME}",
       "ipam": {
         "type": "whereabouts",
+        "ipRanges": [
 EOF_CAT
 if [ -n "$IPV4_ENABLED" ]; then
     cat >> ${DEPLOY_DIR}/ctlplane.yaml <<EOF_CAT
-        "range": "${CTLPLANE_IP_ADDRESS_PREFIX}.0/24",
-        "range_start": "${CTLPLANE_IP_ADDRESS_PREFIX}.30",
-        "range_end": "${CTLPLANE_IP_ADDRESS_PREFIX}.70"
+          {
+            "range": "${CTLPLANE_IP_ADDRESS_PREFIX}.0/24",
+            "range_start": "${CTLPLANE_IP_ADDRESS_PREFIX}.30",
+            "range_end": "${CTLPLANE_IP_ADDRESS_PREFIX}.70"
 EOF_CAT
-elif [ -n "$IPV6_ENABLED" ]; then
+fi
+if [ -n "$IPV4_ENABLED" ] && [ -n "$IPV6_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/ctlplane.yaml <<EOF_CAT
+          },
+EOF_CAT
+elif [ -n "$IPV4_ENABLED" ] && [ -z "$IPV6_ENABLED" ]; then
     cat >> ${DEPLOY_DIR}/ctlplane.yaml <<EOF_CAT
-        "range": "${CTLPLANE_IPV6_ADDRESS_PREFIX}0/64",
-        "range_start": "${CTLPLANE_IPV6_ADDRESS_PREFIX}30",
-        "range_end": "${CTLPLANE_IPV6_ADDRESS_PREFIX}70"
+          }
+EOF_CAT
+fi
+if [ -n "$IPV6_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/ctlplane.yaml <<EOF_CAT
+          {
+            "range": "${CTLPLANE_IPV6_ADDRESS_PREFIX}0/64",
+            "range_start": "${CTLPLANE_IPV6_ADDRESS_PREFIX}30",
+            "range_end": "${CTLPLANE_IPV6_ADDRESS_PREFIX}70"
+          }
 EOF_CAT
 fi
 cat >> ${DEPLOY_DIR}/ctlplane.yaml <<EOF_CAT
+        ]
       }
     }
 EOF_CAT
@@ -114,21 +120,36 @@ spec:
       "master": "${INTERFACE}.${VLAN_START}",
       "ipam": {
         "type": "whereabouts",
+        "ipRanges": [
 EOF_CAT
 if [ -n "$IPV4_ENABLED" ]; then
     cat >> ${DEPLOY_DIR}/internalapi.yaml <<EOF_CAT
-        "range": "172.17.0.0/24",
-        "range_start": "172.17.0.30",
-        "range_end": "172.17.0.70"
+          {
+            "range": "172.17.0.0/24",
+            "range_start": "172.17.0.30",
+            "range_end": "172.17.0.70"
+EOF_CAT
+fi
+if [ -n "$IPV4_ENABLED" ] && [ -n "$IPV6_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/internalapi.yaml <<EOF_CAT
+          },
+EOF_CAT
+elif [ -n "$IPV4_ENABLED" ] && [ -z "$IPV6_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/internalapi.yaml <<EOF_CAT
+          }
 EOF_CAT
-elif [ -n "$IPV6_ENABLED" ]; then
+fi
+if [ -n "$IPV6_ENABLED" ]; then
     cat >> ${DEPLOY_DIR}/internalapi.yaml <<EOF_CAT
-        "range": "fd00:bbbb::/64",
-        "range_start": "fd00:bbbb::30",
-        "range_end": "fd00:bbbb::70"
+          {
+            "range": "fd00:bbbb::/64",
+            "range_start": "fd00:bbbb::30",
+            "range_end": "fd00:bbbb::70"
+          }
 EOF_CAT
 fi
 cat >> ${DEPLOY_DIR}/internalapi.yaml <<EOF_CAT
+        ]
       }
     }
 EOF_CAT
@@ -150,21 +171,36 @@ spec:
       "master": "${INTERFACE}.$((${VLAN_START}+${VLAN_STEP}))",
       "ipam": {
         "type": "whereabouts",
+        "ipRanges": [
 EOF_CAT
 if [ -n "$IPV4_ENABLED" ]; then
     cat >> ${DEPLOY_DIR}/storage.yaml <<EOF_CAT
-        "range": "172.18.0.0/24",
-        "range_start": "172.18.0.30",
-        "range_end": "172.18.0.70"
+          {
+            "range": "172.18.0.0/24",
+            "range_start": "172.18.0.30",
+            "range_end": "172.18.0.70"
+EOF_CAT
+fi
+if [ -n "$IPV4_ENABLED" ] && [ -n "$IPV6_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/storage.yaml <<EOF_CAT
+          },
 EOF_CAT
-elif [ -n "$IPV6_ENABLED" ]; then
+elif [ -n "$IPV4_ENABLED" ] && [ -z "$IPV6_ENABLED" ]; then
     cat >> ${DEPLOY_DIR}/storage.yaml <<EOF_CAT
-        "range": "fd00:cccc::/64",
-        "range_start": "fd00:cccc::30",
-        "range_end": "fd00:cccc::70"
+          }
+EOF_CAT
+fi
+if [ -n "$IPV6_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/storage.yaml <<EOF_CAT
+          {
+            "range": "fd00:cccc::/64",
+            "range_start": "fd00:cccc::30",
+            "range_end": "fd00:cccc::70"
+          }
 EOF_CAT
 fi
 cat >> ${DEPLOY_DIR}/storage.yaml <<EOF_CAT
+        ]
       }
     }
 EOF_CAT
@@ -186,21 +222,36 @@ spec:
       "master": "${INTERFACE}.$((${VLAN_START}+$((${VLAN_STEP}*2))))",
       "ipam": {
         "type": "whereabouts",
+        "ipRanges": [
 EOF_CAT
 if [ -n "$IPV4_ENABLED" ]; then
     cat >> ${DEPLOY_DIR}/tenant.yaml <<EOF_CAT
-        "range": "172.19.0.0/24",
-        "range_start": "172.19.0.30",
-        "range_end": "172.19.0.70"
+          {
+            "range": "172.19.0.0/24",
+            "range_start": "172.19.0.30",
+            "range_end": "172.19.0.70"
+EOF_CAT
+fi
+if [ -n "$IPV4_ENABLED" ] && [ -n "$IPV6_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/tenant.yaml <<EOF_CAT
+          },
 EOF_CAT
-elif [ -n "$IPV6_ENABLED" ]; then
+elif [ -n "$IPV4_ENABLED" ] && [ -z "$IPV6_ENABLED" ]; then
     cat >> ${DEPLOY_DIR}/tenant.yaml <<EOF_CAT
-        "range": "fd00:dddd::/64",
-        "range_start": "fd00:dddd::30",
-        "range_end": "fd00:dddd::70"
+          }
+EOF_CAT
+fi
+if [ -n "$IPV6_ENABLED" ]; then
+    cat >> ${DEPLOY_DIR}/tenant.yaml <<EOF_CAT
+          {
+            "range": "fd00:dddd::/64",
+            "range_start": "fd00:dddd::30",
+            "range_end": "fd00:dddd::70"
+          }
 EOF_CAT
 fi
 cat >> ${DEPLOY_DIR}/tenant.yaml <<EOF_CAT
+        ]
       }
     }
 EOF_CAT