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

wwctl node list <--yaml|--json> outputs a map keyed by node name

Browse Source 
- Fixes: #1667

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-01-30 09:58:33 -07:00
committed by Christian Goll
parent 8c342ebdcd
commit 1f607b679b
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/pkg/api/node/list.go
View File

@@ -101,13 +101,16 @@ func NodeList(nodeGet *wwapiv1.GetNodeList) (nodeList wwapiv1.NodeList, err erro
}
}
} else if nodeGet.Type == wwapiv1.GetNodeList_YAML || nodeGet.Type == wwapiv1.GetNodeList_JSON {
filterNodes := node.FilterNodeListByName(nodes, nodeGet.Nodes)
nodeMap := make(map[string]node.Node)
for _, n := range node.FilterNodeListByName(nodes, nodeGet.Nodes) {
nodeMap[n.Id()] = n
}
var buf []byte
if nodeGet.Type == wwapiv1.GetNodeList_JSON {
buf, _ = json.MarshalIndent(filterNodes, "", " ")
buf, _ = json.MarshalIndent(nodeMap, "", " ")
}
if nodeGet.Type == wwapiv1.GetNodeList_YAML {
buf, _ = yaml.Marshal(filterNodes)
buf, _ = yaml.Marshal(nodeMap)
}
nodeList.Output = append(nodeList.Output, string(buf))