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

using functor for Get and GetReal

Browse Source
This commit is contained in:
Christian Goll
2022-08-15 17:12:36 +02:00
parent f744934122
commit 0ca17dd454
3 changed files with 61 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ func (config *NodeYaml) FindAllNodes() ([]NodeInfo, error) {
node.Tags[keyname] = key
delete(node.Keys, keyname)
}
n.setFrom(node)
n.SetFrom(node)
// set default/primary network is just one network exist
if len(n.NetDevs) == 1 {
// only way to get the key
@@ -130,7 +130,7 @@ func (config *NodeYaml) FindAllNodes() ([]NodeInfo, error) {
}
// can't call setFrom() as we have to use SetAlt instead of Set for an Entry
wwlog.Printf(wwlog.VERBOSE, "Merging profile into node: %s <- %s\n", nodename, profileName)
n.setAltFrom(config.NodeProfiles[profileName], profileName)
n.SetAltFrom(config.NodeProfiles[profileName], profileName)
}
ret = append(ret, n)
}
@@ -162,7 +162,7 @@ func (config *NodeYaml) FindAllProfiles() ([]NodeInfo, error) {
profile.Tags[keyname] = key
delete(profile.Keys, keyname)
}
p.setFrom(profile)
p.SetFrom(profile)
p.Ipmi.Ipaddr.Set(profile.IpmiIpaddr)
p.Ipmi.Netmask.Set(profile.IpmiNetmask)
p.Ipmi.Port.Set(profile.IpmiPort)