From e8e94249f830e6282f1ccd2fa697c7d8c4f10f29 Mon Sep 17 00:00:00 2001 From: litingt Date: Wed, 7 Nov 2018 00:45:52 -0500 Subject: [PATCH] update according to comments --- xCAT-test/autotest/testcase/makentp/cases0 | 28 ++++++++++------------ 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/xCAT-test/autotest/testcase/makentp/cases0 b/xCAT-test/autotest/testcase/makentp/cases0 index 0827649ee..28eef1e18 100644 --- a/xCAT-test/autotest/testcase/makentp/cases0 +++ b/xCAT-test/autotest/testcase/makentp/cases0 @@ -1,22 +1,22 @@ start:makentp_v - -descriptiop:makentp -v +description:makentp -v +label:others,ntp cmd:makentp -v check:rc==0 check:output=~Version end start:makentp_h - -descriptiop:makentp -h +description:makentp -h +label:others,ntp cmd:makentp -h check:rc==0 check:output=~Usage: makentp end start:makentp_extntpserver_null - -descriptiop:test makentp with default value. extntpserver is set to blank +description:test makentp with default value. extntpserver is set to blank +label:others,ntp cmd:lsdef -t site -o clustersite -i extntpservers -c >/tmp/extntpserver check:rc==0 cmd:chtab key=extntpservers site.value="" @@ -31,7 +31,6 @@ check:output=~checking if nptd is installed check:output=~backing up the ntp configuration file /etc/ntp.conf check:output=~stopping ntpserver check:output=~starting ntpserver - check:output=~enabling ntpserver cmd:extntpserver=`cat /tmp/ntpserver | awk -F = '{print \$2}'`;chtab key=extntpservers site.value=$extntpserver check:rc==0 @@ -41,8 +40,8 @@ check:rc==0 end start:makentp_extntpserver_value - -descriptiop:test makentp with extntpserver is set to a specific value +description:test makentp with extntpserver is set to a specific value +label:others,ntp cmd:lsdef -t site -o clustersite -i extntpservers -c >/tmp/extntpserver check:rc==0 cmd:chtab key=extntpservers site.value="$$extntpserversip" @@ -62,7 +61,6 @@ check:output=~backing up the ntp configuration file /etc/ntp.conf check:output=~ntp servers are: $$extntpserversip check:output=~stopping ntpserver check:output=~starting ntpserver - check:output=~enabling ntpserver cmd:date check:output=~$$DATE @@ -75,8 +73,8 @@ cmd:rm -rf /tmp/extntpserver end start:updatenode_computenode_P_setupntp - -descriptiop:using updatenode -P to setup ntp on compute node +description:using updatenode -P to setup ntp on compute node +label:others,ntp cmd:xdsh $$CN date -s 20000101 check:rc==0 cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "rhel" ]];then xdsh $$CN clock -w;else xdsh $$CN hwclock -w ; fi @@ -109,9 +107,8 @@ end start:makentp_initialize - -descriptiop:start ntp service on management node and synchronize time with external ntp server - +description:start ntp service on management node and synchronize time with external ntp server +label:others,ntp cmd:chtab key=extntpservers site.value="$$extntpserversip" check:rc==0 cmd:makentp -V @@ -122,7 +119,6 @@ check:output=~backing up the ntp configuration file /etc/ntp.conf check:output=~ntp servers are: $$extntpserversip check:output=~stopping ntpserver check:output=~starting ntpserver - check:output=~enabling ntpserver cmd:if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]] || [[ "__GETNODEATTR($$CN,os)__" = "sles11.4" ]];then service ntp status;else service ntpd status; fi check:rc==0