2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-20 13:10:34 +00:00

Merge pull request #2270 from junxiawang/1206dhcp

modify testcases using "makedhcp -q " to validate the "makedhcp"  res…
This commit is contained in:
Weihua Hu
2016-12-06 16:02:36 +08:00
committed by GitHub
8 changed files with 19 additions and 7 deletions

View File

@ -16,6 +16,9 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:makedhcp -q $$CN
check:rc==0
check:output=~$$CN
cmd:makedns -n
check:rc==0
cmd:makeconservercf $$CN

View File

@ -20,9 +20,9 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$SN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$SN;fi
cmd:makedhcp -q $$SN
check:rc==0
check:output=~$$SN
cmd:chdef -t node $$SN groups=service,all
check:rc==0
cmd:chdef -t group -o service profile=service primarynic=mac installnic=mac

View File

@ -27,7 +27,8 @@ check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:sleep 10
cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
cmd:makedhcp -q $$CN
check:rc==0
check:output=~$$CN
cmd:copycds $$ISO
check:rc==0

View File

@ -23,9 +23,9 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
cmd:makedhcp -q $$CN
check:output=~$$CN
check:rc==0
cmd:copycds $$ISO
check:rc==0

View File

@ -17,7 +17,8 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
cmd:makedhcp -q $$CN
check:rc==0
check:output=~$$CN
cmd:copycds $$ISO

View File

@ -21,7 +21,8 @@ cmd:makedhcp -a
check:rc==0
cmd:service dhcpd restart
check:rc==0
cmd:if cat /etc/*release |grep SUSE >/dev/null;then cat /var/lib/dhcp/db/dhcpd.leases|grep $$CN;elif cat /etc/*release |grep "Red Hat" >/dev/null;then cat /var/lib/dhcpd/dhcpd.leases|grep $$CN;fi
cmd:makedhcp -q $$CN
check:rc==0
check:output=~$$CN
cmd:copycds $$ISO

View File

@ -15,6 +15,9 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:makedhcp -q $$CN
check:rc==0
check:output=~$$CN
cmd:makeconservercf $$CN
check:rc==0
cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi

View File

@ -10,6 +10,9 @@ cmd:makedhcp -n
check:rc==0
cmd:makedhcp -a
check:rc==0
cmd:makedhcp -q $$CN
check:rc==0
check:output=~$$CN
cmd:makeconservercf $$CN
check:rc==0
cmd:cat /etc/conserver.cf | grep $$CN