lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: core: net: Add a cidr to mask function

Browse Source 
And tidy things up slightly to remove buggy tests.
This commit is contained in:
James Shubin
2024-09-28 22:54:06 -04:00
parent 6397c8f930
commit 65f26769ae
2 changed files with 87 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lang/core/net/cidr_to_ip_func.go
View File

@@ -43,16 +43,32 @@ func init() {
T: types.NewType("func(a str) str"),
F: CidrToIP,
})
simple.ModuleRegister(ModuleName, "cidr_to_mask", &simple.Scaffold{
T: types.NewType("func(a str) str"),
F: CidrToMask,
})
}
// CidrToIP returns the IP from a CIDR address
// CidrToIP returns the IP from a CIDR address.
func CidrToIP(ctx context.Context, input []types.Value) (types.Value, error) {
cidr := input[0].Str()
ip, _, err := net.ParseCIDR(strings.TrimSpace(cidr))
if err != nil {
return &types.StrValue{}, err
return nil, err
}
return &types.StrValue{
V: ip.String(),
}, nil
}
// CidrToMask returns the subnet mask from a CIDR address.
func CidrToMask(ctx context.Context, input []types.Value) (types.Value, error) {
cidr := input[0].Str()
_, ipnet, err := net.ParseCIDR(strings.TrimSpace(cidr))
if err != nil {
return nil, err
}
return &types.StrValue{
V: net.IP(ipnet.Mask).String(),
}, nil
}

76
lang/core/net/cidr_to_ip_func_test.go
View File

@@ -65,16 +65,78 @@ func TestCidrToIP(t *testing.T) {
output, err := CidrToIP(context.Background(), []types.Value{&types.StrValue{V: test.input}})
expectedStr := &types.StrValue{V: test.expected}
if test.err != nil && err.Error() != test.err.Error() {
t.Errorf("input: %s, expected error: %q, got: %q", test.input, test.err, err)
return
} else if test.err != nil && err == nil {
t.Errorf("input: %s, expected error: %v, but got nil", test.input, test.err)
return
} else if test.err == nil && err != nil {
if (test.err == nil) && err != nil {
t.Errorf("input: %s, did not expect error but got: %#v", test.input, err)
return
}
if (test.err != nil) && err != nil {
s := err.Error() // convert to string
if s == test.err.Error() {
return
}
t.Errorf("input: %s, expected error: %q, got: %q", test.input, test.err, err)
return
}
if (test.err != nil) && err == nil {
t.Errorf("input: %s, expected error: %v, but got nil", test.input, test.err)
return
}
if err := output.Cmp(expectedStr); err != nil {
t.Errorf("input: %s, expected: %s, got: %s", test.input, expectedStr, output)
return
}
})
}
}
func TestCidrToMask(t *testing.T) {
cidrtests := []struct {
name string
input string
expected string
err error
}{
// IPv4 success.
{"IPv4 cidr", "192.0.2.12/24", "255.255.255.0", nil},
{"Another IPv4 cidr", "192.0.2.12/13", "255.248.0.0", nil},
{"spaced IPv4 cidr ", " 192.168.42.13/24 ", "255.255.255.0", nil},
// IPv4 failure - tests error.
{"invalid IPv4 cidr", "192.168.42.13/33", "", fmt.Errorf("invalid CIDR address: 192.168.42.13/33")},
// IPV6 success.
// TODO: nobody knows how this should work
//{"IPv6 cidr", "2001:db8::/32", "ffff:ffff::", nil},
//{"spaced IPv6 cidr ", " 2001:db8::/32 ", "ffff:ffff::", nil},
// IPv6 failure - tests error.
{"invalid IPv6 cidr", "2001:db8::/333", "", fmt.Errorf("invalid CIDR address: 2001:db8::/333")},
}
for _, ts := range cidrtests {
test := ts
t.Run(test.name, func(t *testing.T) {
output, err := CidrToMask(context.Background(), []types.Value{&types.StrValue{V: test.input}})
expectedStr := &types.StrValue{V: test.expected}
if (test.err == nil) && err != nil {
t.Errorf("input: %s, did not expect error but got: %#v", test.input, err)
return
}
if (test.err != nil) && err != nil {
s := err.Error() // convert to string
if s == test.err.Error() {
return
}
t.Errorf("input: %s, expected error: %q, got: %q", test.input, test.err, err)
return
}
if (test.err != nil) && err == nil {
t.Errorf("input: %s, expected error: %v, but got nil", test.input, test.err)
return
}
if err := output.Cmp(expectedStr); err != nil {
t.Errorf("input: %s, expected: %s, got: %s", test.input, expectedStr, output)
return