Skip to content

Commit

Permalink
test csi-utils
Browse files Browse the repository at this point in the history
  • Loading branch information
atye committed Feb 14, 2025
1 parent fb644e3 commit 9e3770d
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 5 deletions.
12 changes: 10 additions & 2 deletions csi-utils/csiutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,19 @@ import (
"github.com/dell/csi-isilon/v2/common/utils"
)

var interfaceAddrs = func() ([]net.Addr, error) {
return net.InterfaceAddrs()
}

var parseCIDR = func(s string) (net.IP, *net.IPNet, error) {
return net.ParseCIDR(s)
}

// GetNFSClientIP is used to fetch IP address from networks on which NFS traffic is allowed
func GetNFSClientIP(allowedNetworks []string) (string, error) {
var nodeIP string
log := utils.GetLogger()
addrs, err := net.InterfaceAddrs()
addrs, err := interfaceAddrs()
if err != nil {
log.Errorf("Encountered error while fetching system IP addresses: %+v\n", err.Error())
return "", err
Expand All @@ -43,7 +51,7 @@ func GetNFSClientIP(allowedNetworks []string) (string, error) {
switch v := a.(type) {
case *net.IPNet:
if v.IP.To4() != nil {
ip, cnet, err := net.ParseCIDR(a.String())
ip, cnet, err := parseCIDR(a.String())
log.Debugf("IP address: %s and Network: %s", ip, cnet)
if err != nil {
log.Errorf("Encountered error while parsing IP address %v", a)
Expand Down
42 changes: 39 additions & 3 deletions csi-utils/csiutils_test.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
package csiutils

import (
"errors"
"net"
"testing"
)

func TestGetNFSClientIP(t *testing.T) {
defaulInterfaceAddrsFn := interfaceAddrs
defaultParseCIDRFn := parseCIDR

afterEach := func() {
interfaceAddrs = defaulInterfaceAddrsFn
parseCIDR = defaultParseCIDRFn
}

tests := []struct {
name string
allowedNetworks []string
expectError bool
name string
allowedNetworks []string
interfaceAddrsFn func() ([]net.Addr, error)
parseCIDRFn func(s string) (net.IP, *net.IPNet, error)
expectError bool
}{
{
name: "Valid_Network",
Expand Down Expand Up @@ -44,10 +56,34 @@ func TestGetNFSClientIP(t *testing.T) {
allowedNetworks: []string{},
expectError: true,
},
{
name: "Error_getting_network_interfaces",
allowedNetworks: []string{},
interfaceAddrsFn: func() ([]net.Addr, error) {
return nil, errors.New("error")
},
expectError: true,
},
{
name: "Error_parsing_cidr",
allowedNetworks: []string{},
parseCIDRFn: func(s string) (net.IP, *net.IPNet, error) {

Check failure on line 70 in csi-utils/csiutils_test.go

View workflow job for this annotation

GitHub Actions / Golang Validation / Lint golang code

unused-parameter: parameter 's' seems to be unused, consider removing or renaming it as _ (revive)
return nil, nil, errors.New("error")
},
expectError: true,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
if tt.interfaceAddrsFn != nil {
interfaceAddrs = tt.interfaceAddrsFn
}
if tt.parseCIDRFn != nil {
parseCIDR = tt.parseCIDRFn
}
defer afterEach()

ip, err := GetNFSClientIP(tt.allowedNetworks)

if tt.expectError {
Expand Down

0 comments on commit 9e3770d

Please sign in to comment.