ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

static ipam: decide wrong cidr error msg

Browse Source 
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
This commit is contained in:
Miguel Duarte Barroso
2021-06-23 12:27:58 +02:00
parent 0db5882a12
commit a786b12b68
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/ipam/static/main.go
View File

@ -161,7 +161,7 @@ func LoadIPAMConfig(bytes []byte, envArgs string) (*IPAMConfig, string, error) {
ip, subnet, err := net.ParseCIDR(ipstr) ip, subnet, err := net.ParseCIDR(ipstr)
if err != nil { if err != nil {
return nil, "", err return nil, "", fmt.Errorf("the 'ip' field is expected to be in CIDR notation, got: '%s'", ipstr)
} }
addr := Address{ addr := Address{
@ -213,7 +213,8 @@ func LoadIPAMConfig(bytes []byte, envArgs string) (*IPAMConfig, string, error) {
for i := range n.IPAM.Addresses { for i := range n.IPAM.Addresses {
ip, addr, err := net.ParseCIDR(n.IPAM.Addresses[i].AddressStr) ip, addr, err := net.ParseCIDR(n.IPAM.Addresses[i].AddressStr)
if err != nil { if err != nil {
return nil, "", err return nil, "", fmt.Errorf(
"the 'address' field is expected to be in CIDR notation, got: '%s'", n.IPAM.Addresses[i].AddressStr)
} }
n.IPAM.Addresses[i].Address = *addr n.IPAM.Addresses[i].Address = *addr
n.IPAM.Addresses[i].Address.IP = ip n.IPAM.Addresses[i].Address.IP = ip

4
plugins/ipam/static/static_test.go
View File

@ -575,8 +575,8 @@ var _ = Describe("static Operations", func() {
_, _, err := testutils.CmdAddWithArgs(args, func() error { _, _, err := testutils.CmdAddWithArgs(args, func() error {
return cmdAdd(args) return cmdAdd(args)
}) })
Expect(err).Should( Expect(err).Should(MatchError(
MatchError(fmt.Sprintf("invalid CIDR address: %s", ipStr))) fmt.Sprintf("the 'address' field is expected to be in CIDR notation, got: '%s'", ipStr)))
}) })
} }
}) })