diff --git a/service/node.go b/service/node.go index f7e35cb..c5ff148 100644 --- a/service/node.go +++ b/service/node.go @@ -1531,7 +1531,7 @@ func (s *service) addNodeInformationIntoArray(ctx context.Context, array *Storag log.Debugf("Fetching IP address of custom network for NFS I/O traffic") nodeIps, err = utils.GetNFSClientIP(s.opts.allowedNetworks) if err != nil { - log.Error("Failed to find IP address corresponding to the allowed network with error", err.Error()) + log.Fatalf("Failed to find IP address corresponding to the allowed network with error %s", err.Error()) return err } } else { diff --git a/service/utils/emcutils.go b/service/utils/emcutils.go index 9c664f6..1effc64 100644 --- a/service/utils/emcutils.go +++ b/service/utils/emcutils.go @@ -188,7 +188,7 @@ func GetNFSClientIP(allowedNetworks []string) ([]string, error) { } nodeIPs, err := GetAddresses(allowedNetworks, addrs) if err != nil { - panic(err) + return nil, err } return nodeIPs, nil } diff --git a/service/utils/emcutils_test.go b/service/utils/emcutils_test.go index ae57fae..84a3e16 100644 --- a/service/utils/emcutils_test.go +++ b/service/utils/emcutils_test.go @@ -23,7 +23,6 @@ import ( ) func TestGetAddresses(t *testing.T) { - type errorTestCases struct { description string addrs []net.Addr @@ -49,16 +48,20 @@ func TestGetAddresses(t *testing.T) { }, { description: "multiple networks, multiple addresses-successful", - addrs: []net.Addr{&net.IPNet{IP: net.ParseIP("192.168.1.1"), Mask: net.CIDRMask(24, 32)}, - &net.IPNet{IP: net.ParseIP("192.168.2.1"), Mask: net.CIDRMask(24, 32)}}, + addrs: []net.Addr{ + &net.IPNet{IP: net.ParseIP("192.168.1.1"), Mask: net.CIDRMask(24, 32)}, + &net.IPNet{IP: net.ParseIP("192.168.2.1"), Mask: net.CIDRMask(24, 32)}, + }, networkAddresses: []string{"192.168.1.0/24", "192.168.2.0/24"}, expectedAddresses: []string{"192.168.1.1", "192.168.2.1"}, expectedError: "", }, { description: "multiple networks, one erroneous address", - addrs: []net.Addr{&net.IPNet{IP: net.ParseIP("192.168.1.1"), Mask: net.CIDRMask(24, 32)}, - &net.IPNet{IP: net.ParseIP("192.168.3.1"), Mask: net.CIDRMask(24, 32)}}, + addrs: []net.Addr{ + &net.IPNet{IP: net.ParseIP("192.168.1.1"), Mask: net.CIDRMask(24, 32)}, + &net.IPNet{IP: net.ParseIP("192.168.3.1"), Mask: net.CIDRMask(24, 32)}, + }, networkAddresses: []string{"192.168.1.0/24", "192.168.2.0/24"}, expectedAddresses: []string{"192.168.1.1"}, expectedError: "",