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

Refactor node

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-10-25 14:17:00 -06:00
parent e6f5c63c21
commit 0665d5dc88
35 changed files with 112 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/pkg/api/node/delete.go
View File

@@ -15,7 +15,7 @@ import (
// NodeDelete adds nodes for management by Warewulf.
func NodeDelete(ndp *wwapiv1.NodeDeleteParameter) (err error) {
var nodeList []node.NodeConf
var nodeList []node.Node
nodeList, err = NodeDeleteParameterCheck(ndp, false)
if err != nil {
return
@@ -55,7 +55,7 @@ func NodeDelete(ndp *wwapiv1.NodeDeleteParameter) (err error) {
// NodeDeleteParameterCheck does error checking on NodeDeleteParameter.
// Output to the console if console is true.
// Returns the nodes to delete.
func NodeDeleteParameterCheck(ndp *wwapiv1.NodeDeleteParameter, console bool) (nodeList []node.NodeConf, err error) {
func NodeDeleteParameterCheck(ndp *wwapiv1.NodeDeleteParameter, console bool) (nodeList []node.Node, err error) {
if ndp == nil {
err = fmt.Errorf("NodeDeleteParameter is nil")

2
internal/pkg/api/node/edit.go
View File

@@ -37,7 +37,7 @@ func NodeAddFromYaml(nodeList *wwapiv1.NodeYaml) (err error) {
if err != nil {
return fmt.Errorf("could not open NodeDB: %w", err)
}
nodeMap := make(map[string]*node.NodeConf)
nodeMap := make(map[string]*node.Node)
err = yaml.Unmarshal([]byte(nodeList.NodeConfMapYaml), nodeMap)
if err != nil {
return fmt.Errorf("could not unmarshal Yaml: %w", err)

2
internal/pkg/api/node/set.go
View File

@@ -60,7 +60,7 @@ func NodeSetParameterCheck(set *wwapiv1.ConfSetParameter) (nodeDB node.NodeYaml,
for _, nId := range set.ConfList {
if util.InSlice(set.ConfList, nId) {
wwlog.Debug("evaluating node: %s", nId)
var nodePtr *node.NodeConf
var nodePtr *node.Node
nodePtr, err = nodeDB.GetNodeOnlyPtr(nId)
if err != nil {
wwlog.Warn("invalid node: %s", nId)

2
internal/pkg/api/profile/edit.go
View File

@@ -40,7 +40,7 @@ func ProfileAddFromYaml(nodeList *wwapiv1.NodeAddParameter) (err error) {
return fmt.Errorf("got wrong hash, not modifying profile database")
}
profileMap := make(map[string]*node.ProfileConf)
profileMap := make(map[string]*node.Profile)
err = yaml.Unmarshal([]byte(nodeList.NodeConfYaml), profileMap)
if err != nil {
return fmt.Errorf("couldn't unmarshall Yaml: %w", err)

4
internal/pkg/api/profile/list.go
View File

@@ -38,7 +38,7 @@ func ProfileList(ShowOpt *wwapiv1.GetProfileList) (profileList wwapiv1.ProfileLi
}
}
} else if ShowOpt.ShowYaml {
profileMap := make(map[string]node.ProfileConf)
profileMap := make(map[string]node.Profile)
for _, profile := range profiles {
profileMap[profile.Id()] = profile
}
@@ -46,7 +46,7 @@ func ProfileList(ShowOpt *wwapiv1.GetProfileList) (profileList wwapiv1.ProfileLi
buf, _ := yaml.Marshal(profileMap)
profileList.Output = append(profileList.Output, string(buf))
} else if ShowOpt.ShowJson {
profileMap := make(map[string]node.ProfileConf)
profileMap := make(map[string]node.Profile)
for _, profile := range profiles {
profileMap[profile.Id()] = profile
}

2
internal/pkg/api/profile/set.go
View File

@@ -60,7 +60,7 @@ func ProfileSetParameterCheck(set *wwapiv1.ConfSetParameter) (nodeDB node.NodeYa
for _, profileId := range set.ConfList {
if util.InSlice(set.ConfList, profileId) {
wwlog.Verbose("evaluating profile: %s", profileId)
var profilePtr *node.ProfileConf
var profilePtr *node.Profile
profilePtr, err = nodeDB.GetProfilePtr(profileId)
if err != nil {
wwlog.Warn("invalid profile: %s", profileId)