summaryrefslogtreecommitdiff
path: root/keama/tests/fordhcp
diff options
context:
space:
mode:
Diffstat (limited to 'keama/tests/fordhcp')
-rw-r--r--keama/tests/fordhcp/dhcpd.conf94
-rw-r--r--keama/tests/fordhcp/dhcpd.conf.old94
-rw-r--r--keama/tests/fordhcp/dhcpd.conf.orig94
-rw-r--r--keama/tests/fordhcp/dhcpd.emp-wireless-149-20.conf33
-rw-r--r--keama/tests/fordhcp/dhcpd.office-149-20.conf112
-rw-r--r--keama/tests/fordhcp/dhcpd.office-static-149-20.conf98
-rw-r--r--keama/tests/fordhcp/dhcpd.office-static-149-20.conf.orig97
-rw-r--r--keama/tests/fordhcp/dhcpd.omapi.key8
-rw-r--r--keama/tests/fordhcp/dhcpd.staging.conf65
-rw-r--r--keama/tests/fordhcp/dhcpd.staging.conf.orig80
-rw-r--r--keama/tests/fordhcp/dhcpd.stubs.conf21
-rw-r--r--keama/tests/fordhcp/dhcpd.voip-149-20.conf77
-rw-r--r--keama/tests/fordhcp/dhcpd.voip.conf31
-rw-r--r--keama/tests/fordhcp/dhcpd.wvlan.conf34
-rw-r--r--keama/tests/fordhcp/kea.json1029
-rw-r--r--keama/tests/fordhcp/run.sh30
16 files changed, 0 insertions, 1997 deletions
diff --git a/keama/tests/fordhcp/dhcpd.conf b/keama/tests/fordhcp/dhcpd.conf
deleted file mode 100644
index 380b70a9..00000000
--- a/keama/tests/fordhcp/dhcpd.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-# dhcpd.conf file for jaguar in 950 charter failover pair jaguar and
-# gozer.
-#
-# NOTE: DHCP Service for the 950 Wireless Network is now being
-# handled by sauber.isc.org.
-#
-
-#######################################################################
-# Global Configuration
-#
-
-lease-file-name "/var/db/dhcpd/dhcpd.leases";
-
-log-facility local0;
-
-ddns-update-style none;
-authoritative;
-
-one-lease-per-client on;
-
-option domain-name "sql1.isc.org isc.org";
-# Comment this out for 3.0.x (no support).
-#option domain-search "sql1.isc.org", "isc.org";
-option domain-name-servers 149.20.50.10, 149.20.64.127, 149.20.64.63;
-
-default-lease-time 1800; # 30 minutes.
-max-lease-time 1800; # 30 week
-
-#default-lease-time 3100; # 51 minutes.
-#max-lease-time 604800; # 1 week
-
-# If the client supplied these values, log them in the leases file.
-if exists vendor-class-identifier {
- set vendor-string = option vendor-class-identifier;
-}
-if exists user-class {
- set user-string = option user-class;
-}
-
-#######################################################################
-# OMAPI Configuration
-#
-# i don't think we use this anymore. i'd like to remake the key before
-# using it again anyway.
-
-include "fordhcp/dhcpd.omapi.key";
-
-omapi-port 500;
-omapi-key OM_KEY;
-
-#######################################################################
-# Failover Configuration
-#
-
-##failover peer "isc" {
-# primary;
-# address f1.sql1.isc.org;
-# port 647;
-# peer address f2.sql1.isc.org;
-# peer port 647;
-# max-response-delay 5;
-# max-unacked-updates 10;
-# mclt 10;
-# hba aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:
-# aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa;
-# split 128;
-# load balance max seconds 5;
-#}
-
-##failover peer "sco" {
-# primary;
-# address f1.sql1.isc.org;
-# port 5200;
-# peer address sco.lab.isc.org;
-# peer port 5201;
-# max-response-delay 5;
-# max-unacked-updates 10;
-# mclt 3600;
-# split 128;
-# load balance max seconds 5;
-#}
-
-#######################################################################
-# Client-Network Includes
-#
-
-include "fordhcp/dhcpd.stubs.conf";
-include "fordhcp/dhcpd.voip.conf";
-include "fordhcp/dhcpd.wvlan.conf";
-include "fordhcp/dhcpd.emp-wireless-149-20.conf";
-include "fordhcp/dhcpd.office-149-20.conf";
-include "fordhcp/dhcpd.office-static-149-20.conf";
-include "fordhcp/dhcpd.voip-149-20.conf";
-include "fordhcp/dhcpd.staging.conf";
diff --git a/keama/tests/fordhcp/dhcpd.conf.old b/keama/tests/fordhcp/dhcpd.conf.old
deleted file mode 100644
index 85dace89..00000000
--- a/keama/tests/fordhcp/dhcpd.conf.old
+++ /dev/null
@@ -1,94 +0,0 @@
-# dhcpd.conf file for jaguar in 950 charter failover pair jaguar and
-# gozer.
-#
-# NOTE: DHCP Service for the 950 Wireless Network is now being
-# handled by sauber.isc.org.
-#
-
-#######################################################################
-# Global Configuration
-#
-
-lease-file-name "/var/db/dhcpd.leases";
-
-log-facility local0;
-
-ddns-update-style none;
-authoritative;
-
-one-lease-per-client on;
-
-option domain-name "sql1.isc.org isc.org";
-# Comment this out for 3.0.x (no support).
-#option domain-search "sql1.isc.org", "isc.org";
-option domain-name-servers 149.20.50.10, 204.152.187.13, 204.152.187.14;
-
-default-lease-time 1800; # 30 minutes.
-max-lease-time 1800; # 30 week
-
-#default-lease-time 3100; # 51 minutes.
-#max-lease-time 604800; # 1 week
-
-# If the client supplied these values, log them in the leases file.
-if exists vendor-class-identifier {
- set vendor-string = option vendor-class-identifier;
-}
-if exists user-class {
- set user-string = option user-class;
-}
-
-#######################################################################
-# OMAPI Configuration
-#
-# i don't think we use this anymore. i'd like to remake the key before
-# using it again anyway.
-
-include "/etc/dhcpd.omapi.key";
-
-omapi-port 500;
-omapi-key OM_KEY;
-
-#######################################################################
-# Failover Configuration
-#
-
-##failover peer "isc" {
-# primary;
-# address f1.sql1.isc.org;
-# port 647;
-# peer address f2.sql1.isc.org;
-# peer port 647;
-# max-response-delay 5;
-# max-unacked-updates 10;
-# mclt 10;
-# hba aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:
-# aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa;
-# split 128;
-# load balance max seconds 5;
-#}
-
-##failover peer "sco" {
-# primary;
-# address f1.sql1.isc.org;
-# port 5200;
-# peer address sco.lab.isc.org;
-# peer port 5201;
-# max-response-delay 5;
-# max-unacked-updates 10;
-# mclt 3600;
-# split 128;
-# load balance max seconds 5;
-#}
-
-#######################################################################
-# Client-Network Includes
-#
-
-include "/etc/dhcpd.stubs.conf";
-include "/etc/dhcpd.voip.conf";
-include "/etc/dhcpd.wvlan.conf";
-include "/etc/dhcpd.emp-wireless-149-20.conf";
-include "/etc/dhcpd.office-149-20.conf";
-include "/etc/dhcpd.office-static-149-20.conf";
-include "/etc/dhcpd.voip-149-20.conf";
-include "/etc/dhcpd.staging.conf";
diff --git a/keama/tests/fordhcp/dhcpd.conf.orig b/keama/tests/fordhcp/dhcpd.conf.orig
deleted file mode 100644
index 17f31e7b..00000000
--- a/keama/tests/fordhcp/dhcpd.conf.orig
+++ /dev/null
@@ -1,94 +0,0 @@
-# dhcpd.conf file for jaguar in 950 charter failover pair jaguar and
-# gozer.
-#
-# NOTE: DHCP Service for the 950 Wireless Network is now being
-# handled by sauber.isc.org.
-#
-
-#######################################################################
-# Global Configuration
-#
-
-lease-file-name "/var/db/dhcpd/dhcpd.leases";
-
-log-facility local0;
-
-ddns-update-style none;
-authoritative;
-
-one-lease-per-client on;
-
-option domain-name "sql1.isc.org isc.org";
-# Comment this out for 3.0.x (no support).
-#option domain-search "sql1.isc.org", "isc.org";
-option domain-name-servers 149.20.50.10, 149.20.64.127, 149.20.64.63;
-
-default-lease-time 1800; # 30 minutes.
-max-lease-time 1800; # 30 week
-
-#default-lease-time 3100; # 51 minutes.
-#max-lease-time 604800; # 1 week
-
-# If the client supplied these values, log them in the leases file.
-if exists vendor-class-identifier {
- set vendor-string = option vendor-class-identifier;
-}
-if exists user-class {
- set user-string = option user-class;
-}
-
-#######################################################################
-# OMAPI Configuration
-#
-# i don't think we use this anymore. i'd like to remake the key before
-# using it again anyway.
-
-include "/etc/dhcpd.omapi.key";
-
-omapi-port 500;
-omapi-key OM_KEY;
-
-#######################################################################
-# Failover Configuration
-#
-
-##failover peer "isc" {
-# primary;
-# address f1.sql1.isc.org;
-# port 647;
-# peer address f2.sql1.isc.org;
-# peer port 647;
-# max-response-delay 5;
-# max-unacked-updates 10;
-# mclt 10;
-# hba aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:
-# aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa:aa;
-# split 128;
-# load balance max seconds 5;
-#}
-
-##failover peer "sco" {
-# primary;
-# address f1.sql1.isc.org;
-# port 5200;
-# peer address sco.lab.isc.org;
-# peer port 5201;
-# max-response-delay 5;
-# max-unacked-updates 10;
-# mclt 3600;
-# split 128;
-# load balance max seconds 5;
-#}
-
-#######################################################################
-# Client-Network Includes
-#
-
-include "/etc/dhcpd.stubs.conf";
-include "/etc/dhcpd.voip.conf";
-include "/etc/dhcpd.wvlan.conf";
-include "/etc/dhcpd.emp-wireless-149-20.conf";
-include "/etc/dhcpd.office-149-20.conf";
-include "/etc/dhcpd.office-static-149-20.conf";
-include "/etc/dhcpd.voip-149-20.conf";
-include "/etc/dhcpd.staging.conf";
diff --git a/keama/tests/fordhcp/dhcpd.emp-wireless-149-20.conf b/keama/tests/fordhcp/dhcpd.emp-wireless-149-20.conf
deleted file mode 100644
index a7ce67a6..00000000
--- a/keama/tests/fordhcp/dhcpd.emp-wireless-149-20.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-# dhcpd.emp-wireless-149-20.conf file for 950 Charter Wireless network,
-# served by the 950 charter #failover peerset. This file may be copied
-# to /etc between these two systems without modifications.
-#
-
-subnet 149.20.50.192 netmask 255.255.255.192 {
- option subnet-mask 255.255.255.192;
- option routers 149.20.50.193;
- option broadcast-address 149.20.50.255;
-
- always-broadcast true;
-
- default-lease-time 1200; # 20 minutes
- max-lease-time 1200; # 20 minutes
-
- pool {
- #failover peer "isc";
- deny dynamic bootp clients;
- range 149.20.50.196 149.20.50.254;
- }
-}
-
-#; 149.20.50.192/26 - SQL1 Employee WiFi
-#192 IN PTR sql1-wifi.sql1.isc.org.
-# A 255.255.255.224
-#193 IN PTR exit.sql1-wifi.sql1.isc.org.
-#194 IN PTR sql1-wifi.f1.sql1.isc.org.
-#195 IN PTR sql1-wifi.f2.sql1.isc.org.
-#
-#$GENERATE 200-254 $ PTR dhcp-$.sql1.isc.org.
-#
-#255 IN PTR bcast.sql1-wifi.sql1.isc.org.
-#
diff --git a/keama/tests/fordhcp/dhcpd.office-149-20.conf b/keama/tests/fordhcp/dhcpd.office-149-20.conf
deleted file mode 100644
index aa0091cd..00000000
--- a/keama/tests/fordhcp/dhcpd.office-149-20.conf
+++ /dev/null
@@ -1,112 +0,0 @@
-# dhcpd.office-149-20.conf file for office-net DHCP pools served by the
-# 950 Charter #failover peerset. This file may be copied to /etc between
-# these two systems without modifications.
-#
-
-# APC powerrack systems need tender care and loving molestation to behave
-# appropriately by default.
-option space APC;
-option APC.cookie code 1 = string;
-
-option APC.cookie "1APC";
-
-class "APC" {
- match if substring(option vendor-class-identifier, 0, 3) = "APC";
-
- vendor-option-space APC;
-}
-
-# This option is in the site-local space, but it is a de-facto standard
-# today.
-option wpad code 252 = text;
-
-# The least potentially damaging empty value to hopefully convince clients not
-# to engage in DNS.
-option wpad "\n\000";
-
-class "MSFT" {
- match if substring(option vendor-class-identifier, 0, 4) = "MSFT";
-
- # Windows doesn't put WPAD on its PRL, but does consume it.
- option dhcp-parameter-request-list =
- concat(option dhcp-parameter-request-list, fc);
-}
-
-
-# Local PXE support. For now we only boot SUSE.
-option space PXE;
-option PXE.mtftp-ip code 1 = ip-address;
-option PXE.mtftp-oport code 2 = unsigned integer 16;
-option PXE.mtftp-sport code 3 = unsigned integer 16;
-option PXE.mtftp-tmout code 4 = unsigned integer 8;
-option PXE.mtftp-delay code 5 = unsigned integer 8;
-option PXE.discovery-control code 6 = unsigned integer 8;
-option PXE.discovery-mcast-addr code 7 = unsigned integer 8;
-
-# These are 'site local' options the PXELinux bootloader uses.
-option space pxelinux;
-option pxelinux.magic code 208 = string;
-option pxelinux.configfile code 209 = text;
-option pxelinux.pathprefix code 210 = text;
-option pxelinux.reboottime code 211 = unsigned integer 32;
-
-class "pxeclients" {
- match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
- # Some PXE clients are said to require that the vci be sent.
- # But it seems clear that if we send these PXE and vendor-class
- # options, it also expects "extended DHCP" via port 4011. For
- # PXE versions 2 and onwards.
- option vendor-class-identifier "PXEClient";
- vendor-option-space PXE;
-
- ddns-updates off;
-
- # Some PXE clients refuse to tftp if mtftp fails. Others take
- # longer.
- option PXE.mtftp-ip 0.0.0.0;
- filename "pxelinux.0";
- next-server 204.152.187.81;
-
- site-option-space "pxelinux";
- # PXE does not request site-local options.
- if exists dhcp-parameter-request-list {
- option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);
- }
- option pxelinux.reboottime 30;
-}
-
-subnet 149.20.50.0 netmask 255.255.255.128 {
- option subnet-mask 255.255.255.128;
- option routers 149.20.50.1;
- option broadcast-address 149.20.50.127;
-
- ddns-updates off;
-
- pool {
- #failover peer "isc";
- deny dynamic bootp clients;
- range 149.20.50.33 149.20.50.120;
-# future expansion
-# range 149.20.50.x 149.20.50.y;
- }
-}
-
-#; 149.20.50.0/25 - SQL1 Office Desktop Machines
-#0 IN PTR sql1-office.sql1.isc.org.
-# A 255.255.255.128
-#1 IN PTR exit.sql1-office.sql1.isc.org.
-#2 IN PTR sql1-office.f1.sql1.isc.org.
-#3 IN PTR sql1-office.f2.sql1.isc.org.
-#
-#; Leave 4-19 free for static allocations.
-#
-#$GENERATE 20-120 $ PTR dhcp-$.sql1.isc.org.
-#
-#127 IN PTR bcast.sql1-office.sql1.isc.org.
-
-
-#class "smart-clients" {
-# match if substring (hardware, 1, 3) = 00:10:4b;
-# option domain-name-servers 127.0.0.1;
-#}
-
diff --git a/keama/tests/fordhcp/dhcpd.office-static-149-20.conf b/keama/tests/fordhcp/dhcpd.office-static-149-20.conf
deleted file mode 100644
index 5766428e..00000000
--- a/keama/tests/fordhcp/dhcpd.office-static-149-20.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-#######################################################################
-# Static DHCP leases
-#
-
-# gone
-#host draft.isc.org {
-# hardware ethernet 00:80:77:3a:5f:24;
-# fixed-address 149.20.50.19;
-#}
-
-host the-edge.isc.org {
- hardware ethernet 00:80:77:48:ed:5d;
- fixed-address 149.20.50.18;
-}
-
-host stupidapc.isc.org {
- hardware ethernet 00:c0:b7:7f:41:f0;
- fixed-address 149.20.50.126;
-}
-
-host redraft.isc.org {
- hardware ethernet 00:80:77:96:e1:2c;
- fixed-address 149.20.50.17;
-}
-
-host pres.isc.org {
- hardware ethernet 2c:41:38:7e:b0:b8;
- fixed-address 149.20.50.5;
-}
-
-host virtalarm.isc.org {
- hardware ethernet 00:19:bb:e1:32:13;
- fixed-address 149.20.50.12;
-}
-
-host colour-q.isc.org {
- hardware ethernet 00:20:6b:52:4a:c2;
- fixed-address 149.20.50.16;
-}
-
-host finance-printer.isc.org {
- hardware ethernet 00:80:77:3b:57:1f;
- fixed-address 149.20.50.15;
-}
-
-host backdraft.isc.org {
- hardware ethernet 00:14:d1:72:10:c9;
- fixed-address 149.20.50.14;
-}
-
-host hr-printer.isc.org {
- hardware ethernet 00:24:81:2d:ab:22;
- fixed-address 149.20.50.21;
-}
-
-host lincoln.isc.org {
- hardware ethernet 30:05:5c:4a:a2:a1;
- fixed-address 149.20.50.23;
-}
-
-host sql1a.kvm.isc.org {
- hardware ethernet 00:80:a3:8c:4c:91;
- fixed-address 149.20.50.9;
-}
-
-host sql1b.kvm.isc.org {
- hardware ethernet 00:80:a3:8c:96:ba;
- #hardware ethernet 00:80:a3:8c:4c:91;
- fixed-address 149.20.50.19;
-}
-
-
-# Dan WS
-host sphynx.isc.org {
- hardware ethernet c4:2c:03:04:e0:86;
- fixed-address 149.20.50.7;
-}
-
-host ycam-bullet-1 {
- hardware ethernet 00:22:C0:10:0D:63;
-# duplicate address
-# fixed-address 149.20.50.12;
-}
-
-host ycam-bullet-2 {
- hardware ethernet 00:22:C0:10:0D:5A;
- fixed-address 149.20.50.13;
-}
-
-host ycam-knight-1 {
- hardware ethernet 78:12:B8:00:20:DA;
- fixed-address 149.20.50.20;
-}
-
-host ycam-knight-2 {
- hardware ethernet 78:12:B8:00:20:D4;
- fixed-address 149.20.50.22;
-}
diff --git a/keama/tests/fordhcp/dhcpd.office-static-149-20.conf.orig b/keama/tests/fordhcp/dhcpd.office-static-149-20.conf.orig
deleted file mode 100644
index 46a264cc..00000000
--- a/keama/tests/fordhcp/dhcpd.office-static-149-20.conf.orig
+++ /dev/null
@@ -1,97 +0,0 @@
-#######################################################################
-# Static DHCP leases
-#
-
-# gone
-#host draft.isc.org {
-# hardware ethernet 00:80:77:3a:5f:24;
-# fixed-address 149.20.50.19;
-#}
-
-host the-edge.isc.org {
- hardware ethernet 00:80:77:48:ed:5d;
- fixed-address 149.20.50.18;
-}
-
-host stupidapc.isc.org {
- hardware ethernet 00:c0:b7:7f:41:f0;
- fixed-address 149.20.50.126;
-}
-
-host redraft.isc.org {
- hardware ethernet 00:80:77:96:e1:2c;
- fixed-address 149.20.50.17;
-}
-
-host pres.isc.org {
- hardware ethernet 2c:41:38:7e:b0:b8;
- fixed-address 149.20.50.5;
-}
-
-host virtalarm.isc.org {
- hardware ethernet 00:19:bb:e1:32:13;
- fixed-address 149.20.50.12;
-}
-
-host colour-q.isc.org {
- hardware ethernet 00:20:6b:52:4a:c2;
- fixed-address 149.20.50.16;
-}
-
-host finance-printer.isc.org {
- hardware ethernet 00:80:77:3b:57:1f;
- fixed-address 149.20.50.15;
-}
-
-host backdraft.isc.org {
- hardware ethernet 00:14:d1:72:10:c9;
- fixed-address 149.20.50.14;
-}
-
-host hr-printer.isc.org {
- hardware ethernet 00:24:81:2d:ab:22;
- fixed-address 149.20.50.21;
-}
-
-host lincoln.isc.org {
- hardware ethernet 30:05:5c:4a:a2:a1;
- fixed-address 149.20.50.23;
-}
-
-host sql1a.kvm.isc.org {
- hardware ethernet 00:80:a3:8c:4c:91;
- fixed-address 149.20.50.9;
-}
-
-host sql1b.kvm.isc.org {
- hardware ethernet 00:80:a3:8c:96:ba;
- #hardware ethernet 00:80:a3:8c:4c:91;
- fixed-address 149.20.50.19;
-}
-
-
-# Dan WS
-host sphynx.isc.org {
- hardware ethernet c4:2c:03:04:e0:86;
- fixed-address 149.20.50.7;
-}
-
-host ycam-bullet-1 {
- hardware ethernet 00:22:C0:10:0D:63;
- fixed-address 149.20.50.12;
-}
-
-host ycam-bullet-2 {
- hardware ethernet 00:22:C0:10:0D:5A;
- fixed-address 149.20.50.13;
-}
-
-host ycam-knight-1 {
- hardware ethernet 78:12:B8:00:20:DA;
- fixed-address 149.20.50.20;
-}
-
-host ycam-knight-2 {
- hardware ethernet 78:12:B8:00:20:D4;
- fixed-address 149.20.50.22;
-}
diff --git a/keama/tests/fordhcp/dhcpd.omapi.key b/keama/tests/fordhcp/dhcpd.omapi.key
deleted file mode 100644
index 8b8d5f9b..00000000
--- a/keama/tests/fordhcp/dhcpd.omapi.key
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# This key is used for OMAPI/omshell access.
-
-key OM_KEY {
- algorithm HMAC-MD5.SIG-ALG.REG.INT;
- secret dvEmB76cVjskCznFKv9GMw==;
-}
-
diff --git a/keama/tests/fordhcp/dhcpd.staging.conf b/keama/tests/fordhcp/dhcpd.staging.conf
deleted file mode 100644
index 1091d5d4..00000000
--- a/keama/tests/fordhcp/dhcpd.staging.conf
+++ /dev/null
@@ -1,65 +0,0 @@
-# dhcpd.staging.conf file for the SQL1 staging network,
-# served by the 950 charter #failover peerset. This file may be copied
-# to /etc between these two systems without modifications.
-#
-
-# Removed already defined PXE
-
-class "pxeclients" {
- # match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
- # Some PXE clients are said to require that the vci be sent.
- # But it seems clear that if we send these PXE and vendor-class
- # options, it also expects "extended DHCP" via port 4011. For
- # PXE versions 2 and onwards.
- option vendor-class-identifier "PXEClient";
- vendor-option-space PXE;
-
- ddns-updates off;
-
- # Some PXE clients refuse to tftp if mtftp fails. Others take
- # longer.
- option PXE.mtftp-ip 0.0.0.0;
- filename "pxelinux.0";
- next-server 149.20.49.228;
-
- site-option-space "pxelinux";
- # PXE does not request site-local options.
- if exists dhcp-parameter-request-list {
- option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);
- }
- option pxelinux.reboottime 30;
-}
-
-subnet 149.20.49.224 netmask 255.255.255.224 {
- option subnet-mask 255.255.255.224;
- option routers 149.20.49.225;
- option broadcast-address 149.20.49.255;
-
- always-broadcast true;
-
- default-lease-time 60; # 1 minutes
- max-lease-time 60; # 1 minutes
-
-# default-lease-time 1200; # 20 minutes
-# max-lease-time 1200; # 20 minutes
-
- pool {
- #failover peer "isc";
- deny dynamic bootp clients;
- range 149.20.49.240 149.20.49.252;
- }
-}
-
-#; 149.20.49.224/27 - SQL1 Device Staging
-#224 IN PTR staging.sql1.isc.org.
-# A 255.255.255.224
-#225 IN PTR exit.staging.sql1.isc.org.
-#226 IN PTR staging.f1.sql1.isc.org.
-#227 IN PTR staging.f2.sql1.isc.org.
-#
-#; 228-239 for static allocations during staging
-#
-#$GENERATE 240-252 $ PTR staging-$.sql1.isc.org.
-#
-#255 IN PTR bcast.staging.sql1.isc.org.
-
diff --git a/keama/tests/fordhcp/dhcpd.staging.conf.orig b/keama/tests/fordhcp/dhcpd.staging.conf.orig
deleted file mode 100644
index 37a7fdb4..00000000
--- a/keama/tests/fordhcp/dhcpd.staging.conf.orig
+++ /dev/null
@@ -1,80 +0,0 @@
-# dhcpd.staging.conf file for the SQL1 staging network,
-# served by the 950 charter #failover peerset. This file may be copied
-# to /etc between these two systems without modifications.
-#
-
-# Local PXE support. For our netboot OS installer
-option space PXE;
-option PXE.mtftp-ip code 1 = ip-address;
-option PXE.mtftp-oport code 2 = unsigned integer 16;
-option PXE.mtftp-sport code 3 = unsigned integer 16;
-option PXE.mtftp-tmout code 4 = unsigned integer 8;
-option PXE.mtftp-delay code 5 = unsigned integer 8;
-option PXE.discovery-control code 6 = unsigned integer 8;
-option PXE.discovery-mcast-addr code 7 = unsigned integer 8;
-
-# These are 'site local' options the PXELinux bootloader uses.
-option space pxelinux;
-option pxelinux.magic code 208 = string;
-option pxelinux.configfile code 209 = text;
-option pxelinux.pathprefix code 210 = text;
-option pxelinux.reboottime code 211 = unsigned integer 32;
-
-class "pxeclients" {
- match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
- # Some PXE clients are said to require that the vci be sent.
- # But it seems clear that if we send these PXE and vendor-class
- # options, it also expects "extended DHCP" via port 4011. For
- # PXE versions 2 and onwards.
- option vendor-class-identifier "PXEClient";
- vendor-option-space PXE;
-
- ddns-updates off;
-
- # Some PXE clients refuse to tftp if mtftp fails. Others take
- # longer.
- option PXE.mtftp-ip 0.0.0.0;
- filename "pxelinux.0";
- next-server 149.20.49.228;
-
- site-option-space "pxelinux";
- # PXE does not request site-local options.
- if exists dhcp-parameter-request-list {
- option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);
- }
- option pxelinux.reboottime 30;
-}
-
-subnet 149.20.49.224 netmask 255.255.255.224 {
- option subnet-mask 255.255.255.224;
- option routers 149.20.49.225;
- option broadcast-address 149.20.49.255;
-
- always-broadcast true;
-
- default-lease-time 60; # 1 minutes
- max-lease-time 60; # 1 minutes
-
-# default-lease-time 1200; # 20 minutes
-# max-lease-time 1200; # 20 minutes
-
- pool {
- #failover peer "isc";
- deny dynamic bootp clients;
- range 149.20.49.240 149.20.49.252;
- }
-}
-
-#; 149.20.49.224/27 - SQL1 Device Staging
-#224 IN PTR staging.sql1.isc.org.
-# A 255.255.255.224
-#225 IN PTR exit.staging.sql1.isc.org.
-#226 IN PTR staging.f1.sql1.isc.org.
-#227 IN PTR staging.f2.sql1.isc.org.
-#
-#; 228-239 for static allocations during staging
-#
-#$GENERATE 240-252 $ PTR staging-$.sql1.isc.org.
-#
-#255 IN PTR bcast.staging.sql1.isc.org.
-
diff --git a/keama/tests/fordhcp/dhcpd.stubs.conf b/keama/tests/fordhcp/dhcpd.stubs.conf
deleted file mode 100644
index e8a96879..00000000
--- a/keama/tests/fordhcp/dhcpd.stubs.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# These are stub subnets to inform the DHCP server that they exist.
-
-# sql1-blue, the "outside" network
-subnet 149.20.48.0 netmask 255.255.255.128 {
- not authoritative;
-}
-
-# 187-net is all but dead
-subnet 204.152.187.0 netmask 255.255.255.0 {
- not authoritative;
-}
-
-# QuickBooks/GreatPlains VLAN
-subnet 149.20.48.128 netmask 255.255.255.240 {
- not authoritative;
-}
-
-# Device management VLAN
-subnet 149.20.60.0 netmask 255.255.255.0 {
- not authoritative;
-}
diff --git a/keama/tests/fordhcp/dhcpd.voip-149-20.conf b/keama/tests/fordhcp/dhcpd.voip-149-20.conf
deleted file mode 100644
index c78efcbb..00000000
--- a/keama/tests/fordhcp/dhcpd.voip-149-20.conf
+++ /dev/null
@@ -1,77 +0,0 @@
-# dhcpd.voip-149-20.conf file for Voice over IP phone network served by the
-# 950 charter #failover peerset. This file may be copied to /etc between these
-# two systems without modifications.
-#
-
-subnet 149.20.50.128 netmask 255.255.255.192 {
- option subnet-mask 255.255.255.192;
- option routers 149.20.50.129;
- option broadcast-address 149.20.50.191;
- option tftp-server-name "149.20.32.15";
- option ntp-servers 149.20.64.28;
-
- pool {
-# #failover peer "isc";
- deny dynamic bootp clients;
- range 149.20.50.140 149.20.50.190;
- }
-}
-
-host test-7960 {
- hardware ethernet 00:0B:FD:32:E6:FA;
- option tftp-server-name "149.20.48.24";
-}
-
-host test-7960A {
- hardware ethernet 00:07:0E:36:48:19;
- option tftp-server-name "149.20.48.24";
-}
-
-host test-7960B {
- hardware ethernet 00:03:E3:A5:20:31;
- option tftp-server-name "149.20.48.24";
-}
-
-host polycom-6000a {
- hardware ethernet 00:04:F2:E4:C2:79;
- option tftp-server-name "http://asterisk.isc.org/polycom";
-}
-
-host polycom-5000b {
- hardware ethernet 00:04:F2:E7:3D:53;
- option tftp-server-name "http://asterisk.isc.org/polycom";
-}
-
-host polycom-5000c {
- hardware ethernet 00:04:F2:E7:74:E8;
- option tftp-server-name "http://asterisk.isc.org/polycom";
-}
-
-host polycom-5000d {
- hardware ethernet 00:04:F2:E7:95:40;
- option tftp-server-name "http://asterisk.isc.org/polycom";
-}
-
-host polycom-5000e {
- hardware ethernet 00:04:F2:F3:32:58;
- option tftp-server-name "http://asterisk.isc.org/polycom";
-}
-
-host polycom-5000a {
- hardware ethernet 00:04:F2:E7:3E:F2;
- option tftp-server-name "http://asterisk.isc.org/polycom";
-}
-
-
-
-#; 149.20.50.128/26 - SQL1 VOIP Telephones
-#128 IN PTR sql1-phones.sql1.isc.org.
-# A 255.255.255.192
-#129 IN PTR exit.sql1-phones.sql1.isc.org.
-#130 IN PTR sql1-phones.f1.sql1.isc.org.
-#131 IN PTR sql1-phones.f2.sql1.isc.org.
-#
-#$GENERATE 140-190 $ PTR voip-$.sql1.isc.org.
-#
-#191 IN PTR bcast.sql1-office.sql1.isc.org.
-#
diff --git a/keama/tests/fordhcp/dhcpd.voip.conf b/keama/tests/fordhcp/dhcpd.voip.conf
deleted file mode 100644
index 3b9a0469..00000000
--- a/keama/tests/fordhcp/dhcpd.voip.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# dhcpd.voip.conf file for Voice over IP phone network served by the 950
-# charter #failover peerset. This file may be copied to /etc between these
-# two systems without modifications.
-#
-
-subnet 204.152.185.128 netmask 255.255.255.192 {
- option subnet-mask 255.255.255.192;
- option broadcast-address 204.152.185.191;
- option routers 204.152.185.129;
- option tftp-server-name "149.20.32.15";
-
- pool {
- #failover peer "isc";
- deny dynamic bootp clients;
- range 204.152.185.135 204.152.185.185;
- }
-}
-
-# asterisk.isc.org - VOIP PBX like thing.
-#host asterisk {
-# hardware ethernet 00:d0:b7:47:94:45;
-# hardware ethernet 00:02:B3:88:C5:27;
-# fixed-address 204.152.185.133;
-#}
-
-# an older iteration of asterisk
-#host asterisk-old {
-# hardware ethernet 00:90:27:73:86:bb;
-# fixed-address 204.152.185.134;
-#}
-
diff --git a/keama/tests/fordhcp/dhcpd.wvlan.conf b/keama/tests/fordhcp/dhcpd.wvlan.conf
deleted file mode 100644
index f005c583..00000000
--- a/keama/tests/fordhcp/dhcpd.wvlan.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# dhcpd.wvlan.conf file for 950 Charter Wireless network, served by the 950
-# charter #failover peerset. This file may be copied to /etc between these
-# two systems without modifications.
-#
-
-subnet 204.152.189.0 netmask 255.255.255.192 {
- option routers 204.152.189.1;
- option subnet-mask 255.255.255.192;
- option broadcast-address 204.152.189.63;
-
- always-broadcast true;
-
- default-lease-time 3100; # 51 minutes
- max-lease-time 3100; # 51 minutes
-
- pool {
- #failover peer "isc";
- deny dynamic bootp clients;
- range 204.152.189.15 204.152.189.50;
- }
-}
-
-# wavelan-in-hallway
-host wavelan-in-hallway {
- hardware ethernet 00:60:1d:1b:97:5b;
- fixed-address 204.152.189.11;
-}
-
-# wavelan-in-backroom
-host wavelan-in-backroom {
- hardware ethernet 00:60:1d:1b:97:6e;
- fixed-address 204.152.189.10;
-}
-
diff --git a/keama/tests/fordhcp/kea.json b/keama/tests/fordhcp/kea.json
deleted file mode 100644
index 3188a648..00000000
--- a/keama/tests/fordhcp/kea.json
+++ /dev/null
@@ -1,1029 +0,0 @@
-{
- # dhcpd.conf file for jaguar in 950 charter failover pair jaguar and
- # gozer.
- #
- # NOTE: DHCP Service for the 950 Wireless Network is now being
- # handled by sauber.isc.org.
- #
- #######################################################################
- # Global Configuration
- #
- /// This configuration declares some subnets but has no interfaces-config
- /// Reference Kea #245
- "Dhcp4": {
-// "config": [
-// /// lease-file-name is an internal ISC DHCP feature
-// {
-// "name": "lease-file-name",
-// "code": 26,
-// "value": "/var/db/dhcpd/dhcpd.leases"
-// },
-// /// log-facility is not supported
-// /// Please use the KEA_LOGGER_DESTINATION environment variable instead
-// {
-// "name": "log-facility",
-// "code": 44,
-// "value": "local0"
-// },
-// /// one-lease-per-client is not supported
-// /// Reference Kea #238
-// {
-// "name": "one-lease-per-client",
-// "code": 10,
-// "value": true
-// },
-// /// omapi-port is an internal ISC DHCP feature
-// {
-// "name": "omapi-port",
-// "code": 31,
-// "value": 500
-// },
-// /// omapi-key is an internal ISC DHCP feature
-// {
-// "name": "omapi-key",
-// "code": 36,
-// "value": "OM_KEY"
-// }
-// ],
- "dhcp-ddns": {
- "enable-updates": false
- },
- "authoritative": true,
- "option-data": [
- {
- "space": "dhcp4",
- "name": "domain-name",
- "code": 15,
- "data": "sql1.isc.org isc.org"
- },
- # Comment this out for 3.0.x (no support).
- #option domain-search "sql1.isc.org", "isc.org";
- {
- "space": "dhcp4",
- "name": "domain-name-servers",
- "code": 6,
- "data": "149.20.50.10, 149.20.64.127, 149.20.64.63"
- },
- {
- "space": "APC",
- "name": "cookie",
- "code": 1,
- "data": "1APC"
- },
- # The least potentially damaging empty value to hopefully convince clients not
- # to engage in DNS.
- {
- "space": "dhcp4",
- "name": "wpad",
- "code": 252,
-// "original-data": "\"\n\u0000\"",
- "csv-format": false,
- "data": "0a00"
- }
- ],
- "valid-lifetime": 1800,
- "max-valid-lifetime": 1800,
-// # 30 week
-// #default-lease-time 3100; # 51 minutes.
-// #max-lease-time 604800; # 1 week
-// # If the client supplied these values, log them in the leases file.
-// "statement": {
-// "if": {
-// "condition": {
-// "exists": {
-// "universe": "dhcp",
-// "name": "vendor-class-identifier",
-// "code": 60
-// }
-// },
-// "then": [
-// {
-// "set": {
-// "name": "vendor-string",
-// "value": {
-// "option": {
-// "universe": "dhcp",
-// "name": "vendor-class-identifier",
-// "code": 60
-// }
-// }
-// }
-// }
-// ]
-// }
-// },
-// "statement": {
-// "if": {
-// "condition": {
-// "exists": {
-// "universe": "dhcp",
-// "name": "user-class",
-// "code": 77
-// }
-// },
-// "then": [
-// {
-// "set": {
-// "name": "user-string",
-// "value": {
-// "option": {
-// "universe": "dhcp",
-// "name": "user-class",
-// "code": 77
-// }
-// }
-// }
-// }
-// ]
-// }
-// },
-// /// Begin file fordhcp/dhcpd.omapi.key
-// # This key is used for OMAPI/omshell access.
-// "statement": {
-// "tsig-keys": [
-// {
-// "name": "OM_KEY",
-// "algorithm": "HMAC-MD5.SIG-ALG.REG.INT.",
-// "secret": "dvEmB76cVjskCznFKv9GMw=="
-// }
-// ]
-// },
- "subnet4": [
- /// Begin file fordhcp/dhcpd.stubs.conf
- # These are stub subnets to inform the DHCP server that they exist.
- # sql1-blue, the "outside" network
- {
- "id": 1,
- "subnet": "149.20.48.0/25",
- "authoritative": false
- },
- # 187-net is all but dead
- {
- "id": 2,
- "subnet": "204.152.187.0/24",
- "authoritative": false
- },
- # QuickBooks/GreatPlains VLAN
- {
- "id": 3,
- "subnet": "149.20.48.128/28",
- "authoritative": false
- },
- # Device management VLAN
- {
- "id": 4,
- "subnet": "149.20.60.0/24",
- "authoritative": false
- },
- /// Begin file fordhcp/dhcpd.voip.conf
- # dhcpd.voip.conf file for Voice over IP phone network served by the 950
- # charter #failover peerset. This file may be copied to /etc between these
- # two systems without modifications.
- #
- {
- "id": 5,
- "subnet": "204.152.185.128/26",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "subnet-mask",
- "code": 1,
- "data": "255.255.255.192"
- },
- {
- "space": "dhcp4",
- "name": "broadcast-address",
- "code": 28,
- "data": "204.152.185.191"
- },
- {
- "space": "dhcp4",
- "name": "routers",
- "code": 3,
- "data": "204.152.185.129"
- },
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "149.20.32.15"
- }
- ],
- "pools": [
- /// From:
- /// deny dynamic bootp clients
- /// dynamic-bootp-client is not supported by Kea
- {
- #failover peer "isc";
- "pool": "204.152.185.135 - 204.152.185.185"
- }
- ]
- },
- /// Begin file fordhcp/dhcpd.wvlan.conf
- # dhcpd.wvlan.conf file for 950 Charter Wireless network, served by the 950
- # charter #failover peerset. This file may be copied to /etc between these
- # two systems without modifications.
- #
- {
- "id": 6,
- "subnet": "204.152.189.0/26",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "routers",
- "code": 3,
- "data": "204.152.189.1"
- },
- {
- "space": "dhcp4",
- "name": "subnet-mask",
- "code": 1,
- "data": "255.255.255.192"
- },
- {
- "space": "dhcp4",
- "name": "broadcast-address",
- "code": 28,
- "data": "204.152.189.63"
- }
- ],
-// "config": [
-// /// always-broadcast is not supported
-// /// Reference Kea #241
-// {
-// "name": "always-broadcast",
-// "code": 22,
-// "value": true
-// }
-// ],
- "valid-lifetime": 3100,
- "max-valid-lifetime": 3100,
- "pools": [
- # 51 minutes
- /// From:
- /// deny dynamic bootp clients
- /// dynamic-bootp-client is not supported by Kea
- {
- #failover peer "isc";
- "pool": "204.152.189.15 - 204.152.189.50"
- }
- ],
- "reservations": [
- # wavelan-in-hallway
- {
- "hostname": "wavelan-in-hallway",
- "hw-address": "00:60:1d:1b:97:5b",
- "ip-address": "204.152.189.11"
- },
- # wavelan-in-backroom
- {
- "hostname": "wavelan-in-backroom",
- "hw-address": "00:60:1d:1b:97:6e",
- "ip-address": "204.152.189.10"
- }
- ]
- },
- /// Begin file fordhcp/dhcpd.emp-wireless-149-20.conf
- # dhcpd.emp-wireless-149-20.conf file for 950 Charter Wireless network,
- # served by the 950 charter #failover peerset. This file may be copied
- # to /etc between these two systems without modifications.
- #
- {
- "id": 7,
- "subnet": "149.20.50.192/26",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "subnet-mask",
- "code": 1,
- "data": "255.255.255.192"
- },
- {
- "space": "dhcp4",
- "name": "routers",
- "code": 3,
- "data": "149.20.50.193"
- },
- {
- "space": "dhcp4",
- "name": "broadcast-address",
- "code": 28,
- "data": "149.20.50.255"
- }
- ],
-// "config": [
-// /// always-broadcast is not supported
-// /// Reference Kea #241
-// {
-// "name": "always-broadcast",
-// "code": 22,
-// "value": true
-// }
-// ],
- "valid-lifetime": 1200,
- "max-valid-lifetime": 1200,
- "pools": [
- # 20 minutes
- /// From:
- /// deny dynamic bootp clients
- /// dynamic-bootp-client is not supported by Kea
- {
- #failover peer "isc";
- "pool": "149.20.50.196 - 149.20.50.254"
- }
- ]
- },
- {
- "id": 8,
- "subnet": "149.20.50.0/25",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "subnet-mask",
- "code": 1,
- "data": "255.255.255.128"
- },
- {
- "space": "dhcp4",
- "name": "routers",
- "code": 3,
- "data": "149.20.50.1"
- },
- {
- "space": "dhcp4",
- "name": "broadcast-address",
- "code": 28,
- "data": "149.20.50.127"
- }
- ],
-// /// Only global enable-updates is supported
-// "enable-updates": false,
- "pools": [
- /// From:
- /// deny dynamic bootp clients
- /// dynamic-bootp-client is not supported by Kea
- {
- #failover peer "isc";
- "pool": "149.20.50.33 - 149.20.50.120"
- }
- ],
- "reservations": [
- /// Begin file fordhcp/dhcpd.office-static-149-20.conf
- #######################################################################
- # Static DHCP leases
- #
- # gone
- #host draft.isc.org {
- # hardware ethernet 00:80:77:3a:5f:24;
- # fixed-address 149.20.50.19;
- #}
- {
- "hostname": "the-edge.isc.org",
- "hw-address": "00:80:77:48:ed:5d",
- "ip-address": "149.20.50.18"
- },
- {
- "hostname": "stupidapc.isc.org",
- "hw-address": "00:c0:b7:7f:41:f0",
- "ip-address": "149.20.50.126"
- },
- {
- "hostname": "redraft.isc.org",
- "hw-address": "00:80:77:96:e1:2c",
- "ip-address": "149.20.50.17"
- },
- {
- "hostname": "pres.isc.org",
- "hw-address": "2c:41:38:7e:b0:b8",
- "ip-address": "149.20.50.5"
- },
- {
- "hostname": "virtalarm.isc.org",
- "hw-address": "00:19:bb:e1:32:13",
- "ip-address": "149.20.50.12"
- },
- {
- "hostname": "colour-q.isc.org",
- "hw-address": "00:20:6b:52:4a:c2",
- "ip-address": "149.20.50.16"
- },
- {
- "hostname": "finance-printer.isc.org",
- "hw-address": "00:80:77:3b:57:1f",
- "ip-address": "149.20.50.15"
- },
- {
- "hostname": "backdraft.isc.org",
- "hw-address": "00:14:d1:72:10:c9",
- "ip-address": "149.20.50.14"
- },
- {
- "hostname": "hr-printer.isc.org",
- "hw-address": "00:24:81:2d:ab:22",
- "ip-address": "149.20.50.21"
- },
- {
- "hostname": "lincoln.isc.org",
- "hw-address": "30:05:5c:4a:a2:a1",
- "ip-address": "149.20.50.23"
- },
- {
- "hostname": "sql1a.kvm.isc.org",
- "hw-address": "00:80:a3:8c:4c:91",
- "ip-address": "149.20.50.9"
- },
- {
- "hostname": "sql1b.kvm.isc.org",
- "hw-address": "00:80:a3:8c:96:ba",
- "ip-address": "149.20.50.19"
- },
- # Dan WS
- {
- "hostname": "sphynx.isc.org",
- "hw-address": "c4:2c:03:04:e0:86",
- "ip-address": "149.20.50.7"
- },
- {
- "hostname": "ycam-bullet-1",
- "hw-address": "00:22:c0:10:0d:63"
- },
- # duplicate address
- # fixed-address 149.20.50.12;
- {
- "hostname": "ycam-bullet-2",
- "hw-address": "00:22:c0:10:0d:5a",
- "ip-address": "149.20.50.13"
- },
- {
- "hostname": "ycam-knight-1",
- "hw-address": "78:12:b8:00:20:da",
- "ip-address": "149.20.50.20"
- },
- {
- "hostname": "ycam-knight-2",
- "hw-address": "78:12:b8:00:20:d4",
- "ip-address": "149.20.50.22"
- }
- ]
- },
- /// Begin file fordhcp/dhcpd.voip-149-20.conf
- # dhcpd.voip-149-20.conf file for Voice over IP phone network served by the
- # 950 charter #failover peerset. This file may be copied to /etc between these
- # two systems without modifications.
- #
- {
- "id": 9,
- "subnet": "149.20.50.128/26",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "subnet-mask",
- "code": 1,
- "data": "255.255.255.192"
- },
- {
- "space": "dhcp4",
- "name": "routers",
- "code": 3,
- "data": "149.20.50.129"
- },
- {
- "space": "dhcp4",
- "name": "broadcast-address",
- "code": 28,
- "data": "149.20.50.191"
- },
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "149.20.32.15"
- },
- {
- "space": "dhcp4",
- "name": "ntp-servers",
- "code": 42,
- "data": "149.20.64.28"
- }
- ],
- "pools": [
- /// From:
- /// deny dynamic bootp clients
- /// dynamic-bootp-client is not supported by Kea
- {
- # #failover peer "isc";
- "pool": "149.20.50.140 - 149.20.50.190"
- }
- ],
- /// Host reservations without fixed addresses were put in the last declared subnet
- /// Reference Kea #231
- "reservations": [
- {
- "hostname": "test-7960",
- "hw-address": "00:0b:fd:32:e6:fa",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "149.20.48.24"
- }
- ]
- },
- {
- "hostname": "test-7960A",
- "hw-address": "00:07:0e:36:48:19",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "149.20.48.24"
- }
- ]
- },
- {
- "hostname": "test-7960B",
- "hw-address": "00:03:e3:a5:20:31",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "149.20.48.24"
- }
- ]
- },
- {
- "hostname": "polycom-6000a",
- "hw-address": "00:04:f2:e4:c2:79",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "http://asterisk.isc.org/polycom"
- }
- ]
- },
- {
- "hostname": "polycom-5000b",
- "hw-address": "00:04:f2:e7:3d:53",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "http://asterisk.isc.org/polycom"
- }
- ]
- },
- {
- "hostname": "polycom-5000c",
- "hw-address": "00:04:f2:e7:74:e8",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "http://asterisk.isc.org/polycom"
- }
- ]
- },
- {
- "hostname": "polycom-5000d",
- "hw-address": "00:04:f2:e7:95:40",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "http://asterisk.isc.org/polycom"
- }
- ]
- },
- {
- "hostname": "polycom-5000e",
- "hw-address": "00:04:f2:f3:32:58",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "http://asterisk.isc.org/polycom"
- }
- ]
- },
- {
- "hostname": "polycom-5000a",
- "hw-address": "00:04:f2:e7:3e:f2",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "tftp-server-name",
- "code": 66,
- "data": "http://asterisk.isc.org/polycom"
- }
- ]
- }
- ]
- },
- {
- "id": 10,
- "subnet": "149.20.49.224/27",
- "option-data": [
- {
- "space": "dhcp4",
- "name": "subnet-mask",
- "code": 1,
- "data": "255.255.255.224"
- },
- {
- "space": "dhcp4",
- "name": "routers",
- "code": 3,
- "data": "149.20.49.225"
- },
- {
- "space": "dhcp4",
- "name": "broadcast-address",
- "code": 28,
- "data": "149.20.49.255"
- }
- ],
-// "config": [
-// /// always-broadcast is not supported
-// /// Reference Kea #241
-// {
-// "name": "always-broadcast",
-// "code": 22,
-// "value": true
-// }
-// ],
- "valid-lifetime": 60,
- "max-valid-lifetime": 60,
- "pools": [
- # 1 minutes
- # default-lease-time 1200; # 20 minutes
- # max-lease-time 1200; # 20 minutes
- /// From:
- /// deny dynamic bootp clients
- /// dynamic-bootp-client is not supported by Kea
- {
- #failover peer "isc";
- "pool": "149.20.49.240 - 149.20.49.252"
- }
- ]
- }
- ],
- "host-reservation-identifiers": [
- "hw-address"
- ],
- "option-def": [
- /// Begin file fordhcp/dhcpd.office-149-20.conf
- # dhcpd.office-149-20.conf file for office-net DHCP pools served by the
- # 950 Charter #failover peerset. This file may be copied to /etc between
- # these two systems without modifications.
- #
- # APC powerrack systems need tender care and loving molestation to behave
- # appropriately by default.
- {
- "space": "APC",
- "name": "cookie",
- "code": 1,
- "type": "string"
- },
- # This option is in the site-local space, but it is a de-facto standard
- # today.
- {
- "space": "dhcp4",
- "name": "wpad",
- "code": 252,
- "type": "string"
- },
- # Local PXE support. For now we only boot SUSE.
- {
- "space": "PXE",
- "name": "mtftp-ip",
- "code": 1,
- "type": "ipv4-address"
- },
- {
- "space": "PXE",
- "name": "mtftp-oport",
- "code": 2,
- "type": "uint16"
- },
- {
- "space": "PXE",
- "name": "mtftp-sport",
- "code": 3,
- "type": "uint16"
- },
- {
- "space": "PXE",
- "name": "mtftp-tmout",
- "code": 4,
- "type": "uint8"
- },
- {
- "space": "PXE",
- "name": "mtftp-delay",
- "code": 5,
- "type": "uint8"
- },
- {
- "space": "PXE",
- "name": "discovery-control",
- "code": 6,
- "type": "uint8"
- },
- {
- "space": "PXE",
- "name": "discovery-mcast-addr",
- "code": 7,
- "type": "uint8"
- },
- # These are 'site local' options the PXELinux bootloader uses.
- {
- "space": "pxelinux",
- "name": "magic",
- "code": 208,
- "type": "string"
- },
- {
- "space": "pxelinux",
- "name": "configfile",
- "code": 209,
- "type": "string"
- },
- {
- "space": "pxelinux",
- "name": "pathprefix",
- "code": 210,
- "type": "string"
- },
- {
- "space": "pxelinux",
- "name": "reboottime",
- "code": 211,
- "type": "uint32"
- }
- ],
- "client-classes": [
- {
- "name": "APC",
- /// from: match if (substring(option dhcp.vendor-class-identifier, 0, 3)) = 'APC'
- "test": "substring(option[60].hex,0,3) == 'APC'",
- "option-def": [
- {
- "name": "vendor-encapsulated-options",
- "code": 43,
- "type": "empty",
- "encapsulate": "APC"
- }
- ],
- "option-data": [
- {
- "name": "vendor-encapsulated-options",
- "code": 43
- }
- ]
- },
- {
- "name": "MSFT",
- /// from: match if (substring(option dhcp.vendor-class-identifier, 0, 4)) = 'MSFT'
- "test": "substring(option[60].hex,0,4) == 'MSFT'",
- "option-data": [
-// # Windows doesn't put WPAD on its PRL, but does consume it.
-// /// Possible PRL hack
-// /// Consider setting "always-send" to true when setting data for relevant options, cf Kea #250
-// {
-// "space": "dhcp4",
-// "name": "dhcp-parameter-request-list",
-// "code": 55,
-// "csv-format": false,
-// "expression": {
-// "concat": {
-// "left": {
-// "option": {
-// "universe": "dhcp",
-// "name": "dhcp-parameter-request-list",
-// "code": 55
-// }
-// },
-// "right": {
-// "const-data": "0xfc"
-// }
-// }
-// }
-// }
- ]
- },
- {
- "name": "pxeclients",
- /// from: match if (substring(option dhcp.vendor-class-identifier, 0, 9)) = 'PXEClient'
- "test": "substring(option[60].hex,0,9) == 'PXEClient'",
- "option-data": [
- # Some PXE clients are said to require that the vci be sent.
- # But it seems clear that if we send these PXE and vendor-class
- # options, it also expects "extended DHCP" via port 4011. For
- # PXE versions 2 and onwards.
- {
- "space": "dhcp4",
- "name": "vendor-class-identifier",
- "code": 60,
- "data": "PXEClient"
- },
- {
- "name": "vendor-encapsulated-options",
- "code": 43
- },
- # Some PXE clients refuse to tftp if mtftp fails. Others take
- # longer.
- {
- "space": "PXE",
- "name": "mtftp-ip",
- "code": 1,
- "data": "0.0.0.0"
- },
- {
- "space": "pxelinux",
- "name": "reboottime",
- "code": 211,
- "data": "30"
- },
- /// Begin file fordhcp/dhcpd.staging.conf
- # dhcpd.staging.conf file for the SQL1 staging network,
- # served by the 950 charter #failover peerset. This file may be copied
- # to /etc between these two systems without modifications.
- #
- # Removed already defined PXE
- # match if substring (option vendor-class-identifier, 0, 9) = "PXEClient";
- # Some PXE clients are said to require that the vci be sent.
- # But it seems clear that if we send these PXE and vendor-class
- # options, it also expects "extended DHCP" via port 4011. For
- # PXE versions 2 and onwards.
- {
- "space": "dhcp4",
- "name": "vendor-class-identifier",
- "code": 60,
- "data": "PXEClient"
- },
- # Some PXE clients refuse to tftp if mtftp fails. Others take
- # longer.
- {
- "space": "PXE",
- "name": "mtftp-ip",
- "code": 1,
- "data": "0.0.0.0"
- },
- {
- "space": "pxelinux",
- "name": "reboottime",
- "code": 211,
- "data": "30"
- }
- ],
- /// site-option-space 'pxelinux'
- /// Please to move private (code 224..254) option definitions from 'pxelinux' to 'dhcp4' space
- /// site-option-space 'pxelinux'
- /// Please to move private (code 224..254) option definitions from 'pxelinux' to 'dhcp4' space
- "option-def": [
- {
- "name": "vendor-encapsulated-options",
- "code": 43,
- "type": "empty",
- "encapsulate": "PXE"
- }
- ],
-// /// Only global enable-updates is supported
-// "enable-updates": false,
- "boot-file-name": "pxelinux.0",
- "next-server": "204.152.187.81",
-// # PXE does not request site-local options.
-// "statement": {
-// "if": {
-// "condition": {
-// "exists": {
-// "universe": "dhcp",
-// "name": "dhcp-parameter-request-list",
-// "code": 55
-// }
-// },
-// "then": [
-// {
-// /// Possible PRL hack
-// /// Consider setting "always-send" to true when setting data for relevant options, cf Kea #250
-// "option": {
-// "space": "dhcp4",
-// "name": "dhcp-parameter-request-list",
-// "code": 55,
-// "csv-format": false,
-// "expression": {
-// "concat": {
-// "left": {
-// "option": {
-// "universe": "dhcp",
-// "name": "dhcp-parameter-request-list",
-// "code": 55
-// }
-// },
-// "right": {
-// "concat": {
-// "left": {
-// "const-data": "0xd0"
-// },
-// "right": {
-// "concat": {
-// "left": {
-// "const-data": "0xd1"
-// },
-// "right": {
-// "concat": {
-// "left": {
-// "const-data": "0xd2"
-// },
-// "right": {
-// "const-data": "0xd3"
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// ]
-// }
-// },
-// /// Only global enable-updates is supported
-// "enable-updates": false,
- "boot-file-name": "pxelinux.0",
- "next-server": "149.20.49.228"
-// # PXE does not request site-local options.
-// "statement": {
-// "if": {
-// "condition": {
-// "exists": {
-// "universe": "dhcp",
-// "name": "dhcp-parameter-request-list",
-// "code": 55
-// }
-// },
-// "then": [
-// {
-// /// Possible PRL hack
-// /// Consider setting "always-send" to true when setting data for relevant options, cf Kea #250
-// "option": {
-// "space": "dhcp4",
-// "name": "dhcp-parameter-request-list",
-// "code": 55,
-// "csv-format": false,
-// "expression": {
-// "concat": {
-// "left": {
-// "option": {
-// "universe": "dhcp",
-// "name": "dhcp-parameter-request-list",
-// "code": 55
-// }
-// },
-// "right": {
-// "concat": {
-// "left": {
-// "const-data": "0xd0"
-// },
-// "right": {
-// "concat": {
-// "left": {
-// "const-data": "0xd1"
-// },
-// "right": {
-// "concat": {
-// "left": {
-// "const-data": "0xd2"
-// },
-// "right": {
-// "const-data": "0xd3"
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// ]
-// }
-// }
- }
- ]
- }
-}
diff --git a/keama/tests/fordhcp/run.sh b/keama/tests/fordhcp/run.sh
deleted file mode 100644
index 88d65340..00000000
--- a/keama/tests/fordhcp/run.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-#set -x
-
-if [ $# -ne 0 ]; then
- echo "usage: $0" >&2
- exit 1
-fi
-
-cd "$(dirname "$0")"
-cd ..
-
-file=fordhcp/dhcpd.conf
-expected=fordhcp/kea.json
-out=/tmp/dans.out$$
-
-../keama -4 -N -i $file -o $out >&2
-status=$?
-if [ $status -eq 255 ]; then
- echo "Dan's config raised an error" >&2
- exit 1
-fi
-
-diff --brief $out $expected
-if [ $? -ne 0 ]; then
- echo "Dan's config doesn't provide expected output" >&2
- exit 1
-fi
-
-exit $status
View Lorry Controller Status