From 10e9c5ae97905d29433e0f228daad175d35a02d0 Mon Sep 17 00:00:00 2001
From: ellen56 <ellen56@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sat, 19 Feb 2011 05:49:28 +0000
Subject: [PATCH] revision makedhcp_a_d and makedhcp_d

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8889 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-test/autotest/testcase/makedhcp/cases0 | 24 ++++++---------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/xCAT-test/autotest/testcase/makedhcp/cases0 b/xCAT-test/autotest/testcase/makedhcp/cases0
index 5efae2fbd..e4cd23b15 100644
--- a/xCAT-test/autotest/testcase/makedhcp/cases0
+++ b/xCAT-test/autotest/testcase/makedhcp/cases0
@@ -24,29 +24,17 @@ cmd:cat /tmp/$$CN.stanza | chdef -z
 end
 start:makedhcp_a_d
 os:Linux
-cmd:lsdef -l $$CN -z > /tmp/$$CN.stanza
-cmd:chdef -t node -o $$CN mac=11:22:33:44:55:66
-cmd:mv -f /etc/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf.bak
-cmd:makedhcp -a
 cmd:makedhcp -a -d
 check:rc==0
-cmd:cat /var/lib/dhcpd/dhcpd.leases | grep deleted
-check:output=~deleted
-cmd:chdef -t node -o $$CN mac=
-cmd:cat /tmp/$$CN.stanza | chdef -z
-cmd:mv -f /etc/dhcp/dhcpd.conf.bak /etc/dhcp/dhcpd.conf
+cmd:cat /var/lib/dhcpd/dhcpd.leases | grep $$CN
+check:output!~$$CN
+cmd:makedhcp -a
 end
 start:makedhcp_d
 os:Linux
-cmd:lsdef -l $$CN -z > /tmp/$$CN.stanza
-cmd:chdef -t node -o $$CN mac=11:22:33:44:55:66
-cmd:mv -f /etc/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf.bak
-cmd:makedhcp -a
 cmd:makedhcp -d $$CN
 check:rc==0
-cmd:cat /var/lib/dhcpd/dhcpd.leases | grep deleted
-check:output=~deleted
-cmd:chdef -t node -o $$CN mac=
-cmd:cat /tmp/$$CN.stanza | chdef -z
-cmd:mv -f /etc/dhcpd/dhcpd.conf.bak /etc/dhcpd/dhcpd.conf
+cmd:cat /var/lib/dhcpd/dhcpd.leases | grep $$CN
+check:output!~$$CN
+cmd:makedhcp -a
 end