0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork/ipams/null: use consts for fixed values

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-22 15:21:33 +02:00
parent 63d477b20e
commit 821ef5cbaf
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libnetwork/ipams/null/null.go
View file

@ -3,27 +3,28 @@
package null
import (
"fmt"
"net"
"github.com/docker/docker/libnetwork/ipamapi"
"github.com/docker/docker/libnetwork/types"
)
var (
defaultAS = "null"
defaultPool, _ = types.ParseCIDR("0.0.0.0/0")
defaultPoolID = fmt.Sprintf("%s/%s", defaultAS, defaultPool.String())
const (
defaultAddressSpace = "null"
defaultPoolCIDR = "0.0.0.0/0"
defaultPoolID = defaultAddressSpace + "/" + defaultPoolCIDR
)
var defaultPool, _ = types.ParseCIDR(defaultPoolCIDR)
type allocator struct{}
func (a *allocator) GetDefaultAddressSpaces() (string, string, error) {
return defaultAS, defaultAS, nil
return defaultAddressSpace, defaultAddressSpace, nil
}
func (a *allocator) RequestPool(addressSpace, pool, subPool string, options map[string]string, v6 bool) (string, *net.IPNet, map[string]string, error) {
if addressSpace != defaultAS {
func (a *allocator) RequestPool(addressSpace, pool, subPool string, _ map[string]string, v6 bool) (string, *net.IPNet, map[string]string, error) {
if addressSpace != defaultAddressSpace {
return "", nil, nil, types.BadRequestErrorf("unknown address space: %s", addressSpace)
}
if pool != "" {

8
libnetwork/ipams/null/null_test.go
View file

@ -9,7 +9,7 @@ import (
func TestPoolRequest(t *testing.T) {
a := allocator{}
pid, pool, _, err := a.RequestPool(defaultAS, "", "", nil, false)
pid, pool, _, err := a.RequestPool(defaultAddressSpace, "", "", nil, false)
if err != nil {
t.Fatal(err)
}
@ -25,17 +25,17 @@ func TestPoolRequest(t *testing.T) {
t.Fatal("Unexpected success")
}
_, _, _, err = a.RequestPool(defaultAS, "192.168.0.0/16", "", nil, false)
_, _, _, err = a.RequestPool(defaultAddressSpace, "192.168.0.0/16", "", nil, false)
if err == nil {
t.Fatal("Unexpected success")
}
_, _, _, err = a.RequestPool(defaultAS, "", "192.168.0.0/24", nil, false)
_, _, _, err = a.RequestPool(defaultAddressSpace, "", "192.168.0.0/24", nil, false)
if err == nil {
t.Fatal("Unexpected success")
}
_, _, _, err = a.RequestPool(defaultAS, "", "", nil, true)
_, _, _, err = a.RequestPool(defaultAddressSpace, "", "", nil, true)
if err == nil {
t.Fatal("Unexpected success")
}