From 88a2a6dab1c52cf08a2b675b6d5b0e8fea202e00 Mon Sep 17 00:00:00 2001
From: amy0701 <amy0701@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 21 Jul 2011 06:08:33 +0000
Subject: [PATCH] update

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

diff --git a/xCAT-test/autotest/testcase/makedhcp/cases0 b/xCAT-test/autotest/testcase/makedhcp/cases0
index 046881516..2ddcb1ee1 100644
--- a/xCAT-test/autotest/testcase/makedhcp/cases0
+++ b/xCAT-test/autotest/testcase/makedhcp/cases0
@@ -11,35 +11,6 @@ check:output=~dhcpd
 cmd:mv -f /etc/dhcp/dhcpd.conf.bak /etc/dhcp/dhcpd.conf
 end
 
-start:makedhcp_a
-os:Linux
-cmd:lsdef -l $$CN -z > /tmp/$$CN.stanza
-cmd:chdef -t node -o $$CN mac=11:22:33:44:55:66
-cmd:makedhcp -a
-check:rc==0
-cmd:cat /var/lib/dhcpd/dhcpd.leases 
-check:output=~$$CN
-check:output=~11:22:33:44:55:66
-cmd:chdef -t node -o $$CN mac=
-cmd:cat /tmp/$$CN.stanza | chdef -z
-end
-start:makedhcp_a_d
-os:Linux
-cmd:makedhcp -a -d
-check:rc==0
-cmd:cat /var/lib/dhcpd/dhcpd.leases | grep $$CN
-check:output!~$$CN
-cmd:makedhcp -a
-end
-start:makedhcp_d
-os:Linux
-cmd:makedhcp -d $$CN
-check:rc==0
-cmd:cat /var/lib/dhcpd/dhcpd.leases | grep $$CN
-check:output!~$$CN
-cmd:makedhcp -a
-end
-
 
 start:makedhcp_h
 description:help
@@ -82,7 +53,7 @@ check:rc==0
 check:output=~dhcpd
 end
 
-start:makedhcp_a_linux
+start:makedhcp_a
 description:Define all nodes to the DHCP server. (Will only add nodes that can be reached, network-wise, by this DHCP server.) The dhcp daemon does not have to be restarted after this.
 os:Linux
 cmd:mkdef -t node -o testnode1 groups=compute mac=11:22:33:55:66:88 arch=ppc64
@@ -101,7 +72,7 @@ cmd:rmdef testnode1
 cmd:mv -f /etc/dhcp/dhcpd.conf.bak /etc/dhcp/dhcpd.conf
 end
 
-start:makedhcp_a_d_linux
+start:makedhcp_a_d
 os:Linux
 cmd:lsdef -t node -l -z > /tmp/all.nodes
 cmd:mkdef -t node -o testnode1 groups=compute mac=11:22:33:55:66:88 arch=ppc64
@@ -124,7 +95,7 @@ cmd:rmdef testnode2
 #cmd:rm -f /tmp/1 /tmp/2
 end
 
-start:makedhcp_d_linux
+start:makedhcp_d
 description:Delete all node entries, added by xCAT, in the noderange from the DHCP server configuration.
 os:Linux
 cmd:mkdef -t node -o testnode1 groups=compute mac=11:22:33:55:66:88 arch=ppc64