From 7fa153b048d960b1c45c483992fedabb80ae6970 Mon Sep 17 00:00:00 2001
From: Paul Bastide <pbastide@us.ibm.com>
Date: Fri, 27 Oct 2023 13:06:03 -0400
Subject: [PATCH] OCTOPUS-512: enhance the routes

Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
---
 modules/4_pvs_support/files/static-route.sh | 29 +++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/modules/4_pvs_support/files/static-route.sh b/modules/4_pvs_support/files/static-route.sh
index f6f8c49..e904c7f 100644
--- a/modules/4_pvs_support/files/static-route.sh
+++ b/modules/4_pvs_support/files/static-route.sh
@@ -70,18 +70,43 @@ for i in "${!entries[@]}"; do
 
     echo -n " ${SUBNET_MASK}, ${SUBNET_STR}, ${GATEWAY_FORMAT}" >> /etc/dhcp/classless-static-routes.conf
 done
+
+# Update the static routes for the power nodes.
+for NODE_IP in $(oc get nodes -l kubernetes.io/arch=ppc64le -owide --no-headers=true| awk '{print $6}')
+do
+    echo "NODE_IP to use for classless static route: ${NODE_IP}"
+    echo -n "," >> /etc/dhcp/classless-static-routes.conf
+
+    # Dev Test: 
+    SUBNET=($(echo ${NODE_IP} | sed 's|/| |g' | awk '{print $1}' | sed 's|\.| |g'))
+
+    # DHCPD requires a mask in a special form. We're relying on subnet masks and greatest bits determining how many numbers we include.
+    # Always 32-bit mask
+    SUBNET_STR="${SUBNET[0]},${SUBNET[1]},${SUBNET[2]},${SUBNET[3]}"
+    echo ${SUBNET_STR}
+
+    echo -n " 32, ${SUBNET_STR}, ${GATEWAY_FORMAT}" >> /etc/dhcp/classless-static-routes.conf
+done
+
+# Finally close the static routes
 echo ";" >> /etc/dhcp/classless-static-routes.conf
 
 echo "Static routes are:"
 cat /etc/dhcp/classless-static-routes.conf
+echo ""
+
+echo "Updating the dhcpd.conf include"
+cat << EOF >> /etc/dhcp/dhcpd.conf
+include "/etc/dhcp/classless-static-routes.conf";
+EOF
 
 echo "Restarting the dhcpd"
 systemctl restart dhcpd
 
 # Need to login to each Power Node
-for NODE_IP in $(oc get nodes -l kubernetes.io/arch=ppc64le -owide --no-headers=true| awk '
-{print $6}')
+for NODE_IP in $(oc get nodes -l kubernetes.io/arch=ppc64le -owide --no-headers=true| awk '{print $6}')
 do
+echo "Restarting NetworkManager at NODE_IP: ${NODE_IP}"
 ssh core@${NODE_IP} sudo systemctl restart NetworkManager
 done