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

Change how boolean node members behave (transform two and from strings)

Browse Source
This commit is contained in:
Gregory Kurtzer
2022-02-10 16:36:14 +00:00
parent c5cbd3d6e3
commit b165928699
5 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.Root.Set(node.Root)
n.AssetKey.Set(node.AssetKey)
n.Discoverable.SetB(node.Discoverable)
n.Discoverable.Set(node.Discoverable)
for devname, netdev := range node.NetDevs {
if _, ok := n.NetDevs[devname]; !ok {
@@ -97,18 +97,14 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.NetDevs[devname] = &netdev
}
if netdev.Device != "" {
n.NetDevs[devname].Device.Set(netdev.Device)
} else {
n.NetDevs[devname].Device.Set(devname)
}
n.NetDevs[devname].Device.Set(netdev.Device)
n.NetDevs[devname].Ipaddr.Set(netdev.Ipaddr)
n.NetDevs[devname].Netmask.Set(netdev.Netmask)
n.NetDevs[devname].Hwaddr.Set(netdev.Hwaddr)
n.NetDevs[devname].Gateway.Set(netdev.Gateway)
n.NetDevs[devname].Type.Set(netdev.Type)
n.NetDevs[devname].OnBoot.SetB(netdev.OnBoot)
n.NetDevs[devname].Default.SetB(netdev.Default)
n.NetDevs[devname].OnBoot.Set(netdev.OnBoot)
n.NetDevs[devname].Default.Set(netdev.Default)
}
for keyname, key := range node.Keys {
@@ -146,7 +142,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.Root.SetAlt(config.NodeProfiles[p].Root, p)
n.AssetKey.SetAlt(config.NodeProfiles[p].AssetKey, p)
n.Discoverable.SetAltB(config.NodeProfiles[p].Discoverable, p)
n.Discoverable.SetAlt(config.NodeProfiles[p].Discoverable, p)
for devname, netdev := range config.NodeProfiles[p].NetDevs {
if _, ok := n.NetDevs[devname]; !ok {
@@ -161,8 +157,8 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.NetDevs[devname].Hwaddr.SetAlt(netdev.Hwaddr, p)
n.NetDevs[devname].Gateway.SetAlt(netdev.Gateway, p)
n.NetDevs[devname].Type.SetAlt(netdev.Type, p)
n.NetDevs[devname].OnBoot.SetAltB(netdev.OnBoot, p)
n.NetDevs[devname].Default.SetAltB(netdev.Default, p)
n.NetDevs[devname].OnBoot.SetAlt(netdev.OnBoot, p)
n.NetDevs[devname].Default.SetAlt(netdev.Default, p)
}
for keyname, key := range config.NodeProfiles[p].Keys {
@@ -219,7 +215,7 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) {
p.Root.Set(profile.Root)
p.AssetKey.Set(profile.AssetKey)
p.Discoverable.SetB(profile.Discoverable)
p.Discoverable.Set(profile.Discoverable)
for devname, netdev := range profile.NetDevs {
if _, ok := p.NetDevs[devname]; !ok {
@@ -235,8 +231,8 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) {
p.NetDevs[devname].Hwaddr.Set(netdev.Hwaddr)
p.NetDevs[devname].Gateway.Set(netdev.Gateway)
p.NetDevs[devname].Type.Set(netdev.Type)
p.NetDevs[devname].OnBoot.SetB(netdev.OnBoot)
p.NetDevs[devname].Default.SetB(netdev.Default)
p.NetDevs[devname].OnBoot.Set(netdev.OnBoot)
p.NetDevs[devname].Default.Set(netdev.Default)
}
for keyname, key := range profile.Keys {

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

@@ -33,7 +33,7 @@ type NodeConf struct {
Init string `yaml:"init,omitempty"`
Root string `yaml:"root,omitempty"`
AssetKey string `yaml:"asset key,omitempty"`
Discoverable bool `yaml:"discoverable,omitempty"`
Discoverable string `yaml:"discoverable,omitempty"`
Profiles []string `yaml:"profiles,omitempty"`
NetDevs map[string]*NetDevs `yaml:"network devices,omitempty"`
Keys map[string]string `yaml:"keys,omitempty"`
@@ -41,7 +41,7 @@ type NodeConf struct {
type NetDevs struct {
Type string
OnBoot bool
OnBoot string
Device string
Hwaddr string
Ipaddr string
@@ -49,7 +49,7 @@ type NetDevs struct {
Prefix string `yaml:"prefix,omitempty"`
Netmask string
Gateway string `yaml:"gateway"`
Default bool
Default string
}
/******
@@ -59,8 +59,6 @@ type NetDevs struct {
type Entry struct {
value string
altvalue string
bool bool
altbool bool
from string
def string
}

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

@@ -1,6 +1,8 @@
package node
import "regexp"
import (
"regexp"
)
/**********
*
@@ -51,7 +53,9 @@ func (ent *Entry) Set(val string) {
}
func (ent *Entry) SetB(val bool) {
ent.bool = val
if val {
ent.value = "true"
}
}
func (ent *Entry) SetAlt(val string, from string) {
@@ -66,10 +70,9 @@ func (ent *Entry) SetAlt(val string, from string) {
func (ent *Entry) SetAltB(val bool, from string) {
if val {
ent.altbool = val
ent.altvalue = "true"
ent.from = from
}
}
func (ent *Entry) SetDefault(val string) {
@@ -101,17 +104,19 @@ func (ent *Entry) Get() string {
}
func (ent *Entry) GetB() bool {
return ent.bool
if ent.value == "false" || ent.value == "no" {
return false
}
if ent.altvalue == "false" || ent.altvalue == "no" || ent.altvalue == "" {
return false
}
return true
}
func (ent *Entry) GetReal() string {
return ent.value
}
func (ent *Entry) GetRealB() bool {
return ent.bool
}
/**********
*
* Misc
@@ -132,10 +137,10 @@ func (ent *Entry) Print() string {
}
func (ent *Entry) PrintB() bool {
if ent.from == "" {
return ent.bool
if ent.GetB() {
return true
}
return ent.altbool
return false
}
func (ent *Entry) Source() string {

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

@@ -74,7 +74,7 @@ func (config *nodeYaml) NodeUpdate(node NodeInfo) error {
config.Nodes[nodeID].Root = node.Root.GetReal()
config.Nodes[nodeID].AssetKey = node.AssetKey.GetReal()
config.Nodes[nodeID].Discoverable = node.Discoverable.GetRealB()
config.Nodes[nodeID].Discoverable = node.Discoverable.GetReal()
config.Nodes[nodeID].Profiles = node.Profiles
config.Nodes[nodeID].NetDevs = make(map[string]*NetDevs)
@@ -91,8 +91,8 @@ func (config *nodeYaml) NodeUpdate(node NodeInfo) error {
config.Nodes[nodeID].NetDevs[devname].Hwaddr = netdev.Hwaddr.GetReal()
config.Nodes[nodeID].NetDevs[devname].Gateway = netdev.Gateway.GetReal()
config.Nodes[nodeID].NetDevs[devname].Type = netdev.Type.GetReal()
config.Nodes[nodeID].NetDevs[devname].OnBoot = netdev.OnBoot.GetRealB()
config.Nodes[nodeID].NetDevs[devname].Default = netdev.Default.GetRealB()
config.Nodes[nodeID].NetDevs[devname].OnBoot = netdev.OnBoot.GetReal()
config.Nodes[nodeID].NetDevs[devname].Default = netdev.Default.GetReal()
}
for keyname, key := range node.Keys {
@@ -162,7 +162,7 @@ func (config *nodeYaml) ProfileUpdate(profile NodeInfo) error {
config.NodeProfiles[profileID].Root = profile.Root.GetReal()
config.NodeProfiles[profileID].AssetKey = profile.AssetKey.GetReal()
config.NodeProfiles[profileID].Discoverable = profile.Discoverable.GetRealB()
config.NodeProfiles[profileID].Discoverable = profile.Discoverable.GetReal()
config.NodeProfiles[profileID].Profiles = profile.Profiles
config.NodeProfiles[profileID].NetDevs = make(map[string]*NetDevs)
@@ -179,8 +179,8 @@ func (config *nodeYaml) ProfileUpdate(profile NodeInfo) error {
config.NodeProfiles[profileID].NetDevs[devname].Hwaddr = netdev.Hwaddr.GetReal()
config.NodeProfiles[profileID].NetDevs[devname].Gateway = netdev.Gateway.GetReal()
config.NodeProfiles[profileID].NetDevs[devname].Type = netdev.Type.GetReal()
config.NodeProfiles[profileID].NetDevs[devname].OnBoot = netdev.OnBoot.GetRealB()
config.NodeProfiles[profileID].NetDevs[devname].Default = netdev.Default.GetRealB()
config.NodeProfiles[profileID].NetDevs[devname].OnBoot = netdev.OnBoot.GetReal()
config.NodeProfiles[profileID].NetDevs[devname].Default = netdev.Default.GetReal()
}
for keyname, key := range profile.Keys {