Various fixes found in testing

internal/pkg/node/constructors.go

@@ -87,7 +87,6 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
 				n.NetDevs[devname] = &netdev
 			}
 
-			n.NetDevs[devname].Name.Set(devname)
 			n.NetDevs[devname].Device.Set(netdev.Device)
 			n.NetDevs[devname].Ipaddr.Set(netdev.Ipaddr)
 			n.NetDevs[devname].Netmask.Set(netdev.Netmask)
@@ -95,6 +94,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
 			n.NetDevs[devname].Gateway.Set(netdev.Gateway)
 			n.NetDevs[devname].Type.Set(netdev.Type)
 			n.NetDevs[devname].OnBoot.SetB(netdev.OnBoot)
+			n.NetDevs[devname].Default.SetB(netdev.Default)
 		}
 
 		for keyname, key := range node.Keys {
@@ -148,6 +148,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
 				n.NetDevs[devname].Gateway.SetAlt(netdev.Gateway, p)
 				n.NetDevs[devname].Type.SetAlt(netdev.Type, p)
 				n.NetDevs[devname].OnBoot.SetAltB(netdev.OnBoot, p)
+				n.NetDevs[devname].Default.SetAltB(netdev.Default, p)
 			}
 
 			for keyname, key := range config.NodeProfiles[p].Keys {
@@ -213,7 +214,6 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) {
 
 			wwlog.Printf(wwlog.DEBUG, "Updating profile netdev: %s\n", devname)
 
-			p.NetDevs[devname].Name.Set(devname)
 			p.NetDevs[devname].Device.Set(netdev.Device)
 			p.NetDevs[devname].Ipaddr.Set(netdev.Ipaddr)
 			p.NetDevs[devname].Netmask.Set(netdev.Netmask)
@@ -221,6 +221,7 @@ func (config *nodeYaml) FindAllProfiles() ([]NodeInfo, error) {
 			p.NetDevs[devname].Gateway.Set(netdev.Gateway)
 			p.NetDevs[devname].Type.Set(netdev.Type)
 			p.NetDevs[devname].OnBoot.SetB(netdev.OnBoot)
+			p.NetDevs[devname].Default.SetB(netdev.Default)
 		}
 
 		for keyname, key := range profile.Keys {

internal/pkg/node/datastructure.go

@@ -39,16 +39,16 @@ type NodeConf struct {
 }
 
 type NetDevs struct {
-	Name    string
-	Type    string `yaml:"type,omitempty"`
-	OnBoot  bool   `yaml:"onboot"`
-	Device  string `yaml:"device"`
+	Type    string
+	OnBoot  bool
+	Device  string
 	Hwaddr  string
 	Ipaddr  string
-	IpCIDR  string
-	Prefix  string
+	IpCIDR  string `yaml:"ipcidr,omitempty"`
+	Prefix  string `yaml:"prefix,omitempty"`
 	Netmask string
-	Gateway string `yaml:"gateway,omitempty"`
+	Gateway string `yaml:"gateway"`
+	Default bool
 }
 
 /******
@@ -92,16 +92,16 @@ type NodeInfo struct {
 }
 
 type NetDevEntry struct {
-	Name    Entry
-	Type    Entry `yaml:"type,omitempty"`
-	OnBoot  Entry `yaml:"onboot"`
-	Device  Entry `yaml:"device"`
+	Type    Entry
+	OnBoot  Entry
+	Device  Entry
 	Hwaddr  Entry
 	Ipaddr  Entry
 	IpCIDR  Entry
 	Prefix  Entry
 	Netmask Entry
-	Gateway Entry `yaml:"gateway,omitempty"`
+	Gateway Entry
+	Default Entry
 }
 
 func init() {

internal/pkg/node/modifiers.go

@@ -91,6 +91,7 @@ func (config *nodeYaml) NodeUpdate(node NodeInfo) error {
 		config.Nodes[nodeID].NetDevs[devname].Gateway = netdev.Gateway.GetReal()
 		config.Nodes[nodeID].NetDevs[devname].Type = netdev.Type.GetReal()
 		config.Nodes[nodeID].NetDevs[devname].OnBoot = netdev.OnBoot.GetRealB()
+		config.Nodes[nodeID].NetDevs[devname].Default = netdev.Default.GetRealB()
 	}
 
 	for keyname, key := range node.Keys {
@@ -177,6 +178,7 @@ func (config *nodeYaml) ProfileUpdate(profile NodeInfo) error {
 		config.NodeProfiles[profileID].NetDevs[devname].Gateway = netdev.Gateway.GetReal()
 		config.NodeProfiles[profileID].NetDevs[devname].Type = netdev.Type.GetReal()
 		config.NodeProfiles[profileID].NetDevs[devname].OnBoot = netdev.OnBoot.GetRealB()
+		config.NodeProfiles[profileID].NetDevs[devname].Default = netdev.Default.GetRealB()
 	}
 
 	for keyname, key := range profile.Keys {