Michael Bridgen
0749460652
While we're only reacting to containers going away, it's more convenient to bundle the docker events watcher into the server. I've added a flag to switch it on; and switched it on by default in the container. I also implemented `Zone.DeleteRecordsFor(ident)`, which removes all records for a particular container. One minor change to the structure of the code is that the Zone is now constructed *outside* the server, and given to it and the updater.
82 lines
1.8 KiB
Go
82 lines
1.8 KiB
Go
package weavedns
|
|
|
|
import (
|
|
"net"
|
|
"testing"
|
|
)
|
|
|
|
func TestZone(t *testing.T) {
|
|
var (
|
|
container_id = "deadbeef"
|
|
success_test_name = "test1.weave."
|
|
test_addr1 = "10.0.2.1/24"
|
|
docker_ip = "9.8.7.6"
|
|
)
|
|
|
|
var zone = new(ZoneDb)
|
|
|
|
ip := net.ParseIP(docker_ip)
|
|
weave_ip, subnet, _ := net.ParseCIDR(test_addr1)
|
|
err := zone.AddRecord(container_id, success_test_name, ip, weave_ip, subnet)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Check that the address is now there.
|
|
found_ip, err := zone.MatchLocal(success_test_name)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !found_ip.Equal(weave_ip) {
|
|
t.Fatal("Unexpected result for", success_test_name, ip)
|
|
}
|
|
|
|
// Now try to add the same address again
|
|
err = zone.AddRecord(container_id, success_test_name, ip, weave_ip, subnet)
|
|
if _, ok := err.(DuplicateError); !ok {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Now delete the record
|
|
err = zone.DeleteRecord(container_id, weave_ip)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Check that the address is not there now.
|
|
_, err = zone.MatchLocal(success_test_name)
|
|
if _, ok := err.(LookupError); !ok {
|
|
t.Fatal("Unexpected result when deleting record", success_test_name, err)
|
|
}
|
|
|
|
}
|
|
|
|
func TestDeleteFor(t *testing.T) {
|
|
var (
|
|
id = "foobar"
|
|
name = "foo.weave."
|
|
addr1 = "10.1.2.3/24"
|
|
addr2 = "10.2.7.8/24"
|
|
docker_ip = "172.16.0.4"
|
|
)
|
|
zone := new(ZoneDb)
|
|
ip := net.ParseIP(docker_ip)
|
|
for _, addr := range []string{addr1, addr2} {
|
|
weave_ip, subnet, _ := net.ParseCIDR(addr)
|
|
err := zone.AddRecord(id, name, ip, weave_ip, subnet)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
_, err := zone.MatchLocal(name)
|
|
if err != nil {
|
|
t.Fatal("Did not get result for lookup")
|
|
}
|
|
err = zone.DeleteRecordsFor(id)
|
|
_, err = zone.MatchLocal(name)
|
|
if _, ok := err.(LookupError); !ok {
|
|
t.Fatal("Expected no results after deleting records for ident")
|
|
}
|
|
}
|