check the yaml direclty after unmarshalling
This commit is contained in:
@@ -60,6 +60,10 @@ func NodeAddFromYaml(nodeList *wwapiv1.NodeYaml) (err error) {
|
||||
return errors.Wrap(err, "Could not unmarshall Yaml: %s\n")
|
||||
}
|
||||
for nodeName, node := range nodeMap {
|
||||
err = node.Check()
|
||||
if err != nil {
|
||||
return errors.Errorf("error on node %s: %s", nodeName, err)
|
||||
}
|
||||
nodeDB.Nodes[nodeName] = node
|
||||
}
|
||||
err = nodeDB.Persist()
|
||||
|
||||
@@ -50,6 +50,12 @@ func NodeAdd(nap *wwapiv1.NodeAddParameter) (err error) {
|
||||
// only key
|
||||
}
|
||||
// setting node from the received yaml
|
||||
err = nodeConf.Check()
|
||||
if err != nil {
|
||||
err = fmt.Errorf("error on check of node %s: %s", n.Id.Get(), err)
|
||||
return
|
||||
|
||||
}
|
||||
n.SetFrom(&nodeConf)
|
||||
if netName != "" && nodeConf.NetDevs[netName].Ipaddr != "" {
|
||||
// if more nodes are added increment IPv4 address
|
||||
@@ -236,6 +242,12 @@ func NodeSetParameterCheck(set *wwapiv1.NodeSetParameter, console bool) (nodeDB
|
||||
wwlog.Error(fmt.Sprintf("%v", err.Error()))
|
||||
return
|
||||
}
|
||||
err = nodeConf.Check()
|
||||
if err != nil {
|
||||
err = fmt.Errorf("error on check of node %s: %s", n.Id.Get(), err)
|
||||
return
|
||||
|
||||
}
|
||||
n.SetFrom(&nodeConf)
|
||||
if set.NetdevDelete != "" {
|
||||
if _, ok := n.NetDevs[set.NetdevDelete]; !ok {
|
||||
|
||||
Reference in New Issue
Block a user