Merge pull request #931 from paulbellamy/weavedns_default_search_domain

[dns] resolve names in `weave.local` by default unless hostname or search path is specified

test/230_dns_unqualified_test.sh

@@ -5,6 +5,7 @@
 C1=10.2.0.78
 C2=10.2.0.34
 C3=10.2.0.57
+C4=10.2.0.99
 DOMAIN=weave.local
 NAME=seeone.$DOMAIN
 
@@ -15,8 +16,14 @@ launch_dns_on $HOST1 10.2.254.1/24
 start_container          $HOST1 $C1/24 --name=c1 -h $NAME
 start_container_with_dns $HOST1 $C2/24 --name=c2 -h seetwo.$DOMAIN
 start_container_with_dns $HOST1 $C3/24 --name=c3 --dns-search=$DOMAIN
+container=$(start_container_with_dns $HOST1 $C4/24)
 
-assert "exec_on $HOST1 c2 getent hosts seeone | tr -s ' '" "$C1 $NAME"
-assert "exec_on $HOST1 c3 getent hosts seeone | tr -s ' '" "$C1 $NAME"
+check() {
+  assert "exec_on $HOST1 $1 getent hosts seeone | tr -s ' '" "$C1 $NAME"
+}
+
+check c2
+check c3
+check "$container"
 
 end_suite

test/635_proxy_dns_unqualified_test.sh

@@ -0,0 +1,34 @@
+#! /bin/bash
+
+. ./config.sh
+
+C1=10.2.0.78
+C2=10.2.0.34
+C3=10.2.0.57
+C4=10.2.0.99
+DOMAIN=weave.local
+NAME=seeone.$DOMAIN
+
+start_container() {
+  proxy docker_on $HOST1 run "$@" -dt $DNS_IMAGE /bin/sh
+}
+
+start_suite "Resolve unqualified names"
+
+weave_on $HOST1 launch-dns 10.2.254.1/24
+weave_on $HOST1 launch-proxy
+
+start_container -e WEAVE_CIDR=$C1/24 --name=c1 -h $NAME
+start_container -e WEAVE_CIDR=$C2/24 --name=c2 -h seetwo.$DOMAIN
+start_container -e WEAVE_CIDR=$C3/24 --name=c3 --dns-search=$DOMAIN
+container=$(start_container -e WEAVE_CIDR=$C4/24)
+
+check() {
+  assert "proxy exec_on $HOST1 $1 getent hosts seeone | tr -s ' '" "$C1 $NAME"
+}
+
+check c2
+check c3
+check "$container"
+
+end_suite