From 3caeac0c9d3af56aa40888ab96998b7561e7684e Mon Sep 17 00:00:00 2001
From: Gregory Kurtzer <gmkurtzer@gmail.com>
Date: Thu, 26 Nov 2020 19:18:28 -0800
Subject: [PATCH] Updates to overlay cli for NodeDB updates

---
 internal/app/wwctl/overlay/build/main.go  |  4 ++--
 internal/app/wwctl/overlay/chmod/main.go  |  4 ++--
 internal/app/wwctl/overlay/create/main.go |  4 ++--
 internal/app/wwctl/overlay/delete/main.go |  4 ++--
 internal/app/wwctl/overlay/edit/main.go   |  4 ++--
 internal/app/wwctl/overlay/imprt/main.go  |  4 ++--
 internal/app/wwctl/overlay/list/main.go   | 12 ++++++------
 internal/app/wwctl/overlay/mkdir/main.go  |  4 ++--
 internal/app/wwctl/overlay/root.go        |  2 --
 9 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/internal/app/wwctl/overlay/build/main.go b/internal/app/wwctl/overlay/build/main.go
index 24ed4561..bf8a3b4f 100644
--- a/internal/app/wwctl/overlay/build/main.go
+++ b/internal/app/wwctl/overlay/build/main.go
@@ -43,7 +43,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 	wwlog.Printf(wwlog.DEBUG, "Checking on system overlay update\n")
 	if SystemOverlay == true || BuildAll == true {
 		wwlog.Printf(wwlog.INFO, "Updating System Overlays...\n")
-		err := overlay.SystemBuild(updateNodes, true)
+		err := overlay.BuildSystemOverlay(updateNodes)
 		if err != nil {
 			wwlog.Printf(wwlog.WARN, "Some system overlays failed to be generated: %s\n", err)
 		}
@@ -52,7 +52,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 	wwlog.Printf(wwlog.DEBUG, "Checking on system overlay update\n")
 	if SystemOverlay == false || BuildAll == true {
 		wwlog.Printf(wwlog.INFO, "Updating Runtime Overlays...\n")
-		err := overlay.RuntimeBuild(updateNodes, true)
+		err := overlay.BuildRuntimeOverlay(updateNodes)
 		if err != nil {
 			wwlog.Printf(wwlog.WARN, "Some runtime overlays failed to be generated\n")
 		}
diff --git a/internal/app/wwctl/overlay/chmod/main.go b/internal/app/wwctl/overlay/chmod/main.go
index bd8352ba..a13b480b 100644
--- a/internal/app/wwctl/overlay/chmod/main.go
+++ b/internal/app/wwctl/overlay/chmod/main.go
@@ -73,10 +73,10 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 		if SystemOverlay == true {
 			wwlog.Printf(wwlog.INFO, "Updating System Overlays...\n")
-			return overlay.SystemBuild(updateNodes, true)
+			return overlay.BuildSystemOverlay(updateNodes)
 		} else {
 			wwlog.Printf(wwlog.INFO, "Updating Runtime Overlays...\n")
-			return overlay.RuntimeBuild(updateNodes, true)
+			return overlay.BuildRuntimeOverlay(updateNodes)
 		}
 	}
 
diff --git a/internal/app/wwctl/overlay/create/main.go b/internal/app/wwctl/overlay/create/main.go
index 237341cb..c4a62062 100644
--- a/internal/app/wwctl/overlay/create/main.go
+++ b/internal/app/wwctl/overlay/create/main.go
@@ -57,10 +57,10 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 		if SystemOverlay == true {
 			wwlog.Printf(wwlog.INFO, "Updating System Overlays...\n")
-			return overlay.SystemBuild(updateNodes, true)
+			return overlay.BuildSystemOverlay(updateNodes)
 		} else {
 			wwlog.Printf(wwlog.INFO, "Updating Runtime Overlays...\n")
-			return overlay.RuntimeBuild(updateNodes, true)
+			return overlay.BuildRuntimeOverlay(updateNodes)
 		}
 	}
 
diff --git a/internal/app/wwctl/overlay/delete/main.go b/internal/app/wwctl/overlay/delete/main.go
index a59e8c61..a8199efb 100644
--- a/internal/app/wwctl/overlay/delete/main.go
+++ b/internal/app/wwctl/overlay/delete/main.go
@@ -119,10 +119,10 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 		if SystemOverlay == true {
 			wwlog.Printf(wwlog.INFO, "Updating System Overlays...\n")
-			return overlay.SystemBuild(updateNodes, true)
+			return overlay.BuildSystemOverlay(updateNodes)
 		} else {
 			wwlog.Printf(wwlog.INFO, "Updating Runtime Overlays...\n")
-			return overlay.RuntimeBuild(updateNodes, true)
+			return overlay.BuildRuntimeOverlay(updateNodes)
 		}
 	}
 
diff --git a/internal/app/wwctl/overlay/edit/main.go b/internal/app/wwctl/overlay/edit/main.go
index cebe1021..836c96fe 100644
--- a/internal/app/wwctl/overlay/edit/main.go
+++ b/internal/app/wwctl/overlay/edit/main.go
@@ -117,10 +117,10 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 		if SystemOverlay == true {
 			wwlog.Printf(wwlog.INFO, "Updating System Overlays...\n")
-			return overlay.SystemBuild(updateNodes, true)
+			return overlay.BuildSystemOverlay(updateNodes)
 		} else {
 			wwlog.Printf(wwlog.INFO, "Updating Runtime Overlays...\n")
-			return overlay.RuntimeBuild(updateNodes, true)
+			return overlay.BuildRuntimeOverlay(updateNodes)
 		}
 	}
 
diff --git a/internal/app/wwctl/overlay/imprt/main.go b/internal/app/wwctl/overlay/imprt/main.go
index 8374736f..9b1228ee 100644
--- a/internal/app/wwctl/overlay/imprt/main.go
+++ b/internal/app/wwctl/overlay/imprt/main.go
@@ -69,10 +69,10 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 		if SystemOverlay == true {
 			wwlog.Printf(wwlog.INFO, "Updating System Overlays...\n")
-			return overlay.SystemBuild(updateNodes, true)
+			return overlay.BuildSystemOverlay(updateNodes)
 		} else {
 			wwlog.Printf(wwlog.INFO, "Updating Runtime Overlays...\n")
-			return overlay.RuntimeBuild(updateNodes, true)
+			return overlay.BuildRuntimeOverlay(updateNodes)
 		}
 
 	}
diff --git a/internal/app/wwctl/overlay/list/main.go b/internal/app/wwctl/overlay/list/main.go
index 0266ac14..c5a7bfdc 100644
--- a/internal/app/wwctl/overlay/list/main.go
+++ b/internal/app/wwctl/overlay/list/main.go
@@ -31,14 +31,14 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		} else {
 			fmt.Printf("%-10s %5s %-5s %-18s %s\n", "PERM MODE", "UID", "GID", "SYSTEM-OVERLAY", "FILE PATH")
 		}
-		o, err = overlay.FindAllSystemOverlays()
+		o, err = overlay.FindSystemOverlays()
 	} else {
 		if ListLong == false {
 			fmt.Printf("%-30s %-12s %-12s\n", "RUNTIME OVERLAY NAME", "NODES", "FILES/DIRS")
 		} else {
 			fmt.Printf("%-10s %5s %-5s %-18s %s\n", "PERM MODE", "UID", "GID", "RUNTIME-OVERLAY", "FILE PATH")
 		}
-		o, err = overlay.FindAllRuntimeOverlays()
+		o, err = overlay.FindRuntimeOverlays()
 	}
 	if err != nil {
 		wwlog.Printf(wwlog.ERROR, "Could not get system overlays: %s\n", err)
@@ -53,12 +53,12 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 	for _, node := range nodeList {
 		if SystemOverlay == true {
-			if node.SystemOverlay.String() != "" {
-				set[node.SystemOverlay.String()] ++
+			if node.SystemOverlay.Get() != "" {
+				set[node.SystemOverlay.Get()] ++
 			}
 		} else {
-			if node.RuntimeOverlay.String() != "" {
-				set[node.RuntimeOverlay.String()] ++
+			if node.RuntimeOverlay.Get() != "" {
+				set[node.RuntimeOverlay.Get()] ++
 			}
 		}
 	}
diff --git a/internal/app/wwctl/overlay/mkdir/main.go b/internal/app/wwctl/overlay/mkdir/main.go
index ef38ae0f..3cb77f6d 100644
--- a/internal/app/wwctl/overlay/mkdir/main.go
+++ b/internal/app/wwctl/overlay/mkdir/main.go
@@ -66,10 +66,10 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 
 		if SystemOverlay == true {
 			wwlog.Printf(wwlog.INFO, "Updating System Overlays...\n")
-			return overlay.SystemBuild(updateNodes, true)
+			return overlay.BuildSystemOverlay(updateNodes)
 		} else {
 			wwlog.Printf(wwlog.INFO, "Updating Runtime Overlays...\n")
-			return overlay.RuntimeBuild(updateNodes, true)
+			return overlay.BuildRuntimeOverlay(updateNodes)
 		}
 	}
 
diff --git a/internal/app/wwctl/overlay/root.go b/internal/app/wwctl/overlay/root.go
index 7223f4ad..87e3abb5 100644
--- a/internal/app/wwctl/overlay/root.go
+++ b/internal/app/wwctl/overlay/root.go
@@ -10,7 +10,6 @@ import (
 	"github.com/hpcng/warewulf/internal/app/wwctl/overlay/list"
 	"github.com/hpcng/warewulf/internal/app/wwctl/overlay/mkdir"
 	"github.com/hpcng/warewulf/internal/app/wwctl/overlay/show"
-
 	"github.com/spf13/cobra"
 )
 
@@ -35,7 +34,6 @@ func init() {
 	baseCmd.AddCommand(build.GetCommand())
 	baseCmd.AddCommand(imprt.GetCommand())
 	baseCmd.AddCommand(chmod.GetCommand())
-
 }
 
 // GetRootCommand returns the root cobra.Command for the application.