NFS test: renumber MAC addresses to ease adding new test cases

This commit is contained in:
David Dillow 2009-06-06 23:08:12 -04:00
parent 9f25b834b9
commit da2643fafb
2 changed files with 22 additions and 12 deletions

View File

@ -11,6 +11,9 @@ subnet 192.168.50.0 netmask 255.255.255.0 {
option domain-search "example.com"; option domain-search "example.com";
option domain-name "other.com"; option domain-name "other.com";
# MAC numbering scheme:
# NFSv3: last octect starts at 0x00 and works up
group { group {
# NFSv3 root=dhcp or root={/dev/,}nfs, use server-id # NFSv3 root=dhcp or root={/dev/,}nfs, use server-id
option root-path "/nfs/client"; option root-path "/nfs/client";
@ -46,17 +49,20 @@ subnet 192.168.50.0 netmask 255.255.255.0 {
option root-path "nfs:192.168.50.3:/nfs/client:wsize=4096"; option root-path "nfs:192.168.50.3:/nfs/client:wsize=4096";
host nfs3-4 { host nfs3-4 {
hardware ethernet 52:54:00:12:34:06; hardware ethernet 52:54:00:12:34:03;
fixed-address 192.168.50.101; fixed-address 192.168.50.101;
} }
} }
# MAC numbering scheme:
# NFSv4: last octect starts at 0x80 and works up
group { group {
# NFSv4 root={/dev/,}nfs4, use server-id # NFSv4 root={/dev/,}nfs4, use server-id
option root-path "/client"; option root-path "/client";
host nfs4-1 { host nfs4-1 {
hardware ethernet 52:54:00:12:34:03; hardware ethernet 52:54:00:12:34:80;
fixed-address 192.168.50.101; fixed-address 192.168.50.101;
} }
} }
@ -66,7 +72,7 @@ subnet 192.168.50.0 netmask 255.255.255.0 {
option root-path "192.168.50.2:/client"; option root-path "192.168.50.2:/client";
host nfs4-2 { host nfs4-2 {
hardware ethernet 52:54:00:12:34:04; hardware ethernet 52:54:00:12:34:81;
fixed-address 192.168.50.101; fixed-address 192.168.50.101;
} }
} }
@ -76,7 +82,7 @@ subnet 192.168.50.0 netmask 255.255.255.0 {
option root-path "nfs4:192.168.50.3:/client"; option root-path "nfs4:192.168.50.3:/client";
host nfs4-3 { host nfs4-3 {
hardware ethernet 52:54:00:12:34:05; hardware ethernet 52:54:00:12:34:82;
fixed-address 192.168.50.101; fixed-address 192.168.50.101;
} }
} }
@ -86,7 +92,7 @@ subnet 192.168.50.0 netmask 255.255.255.0 {
option root-path "nfs4:192.168.50.3:/client:wsize=4096"; option root-path "nfs4:192.168.50.3:/client:wsize=4096";
host nfs4-4 { host nfs4-4 {
hardware ethernet 52:54:00:12:34:07; hardware ethernet 52:54:00:12:34:83;
fixed-address 192.168.50.101; fixed-address 192.168.50.101;
} }
} }

View File

@ -102,6 +102,10 @@ test_run() {
return 1 return 1
fi fi
# MAC numbering scheme:
# NFSv3: last octect starts at 0x00 and works up
# NFSv4: last octect starts at 0x80 and works up
client_test "NFSv3 root=dhcp DHCP path only" 52:54:00:12:34:00 \ client_test "NFSv3 root=dhcp DHCP path only" 52:54:00:12:34:00 \
"root=dhcp" 192.168.50.1 -wsize=4096 || return 1 "root=dhcp" 192.168.50.1 -wsize=4096 || return 1
@ -123,29 +127,29 @@ test_run() {
client_test "NFSv3 root=dhcp DHCP proto:IP:path" 52:54:00:12:34:02 \ client_test "NFSv3 root=dhcp DHCP proto:IP:path" 52:54:00:12:34:02 \
"root=dhcp" 192.168.50.3 -wsize=4096 || return 1 "root=dhcp" 192.168.50.3 -wsize=4096 || return 1
client_test "NFSv3 root=dhcp DHCP proto:IP:path:options" 52:54:00:12:34:06 \ client_test "NFSv3 root=dhcp DHCP proto:IP:path:options" 52:54:00:12:34:03 \
"root=dhcp" 192.168.50.3 wsize=4096 || return 1 "root=dhcp" 192.168.50.3 wsize=4096 || return 1
# There is a mandatory 90 second recovery when starting the NFSv4 # There is a mandatory 90 second recovery when starting the NFSv4
# server, so put these later in the list to avoid a pause when doing # server, so put these later in the list to avoid a pause when doing
# switch_root # switch_root
client_test "NFSv4 root=nfs4 DHCP path only" 52:54:00:12:34:03 \ client_test "NFSv4 root=nfs4 DHCP path only" 52:54:00:12:34:80 \
"root=nfs4" 192.168.50.1 -wsize=4096 || return 1 "root=nfs4" 192.168.50.1 -wsize=4096 || return 1
client_test "NFSv4 root=/dev/nfs4 DHCP path only" 52:54:00:12:34:03 \ client_test "NFSv4 root=/dev/nfs4 DHCP path only" 52:54:00:12:34:80 \
"root=/dev/nfs4" 192.168.50.1 -wsize=4096 || return 1 "root=/dev/nfs4" 192.168.50.1 -wsize=4096 || return 1
client_test "NFSv4 root=nfs4 DHCP IP:path" 52:54:00:12:34:04 \ client_test "NFSv4 root=nfs4 DHCP IP:path" 52:54:00:12:34:81 \
"root=nfs4" 192.168.50.2 -wsize=4096 || return 1 "root=nfs4" 192.168.50.2 -wsize=4096 || return 1
client_test "NFSv4 root=/dev/nfs4 DHCP IP:path" 52:54:00:12:34:04 \ client_test "NFSv4 root=/dev/nfs4 DHCP IP:path" 52:54:00:12:34:81 \
"root=/dev/nfs4" 192.168.50.2 -wsize=4096 || return 1 "root=/dev/nfs4" 192.168.50.2 -wsize=4096 || return 1
client_test "NFSv4 root=dhcp DHCP proto:IP:path" 52:54:00:12:34:05 \ client_test "NFSv4 root=dhcp DHCP proto:IP:path" 52:54:00:12:34:82 \
"root=dhcp" 192.168.50.3 -wsize=4096 || return 1 "root=dhcp" 192.168.50.3 -wsize=4096 || return 1
client_test "NFSv4 root=dhcp DHCP proto:IP:path:options" 52:54:00:12:34:07 \ client_test "NFSv4 root=dhcp DHCP proto:IP:path:options" 52:54:00:12:34:83 \
"root=dhcp" 192.168.50.3 wsize=4096 || return 1 "root=dhcp" 192.168.50.3 wsize=4096 || return 1
} }