From 8568599627bee590f11734d94e7b11ad67277497 Mon Sep 17 00:00:00 2001 From: jcsiadal Date: Wed, 13 Apr 2022 18:40:55 +0000 Subject: [PATCH 1/2] Convert MACs to lowercase on set Signed-off-by: jcsiadal --- internal/pkg/node/constructors.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go index 76dc50e1..3f57799c 100644 --- a/internal/pkg/node/constructors.go +++ b/internal/pkg/node/constructors.go @@ -137,7 +137,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) { } n.NetDevs[devname].Netmask.Set(netdev.Netmask) n.NetDevs[devname].Netmask.SetDefault("255.255.255.0") - n.NetDevs[devname].Hwaddr.Set(netdev.Hwaddr) + n.NetDevs[devname].Hwaddr.Set(strings.ToLower(netdev.Hwaddr)) n.NetDevs[devname].Gateway.Set(netdev.Gateway) n.NetDevs[devname].Type.Set(netdev.Type) n.NetDevs[devname].OnBoot.Set(netdev.OnBoot) @@ -225,6 +225,7 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) { n.NetDevs[devname].Ipaddr.SetAlt(netdev.Ipaddr, p) //FIXME? <- Ipaddr must be uniq n.NetDevs[devname].Netmask.SetAlt(netdev.Netmask, p) n.NetDevs[devname].Hwaddr.SetAlt(netdev.Hwaddr, p) + n.NetDevs[devname].Hwaddr.SetAlt(strings.ToLower(netdev.Hwaddr), p) n.NetDevs[devname].Gateway.SetAlt(netdev.Gateway, p) n.NetDevs[devname].Type.SetAlt(netdev.Type, p) n.NetDevs[devname].OnBoot.SetAlt(netdev.OnBoot, p) From bc0039eecdaf34e3fbdfd4810c27727f3567bfde Mon Sep 17 00:00:00 2001 From: jcsiadal Date: Wed, 13 Apr 2022 18:44:52 +0000 Subject: [PATCH 2/2] Remove redundant line Signed-off-by: jcsiadal --- internal/pkg/node/constructors.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go index 3f57799c..27853726 100644 --- a/internal/pkg/node/constructors.go +++ b/internal/pkg/node/constructors.go @@ -224,7 +224,6 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) { n.NetDevs[devname].Device.SetAlt(netdev.Device, p) n.NetDevs[devname].Ipaddr.SetAlt(netdev.Ipaddr, p) //FIXME? <- Ipaddr must be uniq n.NetDevs[devname].Netmask.SetAlt(netdev.Netmask, p) - n.NetDevs[devname].Hwaddr.SetAlt(netdev.Hwaddr, p) n.NetDevs[devname].Hwaddr.SetAlt(strings.ToLower(netdev.Hwaddr), p) n.NetDevs[devname].Gateway.SetAlt(netdev.Gateway, p) n.NetDevs[devname].Type.SetAlt(netdev.Type, p)