kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Changed DomainName to ClusterName

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-12-03 19:37:52 -08:00
parent f837422771
commit e80878b240
10 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/app/wwctl/node/list/main.go
View File

@@ -31,9 +31,9 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
} }
sort.Slice(nodes, func(i, j int) bool { sort.Slice(nodes, func(i, j int) bool {
if nodes[i].DomainName.Get() < nodes[j].DomainName.Get() { if nodes[i].ClusterName.Get() < nodes[j].ClusterName.Get() {
return true return true
} else if nodes[i].DomainName.Get() == nodes[j].DomainName.Get() { } else if nodes[i].ClusterName.Get() == nodes[j].ClusterName.Get() {
if nodes[i].Id.Get() < nodes[j].Id.Get() { if nodes[i].Id.Get() < nodes[j].Id.Get() {
return true return true
} }
@@ -47,7 +47,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
fmt.Printf("%-20s %-18s %-12s %s\n", "NODE", "FIELD", "PROFILE", "VALUE") fmt.Printf("%-20s %-18s %-12s %s\n", "NODE", "FIELD", "PROFILE", "VALUE")
fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Id", node.Id.Source(), node.Id.Print()) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Id", node.Id.Source(), node.Id.Print())
fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Comment", node.Comment.Source(), node.Comment.Print()) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Comment", node.Comment.Source(), node.Comment.Print())
fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "DomainName", node.DomainName.Source(), node.DomainName.Print()) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "ClusterName", node.ClusterName.Source(), node.ClusterName.Print())
fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Profiles", "--", strings.Join(node.Profiles, ",")) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Profiles", "--", strings.Join(node.Profiles, ","))
fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Vnfs", node.Vnfs.Source(), node.Vnfs.Print()) fmt.Printf("%-20s %-18s %-12s %s\n", node.Id.Get(), "Vnfs", node.Vnfs.Source(), node.Vnfs.Print())

6
internal/app/wwctl/node/set/main.go
View File

@@ -76,10 +76,10 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
os.Exit(1) os.Exit(1)
} }
} }
if SetDomainName != "" { if SetClusterName != "" {
wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting domain name to: %s\n", n.Id.Get(), SetDomainName) wwlog.Printf(wwlog.VERBOSE, "Node: %s, Setting cluster name to: %s\n", n.Id.Get(), SetClusterName)
n.DomainName.Set(SetDomainName) n.ClusterName.Set(SetClusterName)
err := nodeDB.NodeUpdate(n) err := nodeDB.NodeUpdate(n)
if err != nil { if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err) wwlog.Printf(wwlog.ERROR, "%s\n", err)

6
internal/app/wwctl/node/set/root.go
View File

@@ -18,7 +18,7 @@ var (
SetGateway string SetGateway string
SetHwaddr string SetHwaddr string
SetNetDevDel bool SetNetDevDel bool
SetDomainName string SetClusterName string
SetIpxe string SetIpxe string
SetRuntimeOverlay string SetRuntimeOverlay string
SetSystemOverlay string SetSystemOverlay string
@@ -33,10 +33,10 @@ var (
) )
func init() { func init() {
baseCmd.PersistentFlags().StringVarP(&SetComment, "comment", "C", "", "Set a comment for this node") baseCmd.PersistentFlags().StringVar(&SetComment, "comment", "", "Set a comment for this node")
baseCmd.PersistentFlags().StringVarP(&SetVnfs, "vnfs", "V", "", "Set node Virtual Node File System (VNFS)") baseCmd.PersistentFlags().StringVarP(&SetVnfs, "vnfs", "V", "", "Set node Virtual Node File System (VNFS)")
baseCmd.PersistentFlags().StringVarP(&SetKernel, "kernel", "K", "", "Set Kernel version for nodes") baseCmd.PersistentFlags().StringVarP(&SetKernel, "kernel", "K", "", "Set Kernel version for nodes")
baseCmd.PersistentFlags().StringVarP(&SetDomainName, "domain", "D", "", "Set the node's domain name") baseCmd.PersistentFlags().StringVarP(&SetClusterName, "cluster", "C", "", "Set the node's cluster name")
baseCmd.PersistentFlags().StringVarP(&SetIpxe, "ipxe", "P", "", "Set the node's iPXE template name") baseCmd.PersistentFlags().StringVarP(&SetIpxe, "ipxe", "P", "", "Set the node's iPXE template name")
baseCmd.PersistentFlags().StringVarP(&SetRuntimeOverlay, "runtime", "R", "", "Set the node's runtime overlay") baseCmd.PersistentFlags().StringVarP(&SetRuntimeOverlay, "runtime", "R", "", "Set the node's runtime overlay")
baseCmd.PersistentFlags().StringVarP(&SetSystemOverlay, "system", "S", "", "Set the node's system overlay") baseCmd.PersistentFlags().StringVarP(&SetSystemOverlay, "system", "S", "", "Set the node's system overlay")

1
internal/app/wwctl/profile/list/main.go
View File

@@ -34,6 +34,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
fmt.Printf("################################################################################\n") fmt.Printf("################################################################################\n")
fmt.Printf("%-20s %-18s: %s\n", node.Id.Get(), "Id", node.Id.Print()) fmt.Printf("%-20s %-18s: %s\n", node.Id.Get(), "Id", node.Id.Print())
fmt.Printf("%-20s %-18s: %s\n", node.Id.Get(), "Comment", node.Comment.Print()) fmt.Printf("%-20s %-18s: %s\n", node.Id.Get(), "Comment", node.Comment.Print())
fmt.Printf("%-20s %-18s: %s\n", node.Id.Get(), "ClusterName", node.ClusterName.Print())
fmt.Printf("%-20s %-18s: %s\n", node.Id.Get(), "Vnfs", node.Vnfs.Print()) fmt.Printf("%-20s %-18s: %s\n", node.Id.Get(), "Vnfs", node.Vnfs.Print())
fmt.Printf("%-20s %-18s: %s\n", node.Id.Get(), "KernelVersion", node.KernelVersion.Print()) fmt.Printf("%-20s %-18s: %s\n", node.Id.Get(), "KernelVersion", node.KernelVersion.Print())

6
internal/app/wwctl/profile/set/main.go
View File

@@ -59,10 +59,10 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
os.Exit(1) os.Exit(1)
} }
} }
if SetDomainName != "" { if SetClusterName != "" {
wwlog.Printf(wwlog.VERBOSE, "Profile: %s, Setting domain name to: %s\n", p.Id, SetDomainName) wwlog.Printf(wwlog.VERBOSE, "Profile: %s, Setting cluster name to: %s\n", p.Id, SetClusterName)
p.DomainName.Set(SetDomainName) p.ClusterName.Set(SetClusterName)
err := nodeDB.ProfileUpdate(p) err := nodeDB.ProfileUpdate(p)
if err != nil { if err != nil {
wwlog.Printf(wwlog.ERROR, "%s\n", err) wwlog.Printf(wwlog.ERROR, "%s\n", err)

6
internal/app/wwctl/profile/set/root.go
View File

@@ -13,7 +13,7 @@ var (
SetComment string SetComment string
SetVnfs string SetVnfs string
SetKernel string SetKernel string
SetDomainName string SetClusterName string
SetIpxe string SetIpxe string
SetRuntimeOverlay string SetRuntimeOverlay string
SetSystemOverlay string SetSystemOverlay string
@@ -29,10 +29,10 @@ var (
) )
func init() { func init() {
baseCmd.PersistentFlags().StringVarP(&SetComment, "comment", "C", "", "Set a comment for this node") baseCmd.PersistentFlags().StringVar(&SetComment, "comment", "", "Set a comment for this node")
baseCmd.PersistentFlags().StringVarP(&SetVnfs, "vnfs", "V", "", "Set node Virtual Node File System (VNFS)") baseCmd.PersistentFlags().StringVarP(&SetVnfs, "vnfs", "V", "", "Set node Virtual Node File System (VNFS)")
baseCmd.PersistentFlags().StringVarP(&SetKernel, "kernel", "K", "", "Set Kernel version for nodes") baseCmd.PersistentFlags().StringVarP(&SetKernel, "kernel", "K", "", "Set Kernel version for nodes")
baseCmd.PersistentFlags().StringVarP(&SetDomainName, "domain", "D", "", "Set the node's domain name") baseCmd.PersistentFlags().StringVarP(&SetClusterName, "cluster", "C", "", "Set the node's cluster name")
baseCmd.PersistentFlags().StringVarP(&SetIpxe, "ipxe", "P", "", "Set the node's iPXE template name") baseCmd.PersistentFlags().StringVarP(&SetIpxe, "ipxe", "P", "", "Set the node's iPXE template name")
baseCmd.PersistentFlags().StringVarP(&SetRuntimeOverlay, "runtime", "R", "", "Set the node's runtime overlay") baseCmd.PersistentFlags().StringVarP(&SetRuntimeOverlay, "runtime", "R", "", "Set the node's runtime overlay")
baseCmd.PersistentFlags().StringVarP(&SetSystemOverlay, "system", "S", "", "Set the node's system overlay") baseCmd.PersistentFlags().StringVarP(&SetSystemOverlay, "system", "S", "", "Set the node's system overlay")

6
internal/pkg/node/constructors.go
View File

@@ -48,7 +48,7 @@ func (self *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
fullname := strings.SplitN(nodename, ".", 2) fullname := strings.SplitN(nodename, ".", 2)
if len(fullname) > 1 { if len(fullname) > 1 {
n.DomainName.SetDefault(fullname[1]) n.ClusterName.SetDefault(fullname[1])
} }
if len(node.Profiles) == 0 { if len(node.Profiles) == 0 {
@@ -62,7 +62,7 @@ func (self *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.Vnfs.Set(node.Vnfs) n.Vnfs.Set(node.Vnfs)
n.KernelVersion.Set(node.KernelVersion) n.KernelVersion.Set(node.KernelVersion)
n.KernelArgs.Set(node.KernelArgs) n.KernelArgs.Set(node.KernelArgs)
n.DomainName.Set(node.DomainName) n.ClusterName.Set(node.ClusterName)
n.Ipxe.Set(node.Ipxe) n.Ipxe.Set(node.Ipxe)
n.IpmiIpaddr.Set(node.IpmiIpaddr) n.IpmiIpaddr.Set(node.IpmiIpaddr)
n.IpmiNetmask.Set(node.IpmiNetmask) n.IpmiNetmask.Set(node.IpmiNetmask)
@@ -96,7 +96,7 @@ func (self *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
pstring := fmt.Sprintf("%s", p) pstring := fmt.Sprintf("%s", p)
n.Comment.SetAlt(self.NodeProfiles[p].Comment, pstring) n.Comment.SetAlt(self.NodeProfiles[p].Comment, pstring)
n.DomainName.SetAlt(self.NodeProfiles[p].DomainName, pstring) n.ClusterName.SetAlt(self.NodeProfiles[p].ClusterName, pstring)
n.Vnfs.SetAlt(self.NodeProfiles[p].Vnfs, pstring) n.Vnfs.SetAlt(self.NodeProfiles[p].Vnfs, pstring)
n.KernelVersion.SetAlt(self.NodeProfiles[p].KernelVersion, pstring) n.KernelVersion.SetAlt(self.NodeProfiles[p].KernelVersion, pstring)
n.KernelArgs.SetAlt(self.NodeProfiles[p].KernelArgs, pstring) n.KernelArgs.SetAlt(self.NodeProfiles[p].KernelArgs, pstring)

4
internal/pkg/node/datastructure.go
View File

@@ -18,7 +18,7 @@ type nodeYaml struct {
type NodeConf struct { type NodeConf struct {
Comment string `yaml:"comment,omitempty"` Comment string `yaml:"comment,omitempty"`
Disabled bool `yaml:"disabled,omitempty"` Disabled bool `yaml:"disabled,omitempty"`
DomainName string `yaml:"domain name,omitempty"` ClusterName string `yaml:"cluster name,omitempty"`
Vnfs string `yaml:"vnfs,omitempty"` Vnfs string `yaml:"vnfs,omitempty"`
Ipxe string `yaml:"ipxe template,omitempty"` Ipxe string `yaml:"ipxe template,omitempty"`
KernelVersion string `yaml:"kernel version,omitempty"` KernelVersion string `yaml:"kernel version,omitempty"`
@@ -59,7 +59,7 @@ type NodeInfo struct {
Id Entry Id Entry
Cid Entry Cid Entry
Comment Entry Comment Entry
DomainName Entry ClusterName Entry
Vnfs Entry Vnfs Entry
Ipxe Entry Ipxe Entry
KernelVersion Entry KernelVersion Entry

2
internal/pkg/node/methods.go
View File

@@ -101,7 +101,7 @@ func (self *Entry) Print() string {
return self.altvalue return self.altvalue
} }
if self.def != "" { if self.def != "" {
return self.def return "(" + self.def + ")"
} }
return "--" return "--"
} }

3
internal/pkg/node/modifiers.go
View File

@@ -55,7 +55,7 @@ func (self *nodeYaml) NodeUpdate(node NodeInfo) error {
self.Nodes[nodeID].Comment = node.Comment.GetReal() self.Nodes[nodeID].Comment = node.Comment.GetReal()
self.Nodes[nodeID].Vnfs = node.Vnfs.GetReal() self.Nodes[nodeID].Vnfs = node.Vnfs.GetReal()
self.Nodes[nodeID].DomainName = node.DomainName.GetReal() self.Nodes[nodeID].ClusterName = node.ClusterName.GetReal()
self.Nodes[nodeID].Ipxe = node.Ipxe.GetReal() self.Nodes[nodeID].Ipxe = node.Ipxe.GetReal()
self.Nodes[nodeID].KernelVersion = node.KernelVersion.GetReal() self.Nodes[nodeID].KernelVersion = node.KernelVersion.GetReal()
self.Nodes[nodeID].KernelArgs = node.KernelArgs.GetReal() self.Nodes[nodeID].KernelArgs = node.KernelArgs.GetReal()
@@ -127,6 +127,7 @@ func (self *nodeYaml) ProfileUpdate(profile NodeInfo) error {
self.NodeProfiles[profileID].Comment = profile.Comment.GetReal() self.NodeProfiles[profileID].Comment = profile.Comment.GetReal()
self.NodeProfiles[profileID].Vnfs = profile.Vnfs.GetReal() self.NodeProfiles[profileID].Vnfs = profile.Vnfs.GetReal()
self.NodeProfiles[profileID].Ipxe = profile.Ipxe.GetReal() self.NodeProfiles[profileID].Ipxe = profile.Ipxe.GetReal()
self.NodeProfiles[profileID].ClusterName = profile.ClusterName.GetReal()
self.NodeProfiles[profileID].KernelVersion = profile.KernelVersion.GetReal() self.NodeProfiles[profileID].KernelVersion = profile.KernelVersion.GetReal()
self.NodeProfiles[profileID].KernelArgs = profile.KernelArgs.GetReal() self.NodeProfiles[profileID].KernelArgs = profile.KernelArgs.GetReal()
self.NodeProfiles[profileID].IpmiIpaddr = profile.IpmiIpaddr.GetReal() self.NodeProfiles[profileID].IpmiIpaddr = profile.IpmiIpaddr.GetReal()