Handle missing ipmi fields during bmc commands
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
committed by
Jonathon Anderson
parent
099e7cd4ea
commit
ea9a013812
@@ -6,9 +6,9 @@ import (
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/warewulf/warewulf/internal/pkg/batch"
|
||||
"github.com/warewulf/warewulf/internal/pkg/bmc"
|
||||
"github.com/warewulf/warewulf/internal/pkg/hostlist"
|
||||
"github.com/warewulf/warewulf/internal/pkg/node"
|
||||
"github.com/warewulf/warewulf/internal/pkg/power"
|
||||
"github.com/warewulf/warewulf/internal/pkg/wwlog"
|
||||
)
|
||||
|
||||
@@ -40,7 +40,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err
|
||||
|
||||
batchpool := batch.New(vars.Fanout)
|
||||
jobcount := len(nodes)
|
||||
results := make(chan power.IPMI, jobcount)
|
||||
results := make(chan bmc.TemplateStruct, jobcount)
|
||||
|
||||
for _, node := range nodes {
|
||||
|
||||
@@ -48,7 +48,7 @@ func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err err
|
||||
wwlog.Error("%s: No IPMI IP address", node.Id())
|
||||
continue
|
||||
}
|
||||
ipmiCmd := power.IPMI{
|
||||
ipmiCmd := bmc.TemplateStruct{
|
||||
IpmiConf: *node.Ipmi,
|
||||
ShowOnly: vars.Showcmd,
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ nodes:
|
||||
}{
|
||||
"power cycle": {
|
||||
args: []string{"--show", "n01"},
|
||||
expected: "10.10.10.10: ipmitool -I lan -H 10.10.10.10 -p 623 -U admin -P admin -e ~ chassis power cycle",
|
||||
expected: `10.10.10.10: ipmitool -H 10.10.10.10 -U "admin" -P "admin" chassis power cycle`,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user