From f092c3abf37230c0006b2fc8f494684b68a4b843 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Thu, 26 Nov 2020 20:36:44 -0800 Subject: [PATCH] Fixups for Groups --- internal/app/wwctl/group/list/main.go | 4 +- internal/app/wwctl/group/set/main.go | 188 +++----------------------- 2 files changed, 18 insertions(+), 174 deletions(-) diff --git a/internal/app/wwctl/group/list/main.go b/internal/app/wwctl/group/list/main.go index 9abbc31e..97a5370b 100644 --- a/internal/app/wwctl/group/list/main.go +++ b/internal/app/wwctl/group/list/main.go @@ -33,9 +33,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } } } else { - fmt.Printf("%-22s %-16s %-30s %-30s %-16s\n", "GROUP NAME", "DOMAINNAME", "KERNEL VERSION", "VNFS IMAGE", "RUNTIME OVERLAY") + fmt.Printf("%-22s %-16s %s\n", "GROUP NAME", "DOMAINNAME", "PROFILES") for _, g := range groups { - fmt.Printf("%-22s %-16s %-30s %-30s %-16s\n", g.GroupName.String(), g.DomainName.String(), g.KernelVersion.String(), g.Vnfs.String(), g.RuntimeOverlay.String()) + fmt.Printf("%-22s %-16s %s\n", g.Id, g.DomainName, g.Profiles) } } diff --git a/internal/app/wwctl/group/set/main.go b/internal/app/wwctl/group/set/main.go index e572e600..467e077f 100644 --- a/internal/app/wwctl/group/set/main.go +++ b/internal/app/wwctl/group/set/main.go @@ -46,7 +46,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { for _, a := range args { for _, g := range tmp { - if g.Id.String() == a { + if g.Id == a { groups = append(groups, g) } } @@ -58,183 +58,27 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } for _, g := range groups { - if SetVnfs != "" { - wwlog.Printf(wwlog.VERBOSE, "Group: %s, Setting vnfs to: %s\n", g.Id, SetVnfs) - err := nodeDB.SetGroupVal(g.Id.String(), "vnfs", SetVnfs) - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - - if SetClearNodes == true { - nodes, err := nodeDB.FindAllNodes() - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - for _, n := range nodes { - _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "vnfs", "") - } - } - } - - if SetKernel != "" { - wwlog.Printf(wwlog.VERBOSE, "Group: %s, Setting kernel to: %s\n", g.Id, SetVnfs) - err := nodeDB.SetGroupVal(g.Id.String(), "kernel", SetKernel) - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - - if SetClearNodes == true { - nodes, err := nodeDB.FindAllNodes() - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - for _, n := range nodes { - _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "kernel", "") - } - } - } if SetDomainName != "" { wwlog.Printf(wwlog.VERBOSE, "Group: %s, Setting domain name to: %s\n", g.Id, SetDomainName) - err := nodeDB.SetGroupVal(g.Id.String(), "domain", SetDomainName) - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } +// err := nodeDB.SetGroupVal(g.Id.String(), "domain", SetDomainName) +// if err != nil { +// wwlog.Printf(wwlog.ERROR, "%s\n", err) +// os.Exit(1) +// } - if SetClearNodes == true { - nodes, err := nodeDB.FindAllNodes() - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - for _, n := range nodes { - _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "domain", "") - } - } +// if SetClearNodes == true { +// nodes, err := nodeDB.FindAllNodes() +// if err != nil { +// wwlog.Printf(wwlog.ERROR, "%s\n", err) +// os.Exit(1) +// } +// for _, n := range nodes { +// _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "domain", "") +// } +// } } - if SetIpxe != "" { - wwlog.Printf(wwlog.VERBOSE, "Group: %s, Setting iPXE template to: %s\n", g.Id, SetIpxe) - err := nodeDB.SetGroupVal(g.Id.String(), "ipxe", SetIpxe) - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - - if SetClearNodes == true { - nodes, err := nodeDB.FindAllNodes() - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - for _, n := range nodes { - _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "ipxe", "") - } - } - } - - if SetRuntimeOverlay != "" { - wwlog.Printf(wwlog.VERBOSE, "Group: %s, Setting runtime overlay to: %s\n", g.Id, SetRuntimeOverlay) - err := nodeDB.SetGroupVal(g.Id.String(), "runtimeoverlay", SetRuntimeOverlay) - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - if SetClearNodes == true { - nodes, err := nodeDB.FindAllNodes() - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - for _, n := range nodes { - _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "runtimeoverlay", "") - } - } - } - - if SetSystemOverlay != "" { - wwlog.Printf(wwlog.VERBOSE, "Group: %s, Setting system overlay to: %s\n", g.Id, SetSystemOverlay) - err := nodeDB.SetGroupVal(g.Id.String(), "systemoverlay", SetSystemOverlay) - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - if SetClearNodes == true { - nodes, err := nodeDB.FindAllNodes() - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - for _, n := range nodes { - _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "systemoverlay", "") - } - } - } - if SetIpmiIpaddr != "" { - wwlog.Printf(wwlog.VERBOSE, "Group: %s, Setting IPMI IP address to: %s\n", g.Id, SetIpmiIpaddr) - err := nodeDB.SetGroupVal(g.Id.String(), "ipmiipaddr", SetIpmiIpaddr) - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - if SetClearNodes == true { - nodes, err := nodeDB.FindAllNodes() - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - for _, n := range nodes { - _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "ipmiipaddr", "") - } - } - } - if SetIpmiUsername != "" { - wwlog.Printf(wwlog.VERBOSE, "Group: %s, Setting IPMI IP username to: %s\n", g.Id, SetIpmiUsername) - err := nodeDB.SetGroupVal(g.Id.String(), "ipmiusername", SetIpmiUsername) - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - if SetClearNodes == true { - nodes, err := nodeDB.FindAllNodes() - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - for _, n := range nodes { - _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "ipmiusername", "") - } - } - } - if SetIpmiPassword != "" { - wwlog.Printf(wwlog.VERBOSE, "Group: %s, Setting IPMI IP password to: %s\n", g.Id, SetIpmiPassword) - err := nodeDB.SetGroupVal(g.Id.String(), "ipmipassword", SetIpmiPassword) - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - if SetClearNodes == true { - nodes, err := nodeDB.FindAllNodes() - if err != nil { - wwlog.Printf(wwlog.ERROR, "%s\n", err) - os.Exit(1) - } - for _, n := range nodes { - _ = nodeDB.SetNodeVal(g.Id.String(), n.Id.String(), "ipmipassword", "") - } - } - } - - - - - - } if len(groups) > 0 {