From f279863d7f9a2514bb5a2a1f4608821079900b4d Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Fri, 11 Mar 2022 12:27:36 +0100 Subject: [PATCH] node list prints combine valuse for node --- internal/app/wwctl/node/list/main.go | 4 ++-- internal/pkg/node/methods.go | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/internal/app/wwctl/node/list/main.go b/internal/app/wwctl/node/list/main.go index 4fe66890..ddb5b960 100644 --- a/internal/app/wwctl/node/list/main.go +++ b/internal/app/wwctl/node/list/main.go @@ -43,8 +43,8 @@ func CobraRunE(cmd *cobra.Command, args []string) error { fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Container", node.ContainerName.Source(), node.ContainerName.Print()) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "KernelOverride", node.KernelOverride.Source(), node.KernelOverride.Print()) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "KernelArgs", node.KernelArgs.Source(), node.KernelArgs.Print()) - fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "SystemOverlay", node.SystemOverlay.Source(), node.SystemOverlay.Print()) - fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "RuntimeOverlay", node.RuntimeOverlay.Source(), node.RuntimeOverlay.Print()) + fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "SystemOverlay", node.SystemOverlay.Source(), node.SystemOverlay.PrintComb()) + fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "RuntimeOverlay", node.RuntimeOverlay.Source(), node.RuntimeOverlay.PrintComb()) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Ipxe", node.Ipxe.Source(), node.Ipxe.Print()) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Init", node.Init.Source(), node.Init.Print()) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Root", node.Root.Source(), node.Root.Print()) diff --git a/internal/pkg/node/methods.go b/internal/pkg/node/methods.go index 58fb58e5..fe4e7b9a 100644 --- a/internal/pkg/node/methods.go +++ b/internal/pkg/node/methods.go @@ -157,6 +157,13 @@ func (ent *Entry) Print() string { return "--" } +func (ent *Entry) PrintComb() string { + if ent.value != "" && ent.def != "" { + return "[" + ent.value + "," + ent.def + "]" + } + return ent.PrintComb() +} + func (ent *Entry) PrintB() bool { return ent.GetB() }