From b90883ad2d0ae38e9729254d4a04512cdbe725a6 Mon Sep 17 00:00:00 2001
From: Gregory Kurtzer <gmkurtzer@gmail.com>
Date: Fri, 22 Oct 2021 16:10:12 -0700
Subject: [PATCH] Properly increment IP addresses on multi-node set

---
 internal/app/wwctl/node/set/main.go | 14 ++++++++++----
 internal/app/wwctl/node/set/root.go |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/internal/app/wwctl/node/set/main.go b/internal/app/wwctl/node/set/main.go
index 7f066163..725266aa 100644
--- a/internal/app/wwctl/node/set/main.go
+++ b/internal/app/wwctl/node/set/main.go
@@ -17,6 +17,7 @@ import (
 
 func CobraRunE(cmd *cobra.Command, args []string) error {
 	var err error
+	var count uint
 	var SetProfiles []string
 
 	nodeDB, err := node.New()
@@ -100,8 +101,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		}
 
 		if SetIpmiIpaddr != "" {
-			wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting IPMI IP address to: %s\n", n.Id.Get(), SetIpmiIpaddr)
-			n.IpmiIpaddr.Set(SetIpmiIpaddr)
+			NewIpaddr := util.IncrementIPv4(SetIpmiIpaddr, count)
+			wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting IPMI IP address to: %s\n", n.Id.Get(), NewIpaddr)
+			n.IpmiIpaddr.Set(NewIpaddr)
 		}
 
 		if SetIpmiNetmask != "" {
@@ -183,13 +185,15 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 				os.Exit(1)
 			}
 
+			NewIpaddr := util.IncrementIPv4(SetIpaddr, count)
+
 			if _, ok := n.NetDevs[SetNetDev]; !ok {
 				var nd node.NetDevEntry
 				n.NetDevs[SetNetDev] = &nd
 			}
 
-			wwlog.Printf(wwlog.VERBOSE, "Node: %s:%s, Setting Ipaddr to: %s\n", n.Id.Get(), SetNetDev, SetIpaddr)
-			n.NetDevs[SetNetDev].Ipaddr.Set(SetIpaddr)
+			wwlog.Printf(wwlog.VERBOSE, "Node: %s:%s, Setting Ipaddr to: %s\n", n.Id.Get(), SetNetDev, NewIpaddr)
+			n.NetDevs[SetNetDev].Ipaddr.Set(NewIpaddr)
 		}
 		if SetNetmask != "" {
 			if SetNetDev == "" {
@@ -303,6 +307,8 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 			wwlog.Printf(wwlog.ERROR, "%s\n", err)
 			os.Exit(1)
 		}
+
+		count++
 	}
 
 	if SetYes {
diff --git a/internal/app/wwctl/node/set/root.go b/internal/app/wwctl/node/set/root.go
index 86ea559e..767bb94c 100644
--- a/internal/app/wwctl/node/set/root.go
+++ b/internal/app/wwctl/node/set/root.go
@@ -105,13 +105,13 @@ func init() {
 	}); err != nil {
 		log.Println(err)
 	}
-	baseCmd.PersistentFlags().StringVar(&SetIpmiIpaddr, "ipmi", "", "Set the node's IPMI IP address")
+	baseCmd.PersistentFlags().StringVar(&SetIpmiIpaddr, "ipmiaddr", "", "Set the node's IPMI IP address")
 	baseCmd.PersistentFlags().StringVar(&SetIpmiNetmask, "ipminetmask", "", "Set the node's IPMI netmask")
 	baseCmd.PersistentFlags().StringVar(&SetIpmiPort, "ipmiport", "", "Set the node's IPMI port")
 	baseCmd.PersistentFlags().StringVar(&SetIpmiGateway, "ipmigateway", "", "Set the node's IPMI gateway")
 	baseCmd.PersistentFlags().StringVar(&SetIpmiUsername, "ipmiuser", "", "Set the node's IPMI username")
 	baseCmd.PersistentFlags().StringVar(&SetIpmiPassword, "ipmipass", "", "Set the node's IPMI password")
-	baseCmd.PersistentFlags().StringVar(&SetIpmiInterface, "ipmiinterface", "", "Set the node's IPMI interface (defaults to 'lan' if empty)")
+	baseCmd.PersistentFlags().StringVar(&SetIpmiInterface, "ipmiinterface", "", "Set the node's IPMI interface (defaults: 'lan')")
 	baseCmd.PersistentFlags().StringSliceVar(&SetAddProfile, "addprofile", []string{}, "Add Profile(s) to node")
 	baseCmd.PersistentFlags().StringSliceVar(&SetDelProfile, "delprofile", []string{}, "Remove Profile(s) to node")
 	baseCmd.PersistentFlags().StringVarP(&SetProfile, "profile", "P", "", "Set the node's profile members (comma separated)")