MASSIVE merge from V3-RELEASE-BRANCH into HEAD. HEAD and V3-RELEASE are

now synced as of tag V3-0-3-BETA-1.

2 files changed, 50 insertions, 18 deletions

diff --git a/tests/failover/dhcp-1.cf b/tests/failover/dhcp-1.cf
index 12515991..07842ab0 100644
--- a/tests/failover/dhcp-1.cf
+++ b/tests/failover/dhcp-1.cf
@@ -1,5 +1,16 @@
 authoritative;
 
+class "even" {
+  match if ((extract-int (suffix
+			  (pick-first-value (option dhcp-client-identifier,
+					     hardware), 1), 8) % 2) = 0);
+}
+class "odd" {
+  match if ((extract-int (suffix
+			  (pick-first-value (option dhcp-client-identifier,
+					     hardware), 1), 8) % 2) = 1);
+}
+
 lease-file-name "dhcp-1.leases";
 pid-file-name "dhcp-1.pid";
 ddns-update-style none;
@@ -17,7 +28,7 @@ failover peer "foo" {
   port 51000;
   peer address 10.0.0.1;
   peer port 51001;
-  max-response-delay 7;
+  max-response-delay 60;
   max-unacked-updates 10;
   mclt 100;
   hba ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:
@@ -100,18 +111,6 @@ shared-network LOCAL {
   }
 }
 
-shared-network LOCAL {
-  subnet 127.0.0.0 netmask 255.255.255.0 {
-  }
-  subnet 10.0.2.0 netmask 255.255.255.0 {
-    pool {
-      deny dynamic bootp clients;
-      failover peer "foo";
-      range 10.0.2.100 10.0.2.200;
-    }
-  }
-}
-
 shared-network NET-187 {
   subnet 204.152.187.0 netmask 255.255.255.0 {
   }
@@ -129,9 +128,19 @@ shared-network NET-187 {
 subnet 10.0.0.0 netmask 255.255.255.0 {
   pool {
     deny dynamic bootp clients;
-    deny members of "sniffer";
+    allow members of "even";
+    option impress-servers 10.0.0.0;
+    failover peer "foo";
+    range 10.0.0.10 10.0.0.54;
+    range 10.0.0.100 10.0.0.149;
+  }
+  pool {
+    deny dynamic bootp clients;
+    allow members of "odd";
     failover peer "foo";
-    range 10.0.0.10 10.0.0.200;
+    option impress-servers 10.0.0.1;
+    range 10.0.0.55 10.0.0.99;
+    range 10.0.0.150 10.0.0.200;
   }
   pool { 
     deny dynamic bootp clients;
diff --git a/tests/failover/dhcp-2.cf b/tests/failover/dhcp-2.cf
index cbc47f46..c9dfabe8 100644
--- a/tests/failover/dhcp-2.cf
+++ b/tests/failover/dhcp-2.cf
@@ -1,5 +1,16 @@
 authoritative;
 
+class "even" {
+  match if ((extract-int (suffix
+			  (pick-first-value (option dhcp-client-identifier,
+					     hardware), 1), 8) % 2) = 0);
+}
+class "odd" {
+  match if ((extract-int (suffix
+			  (pick-first-value (option dhcp-client-identifier,
+					     hardware), 1), 8) % 2) = 1);
+}
+
 lease-file-name "dhcp-2.leases";
 pid-file-name "dhcp-2.pid";
 local-port 50000;
@@ -17,7 +28,7 @@ failover peer "foo" {
   port 51001;
   peer address 10.0.0.1;
   peer port 51000;
-  max-response-delay 7;
+  max-response-delay 60;
   max-unacked-updates 10;
   mclt 100;
   load balance max seconds 2;
@@ -101,6 +112,8 @@ shared-network LOCAL {
 shared-network 187-NET {
   subnet 204.152.187.0 netmask 255.255.255.0 {
   }
+  subnet 205.140.116.224 netmask 255.255.255.248 {
+  }
   subnet 10.0.1.0 netmask 255.255.255.0 {
     pool {
       deny dynamic bootp clients;
@@ -113,9 +126,19 @@ shared-network 187-NET {
 subnet 10.0.0.0 netmask 255.255.255.0 {
   pool {
     deny dynamic bootp clients;
-    deny members of "sniffer";
+    allow members of "even";
+    option impress-servers 10.0.0.0;
+    failover peer "foo";
+    range 10.0.0.10 10.0.0.54;
+    range 10.0.0.100 10.0.0.149;
+  }
+  pool {
+    deny dynamic bootp clients;
+    allow members of "odd";
     failover peer "foo";
-    range 10.0.0.10 10.0.0.200;
+    option impress-servers 10.0.0.1;
+    range 10.0.0.55 10.0.0.99;
+    range 10.0.0.150 10.0.0.200;
   }
   pool {
     deny dynamic bootp clients;