diff --git a/node/net.go b/node/net.go index 3c6701e..b13b273 100644 --- a/node/net.go +++ b/node/net.go @@ -2,6 +2,7 @@ package node import ( "regexp" + "strings" "github.com/coroot/coroot-node-agent/proc" "github.com/vishvananda/netlink" @@ -9,10 +10,10 @@ import ( "inet.af/netaddr" ) -var netDeviceFilterRe = regexp.MustCompile(`^(en(P\d+)?p\d+s\d+(f\d+)?|eth\d+|eno\d+|ens\d+|em\d+|bond\d+|p\d+p\d+|enx[0-9a-f]{12})`) +var netDeviceFilterRe = regexp.MustCompile(`^(en(p\d+)?p\d+s\d+(f\d+)?|eth\d+|eno\d+|ens\d+|em\d+|bond\d+|p\d+p\d+|enx[0-9a-f]+)`) func netDeviceFilter(name string) bool { - return netDeviceFilterRe.MatchString(name) + return netDeviceFilterRe.MatchString(strings.ToLower(name)) } type NetDeviceInfo struct { diff --git a/node/net_test.go b/node/net_test.go index d144210..54b293b 100644 --- a/node/net_test.go +++ b/node/net_test.go @@ -7,29 +7,24 @@ import ( ) func TestNetDeviceFilter(t *testing.T) { - cases := map[string]bool{ - "eth0": true, - "eth0@if699": true, - "enp2s0": true, - "bond0": true, - "ens1": true, - "p1p1": true, - "eno2": true, - "em1": true, - "enx78e7d1ea46da": true, - "enP4p65s0": true, - "enP2p33s0": true, + assert.True(t, netDeviceFilter("eth0")) + assert.True(t, netDeviceFilter("eth0@if699")) + assert.True(t, netDeviceFilter("enp2s0")) + assert.True(t, netDeviceFilter("bond0")) + assert.True(t, netDeviceFilter("ens1")) + assert.True(t, netDeviceFilter("p1p1")) + assert.True(t, netDeviceFilter("eno2")) + assert.True(t, netDeviceFilter("em1")) + assert.True(t, netDeviceFilter("enx78e7d1ea46da")) + assert.True(t, netDeviceFilter("enP4p65s0")) + assert.True(t, netDeviceFilter("enP2p33s0")) + assert.True(t, netDeviceFilter("enX0")) - "dummy0": false, - "docker0": false, - "kube-ipvs0": false, - "veth1b0c947@if2": false, - "flannel.1": false, - "cni0": false, - "lxc00aa@if698": false, - } - - for name, ok := range cases { - assert.Equal(t, ok, netDeviceFilter(name), name) - } + assert.False(t, netDeviceFilter("dummy0")) + assert.False(t, netDeviceFilter("docker0")) + assert.False(t, netDeviceFilter("kube-ipvs0")) + assert.False(t, netDeviceFilter("veth1b0c947@if2")) + assert.False(t, netDeviceFilter("flannel.1")) + assert.False(t, netDeviceFilter("cni0")) + assert.False(t, netDeviceFilter("lxc00aa@if698")) }