From f492ee1fcbcc6f77a917423c7689def256cf79e2 Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Mon, 6 Jun 2016 03:07:58 -0400 Subject: [PATCH] update v2 --- xCAT-test/autotest/testcase/switchdiscover/cases0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/switchdiscover/cases0 b/xCAT-test/autotest/testcase/switchdiscover/cases0 index 084f15de2..7de8bb7e3 100644 --- a/xCAT-test/autotest/testcase/switchdiscover/cases0 +++ b/xCAT-test/autotest/testcase/switchdiscover/cases0 @@ -35,7 +35,7 @@ check:output=~xml cmd:rm -rf switchdiscover_range_r.log cmd:switchdiscover --range $$range -r > switchdiscover_range_r.log check:rc==0 -cmd:if [ "__GETNODEATTR($$CN,os__" != "sles11.4" ]; then cat switchdiscover_range_r.log | grep "/usr/bin/nmap -sn -oX - $$range"; else cat switchdiscover_range_r.log | grep "/usr/bin/nmap -sP -oX - $$range";fi +cmd:if [ "__GETNODEATTR($$CN,os)__" != "sles11.4" ]; then cat switchdiscover_range_r.log | grep "/usr/bin/nmap -sn -oX - $$range"; else cat switchdiscover_range_r.log | grep "/usr/bin/nmap -sP -oX - $$range";fi check:output=~/usr/bin/nmap -s(n|P) -oX - $$range cmd:rm -rf switchdiscover_range_r.log end @@ -64,7 +64,7 @@ check:output=~groups=switch cmd:rm -rf switchdiscover_range_z_V.log cmd:switchdiscover --range $$range -z -V > switchdiscover_range_z_V.log check:rc==0 -cmd:if [ "__GETNODEATTR($$CN,os__" != "sles11.4" ]; then cat switchdiscover_range_z_V.log | grep "Process command: /usr/bin/nmap -sn -oX - $$range"; else cat switchdiscover_range_z_V.log | grep "Process command: /usr/bin/nmap -sP -oX - $$range";fi +cmd:if [ "__GETNODEATTR($$CN,os)__" != "sles11.4" ]; then cat switchdiscover_range_z_V.log | grep "Process command: /usr/bin/nmap -sn -oX - $$range"; else cat switchdiscover_range_z_V.log | grep "Process command: /usr/bin/nmap -sP -oX - $$range";fi check:output=~Process command: /usr/bin/nmap -s(n|P) -oX - $$range cmd:rm -rf switchdiscover_range_z_V.log end