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

Added a test for wwctl node import

Browse Source 
To support this, also added `wwctl node import --yes`.

Also corrected the spelling of `--cvs` to `--csv`.

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-03-25 20:00:48 -06:00
parent cb1b667e71
commit 1883f2e932
4 changed files with 97 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/app/wwctl/node/imprt/main.go
View File

@@ -27,11 +27,10 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
if err != nil {
return fmt.Errorf("could not read: %s", err)
}
if !ImportCVS {
if !ImportCSV {
err = yaml.Unmarshal(buffer, importMap)
if err == nil {
yes := util.Confirm(fmt.Sprintf("Are you sure you want to modify %d nodes", len(importMap)))
if yes {
if setYes || util.Confirm(fmt.Sprintf("Are you sure you want to modify %d nodes", len(importMap))) {
err = apinode.NodeAddFromYaml(&wwapiv1.NodeYaml{NodeConfMapYaml: string(buffer)})
if err != nil {
return fmt.Errorf("got following problem when writing back yaml: %s", err)
@@ -68,8 +67,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
}
}
}
yes := util.Confirm(fmt.Sprintf("Are you sure you want to import %d nodes", len(importMap)))
if yes {
if setYes || util.Confirm(fmt.Sprintf("Are you sure you want to import %d nodes", len(importMap))) {
// create second buffer an marshall nodeMap to it
buffer, err = yaml.Marshal(importMap)
if err != nil {