This commit fixes the ip allocator `newAllocator` to produce IP addresses with the original network mask. This is makes more sense. The original functionality can be reproduced by wrapping the produced IP address with the `oneAddressCIDR` helper. Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
95 lines
2.1 KiB
Go
95 lines
2.1 KiB
Go
// Copyright 2019 the Kilo authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package mesh
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestReady(t *testing.T) {
|
|
internalIP := oneAddressCIDR(net.ParseIP("1.1.1.1"))
|
|
externalIP := oneAddressCIDR(net.ParseIP("2.2.2.2"))
|
|
for _, tc := range []struct {
|
|
name string
|
|
node *Node
|
|
ready bool
|
|
}{
|
|
{
|
|
name: "nil",
|
|
node: nil,
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty fields",
|
|
node: &Node{},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty external IP",
|
|
node: &Node{
|
|
InternalIP: internalIP,
|
|
Key: []byte{},
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty internal IP",
|
|
node: &Node{
|
|
ExternalIP: externalIP,
|
|
Key: []byte{},
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty key",
|
|
node: &Node{
|
|
ExternalIP: externalIP,
|
|
InternalIP: internalIP,
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "empty subnet",
|
|
node: &Node{
|
|
ExternalIP: externalIP,
|
|
InternalIP: internalIP,
|
|
Key: []byte{},
|
|
},
|
|
ready: false,
|
|
},
|
|
{
|
|
name: "valid",
|
|
node: &Node{
|
|
ExternalIP: externalIP,
|
|
InternalIP: internalIP,
|
|
Key: []byte{},
|
|
LastSeen: time.Now().Unix(),
|
|
Subnet: &net.IPNet{IP: net.ParseIP("10.2.0.0"), Mask: net.CIDRMask(16, 32)},
|
|
},
|
|
ready: true,
|
|
},
|
|
} {
|
|
ready := tc.node.Ready()
|
|
if ready != tc.ready {
|
|
t.Errorf("test case %q: expected %t, got %t", tc.name, tc.ready, ready)
|
|
}
|
|
}
|
|
}
|