From 4788a46021cd20c13cfb096cc70bb341e52149c7 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Thu, 16 Nov 2017 16:18:16 +0800
Subject: [PATCH 1/2] Add test case - switch_to_dns_forward_mode

---
 .../installation/switch_to_dns_forward_mode   | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 xCAT-test/autotest/testcase/installation/switch_to_dns_forward_mode

diff --git a/xCAT-test/autotest/testcase/installation/switch_to_dns_forward_mode b/xCAT-test/autotest/testcase/installation/switch_to_dns_forward_mode
new file mode 100644
index 000000000..14bde55e0
--- /dev/null
+++ b/xCAT-test/autotest/testcase/installation/switch_to_dns_forward_mode
@@ -0,0 +1,48 @@
+start:switch_to_dns_forward_mode
+description:The test case is used to switch the whole testing cluster to run in dns forward mode.
+os:Linux
+
+##
+# Check if everything is fine
+##
+cmd:getent hosts $$MN
+check:rc==0
+cmd:getent hosts $$SN
+check:rc==0
+cmd:getent hosts $$CN
+check:rc==0
+
+##
+# Change to use the DNS server in c910
+##
+cmd:chdef -t site forwarders=10.0.0.103,10.0.0.101
+check:rc==0
+cmd:chdef -t site nameservers='<xcatmaster>'
+check:rc==0
+cmd:makedns -n
+check:rc==0
+
+# Restart the named service on $$MN and $$SN
+cmd:service named restart
+cmd:sleep 1
+cmd:xdsh service 'service named restart'
+cmd:sleep 1
+
+##
+# Check if everything is still fine
+##
+cmd:getent hosts $$MN
+check:rc==0
+cmd:getent hosts $$SN
+check:rc==0
+cmd:getent hosts $$CN
+check:rc==0
+cmd:xdsh $$CN "getent hosts $$MN"
+check:rc==0
+cmd:xdsh $$CN "getent hosts $$SN"
+check:rc==0
+cmd:xdsh $$CN "getent hosts $$CN"
+check:rc==0
+# Check if an outside hostname works
+cmd:xdsh $$CN "getent hosts www.ibm.com"
+check:rc==0

From 1b1d008ea5337177314508fa9c239fac7f43f616 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Fri, 17 Nov 2017 17:14:14 +0800
Subject: [PATCH 2/2] Revise test case - switch_to_dns_forward_mode

---
 .../installation/switch_to_dns_forward_mode   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/xCAT-test/autotest/testcase/installation/switch_to_dns_forward_mode b/xCAT-test/autotest/testcase/installation/switch_to_dns_forward_mode
index 14bde55e0..b2aa2a8b4 100644
--- a/xCAT-test/autotest/testcase/installation/switch_to_dns_forward_mode
+++ b/xCAT-test/autotest/testcase/installation/switch_to_dns_forward_mode
@@ -1,5 +1,5 @@
 start:switch_to_dns_forward_mode
-description:The test case is used to switch the whole testing cluster to run in dns forward mode.
+description:The test case is used to switch the whole testing cluster to run in dns forward mode. This test case should run after service node deployment.
 os:Linux
 
 ##
@@ -12,6 +12,22 @@ check:rc==0
 cmd:getent hosts $$CN
 check:rc==0
 
+# Turn off the DNS forward
+cmd:chdef -t site forwarders=
+check:rc==0
+cmd:chdef -t site nameservers='<xcatmaster>'
+check:rc==0
+cmd:makedns -n
+check:rc==0
+
+# Restart the named service
+cmd:service named restart
+cmd:sleep 1
+
+# Check if an outside host name resolving does not work
+cmd:xdsh $$CN "getent hosts www.ibm.com"
+check:rc!=0
+
 ##
 # Change to use the DNS server in c910
 ##
@@ -43,6 +59,6 @@ cmd:xdsh $$CN "getent hosts $$SN"
 check:rc==0
 cmd:xdsh $$CN "getent hosts $$CN"
 check:rc==0
-# Check if an outside hostname works
+# Check if an outside host name resolving works
 cmd:xdsh $$CN "getent hosts www.ibm.com"
 check:rc==0