diff --git a/xCAT-test/autotest/testcase/makedns/cases0 b/xCAT-test/autotest/testcase/makedns/cases0 index 6a8fc3e83..f723797e5 100644 --- a/xCAT-test/autotest/testcase/makedns/cases0 +++ b/xCAT-test/autotest/testcase/makedns/cases0 @@ -14,27 +14,6 @@ check:rc==0 check:output=~Version end -start:makedns_n_node -description:makedns -n nodename -cmd:cp -r /etc/hosts /etc/hosts.backup -check:rc==0 -cmd:echo "10.1.1.1 testnodedns" >> /etc/hosts -cmd:mkdef -t node -o testnodedns groups=compute -check:rc==0 -cmd:chdef -t network -o testnet net="10.1.1.0" mask="255.255.255.0" -check:rc==0 -cmd:makedns -n testnodedns -check:rc==0 -cmd:nslookup testnodedns -check:rc==0 -check:output=~(Address: 10.1.1.1) -cmd:makedns -d testnodedns -cmd:rmdef -t node -o testnodedns -cmd:rmdef -t network -o testnet -cmd:cp -r /etc/hosts.backup /etc/hosts -cmd:rm -f /etc/hosts.backup -end - start:makedns_d_node description:makedns -d nodename cmd:cp -r /etc/hosts /etc/hosts.backup @@ -44,11 +23,11 @@ cmd:mkdef -t node -o testnodedns groups=compute check:rc==0 cmd:chdef -t network -o testnet net="10.1.1.0" mask="255.255.255.0" check:rc==0 -cmd:makedns -n testnodedns +cmd:makedns -n check:rc==0 cmd:nslookup testnodedns check:rc==0 -check:output=~(Address: 10.1.1.1) +check:output=~(10.1.1.1) cmd:makedns -d testnodedns check:rc==0 check:output=~(Completed updating zones) @@ -61,6 +40,29 @@ cmd:cp -r /etc/hosts.backup /etc/hosts cmd:rm -f /etc/hosts.backup end +start:makedns_node +description:makedns nodename +cmd:cp -r /etc/hosts /etc/hosts.backup +check:rc==0 +cmd:echo "10.1.1.1 testnodedns" >> /etc/hosts +cmd:mkdef -t node -o testnodedns groups=compute +check:rc==0 +cmd:chdef -t network -o testnet net="10.1.1.0" mask="255.255.255.0" +check:rc==0 +cmd:makedns testnodedns +check:rc==0 +cmd:nslookup testnodedns +check:rc==0 +check:output=~(10.1.1.1) +cmd:makedns -d testnodedns +cmd:rmdef -t node -o testnodedns +cmd:rmdef -t network -o testnet +cmd:cp -r /etc/hosts.backup /etc/hosts +cmd:rm -f /etc/hosts.backup +end + + + start:makedns_n description:makedns,check /var/named cmd:cp -r /etc/hosts /etc/hosts.backup @@ -74,7 +76,7 @@ cmd:makedns -n check:rc==0 cmd:nslookup testnodedns check:rc==0 -check:output=~(Address: 10.1.1.1) +check:output=~(10.1.1.1) cmd:ls /var/named/ |grep db.10.1.1 check:rc==0 check:output=~(db.10.1.1) @@ -86,6 +88,29 @@ cmd:cp -r /etc/hosts.backup /etc/hosts cmd:rm -f /etc/hosts.backup end +start:makedns_n_node +description:makedns_n_node +cmd:cp -r /etc/hosts /etc/hosts.backup +check:rc==0 +cmd:echo "10.1.1.1 testnodedns" >> /etc/hosts +cmd:mkdef -t node -o testnodedns groups=compute +check:rc==0 +cmd:chdef -t network -o testnet net="10.1.1.0" mask="255.255.255.0" +check:rc==0 +cmd:makedns -n testnodedns +check:rc==0 +cmd:ls /var/named/ |grep db.10.1.1 +check:rc==0 +check:output=~(db.10.1.1) +check:output=~(db.10.1.1.jnl) +check:rc==0 +cmd:makedns -d testnodedns +cmd:rmdef -t node -o testnodedns +cmd:rmdef -t network -o testnet +cmd:cp -r /etc/hosts.backup /etc/hosts +cmd:rm -f /etc/hosts.backup +end + start:makedns description:makedns,check /var/named os:Linux @@ -102,7 +127,7 @@ cmd:service named stop cmd:service named start cmd:nslookup testnodedns check:rc==0 -check:output=~(Address: 10.1.1.1) +check:output=~(10.1.1.1) cmd:ls /var/named/ |grep db.10.1.1 check:rc==0 check:output=~(db.10.1.1)