From a16ea6d6e81ba1022604859e8285ac8b9b43b277 Mon Sep 17 00:00:00 2001
From: junxiaw <junxiaw@cn.ibm.com>
Date: Sun, 22 Jun 2014 11:28:06 -0700
Subject: [PATCH] modify xcattest installation case

---
 .../linux_full_installation_x86_64_sles          | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/xCAT-test/autotest/testcase/installation/linux_full_installation_x86_64_sles b/xCAT-test/autotest/testcase/installation/linux_full_installation_x86_64_sles
index a14c5da1a..d9953a0b4 100644
--- a/xCAT-test/autotest/testcase/installation/linux_full_installation_x86_64_sles
+++ b/xCAT-test/autotest/testcase/installation/linux_full_installation_x86_64_sles
@@ -1,5 +1,7 @@
 start:Linux_full_installation_flat_x86_64_sles
 os:Linux
+cmd:makedhcp -n
+check:rc==0
 cmd:makedns -n
 check:rc==0
 cmd:service named restart
@@ -8,20 +10,16 @@ cmd:makeconservercf $$CN
 check:rc==0
 cmd:cat /etc/conserver.cf | grep $$CN
 check:output=~$$CN
+cmd:getmacs $$CN -f -D
+check:rc==0
 cmd:sleep 60
-cmd:makedhcp -n
-check:rc==0
 cmd:makedhcp -a
 check:rc==0
-cmd:service dhcpd restart
-check:rc==0
 cmd:chdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute synclists=/install/custom/install/sles/compute.synclist
 check:rc==0
 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
-cmd:rsetboot $$CN net
-check:rc==0
-cmd:rpower $$CN reset
+cmd:rpower $$CN boot
 check:rc==0
 cmd:sleep 2000
 cmd:ping $$CN -c 3
@@ -33,9 +31,7 @@ check:rc==0
 check:output=~\d\d:\d\d:\d\d
 cmd:nodeset $$CN osimage
 check:rc==0
-cmd:rsetboot $$CN net
-check:rc==0
-cmd:rpower $$CN reset
+cmd:rpower $$CN boot
 check:rc==0
 cmd:sleep 2000
 cmd:ping $$CN -c 3