From e45fb254c65fc3c91b4ab71152561408bc3945d4 Mon Sep 17 00:00:00 2001
From: caomengmeng <bjcaomm@cn.ibm.com>
Date: Thu, 28 Jan 2016 22:34:29 -0500
Subject: [PATCH 1/4] complete

---
 xCAT-test/autotest/testcase/xcatconfig/case0 | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0
index 993e49479..9cf8dcd16 100644
--- a/xCAT-test/autotest/testcase/xcatconfig/case0
+++ b/xCAT-test/autotest/testcase/xcatconfig/case0
@@ -87,3 +87,21 @@ check:output=~version|Version
 cmd:xcatconfig --version
 check:output=~version|Version
 end
+
+start:xcatconfig_f_check_xcatsslversion
+description:after xcatconfig -f the site.xcatsslversion will not be changed
+cmd:tabdump site | grep xcatsslversion
+check:output=~TLSv1
+cmd:if cat /etc/*-release | grep SUSE >/dev/null; then chtab key=xcatsslversion site.value=TLSv12;elif  cat /etc/*release |grep "Red Hat" >/dev/null;then chtab key=xcatsslversion site.value=TLSv12;elif  cat /etc/*release |grep "Ubuntu"  >/dev/null;then chtab key=xcatsslversion site.value=TLSv1_2;fi
+check:rc==0
+cmd:tabdump site | grep "xcatsslversion"
+check:output=~TLSv12|TLSv1_2
+cmd:xcatconfig -u
+check:rc==0
+cmd:tabdump site | grep "xcatsslversion"
+check:output=~TLSv12
+cmd:chtab key=xcatsslversion site.value=TLSv1
+check:rc==0
+cmd:tabdump site | grep "xcatsslversion"
+check:output=~TLSv1
+end

From 78d61e0b7302b8334cec513ccd7b37abcd42ac9d Mon Sep 17 00:00:00 2001
From: caomengmeng <bjcaomm@cn.ibm.com>
Date: Tue, 18 Oct 2016 16:35:19 +0800
Subject: [PATCH 2/4] devide case to make it readable

---
 xCAT-test/autotest/testcase/xcatconfig/case0 | 26 +++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0
index 9cf8dcd16..06e53bf95 100644
--- a/xCAT-test/autotest/testcase/xcatconfig/case0
+++ b/xCAT-test/autotest/testcase/xcatconfig/case0
@@ -88,20 +88,34 @@ cmd:xcatconfig --version
 check:output=~version|Version
 end
 
-start:xcatconfig_f_check_xcatsslversion
-description:after xcatconfig -f the site.xcatsslversion will not be changed
+start:xcatconfig_u_check_xcatsslversion_rhels_sles
+description:after xcatconfig -u the site.xcatsslversion will not be changed
 cmd:tabdump site | grep xcatsslversion
 check:output=~TLSv1
-cmd:if cat /etc/*-release | grep SUSE >/dev/null; then chtab key=xcatsslversion site.value=TLSv12;elif  cat /etc/*release |grep "Red Hat" >/dev/null;then chtab key=xcatsslversion site.value=TLSv12;elif  cat /etc/*release |grep "Ubuntu"  >/dev/null;then chtab key=xcatsslversion site.value=TLSv1_2;fi
+cmd:chtab key=xcatsslversion site.value=TLSv12
 check:rc==0
 cmd:tabdump site | grep "xcatsslversion"
-check:output=~TLSv12|TLSv1_2
+check:output=~TLSv12
 cmd:xcatconfig -u
 check:rc==0
 cmd:tabdump site | grep "xcatsslversion"
 check:output=~TLSv12
 cmd:chtab key=xcatsslversion site.value=TLSv1
 check:rc==0
-cmd:tabdump site | grep "xcatsslversion"
-check:output=~TLSv1
+end
+
+start:xcatconfig_u_check_xcatsslversion_ubuntu
+description:after xcatconfig -u the site.xcatsslversion will not be changed
+cmd:tabdump site | grep xcatsslversion
+check:output=~TLSv1
+cmd:chtab key=xcatsslversion site.value=TLSv1_2
+check:rc==0
+cmd:tabdump site | grep "xcatsslversion"
+check:output=~TLSv1_2
+cmd:xcatconfig -u
+check:rc==0
+cmd:tabdump site | grep "xcatsslversion"
+check:output=~TLSv1_2
+cmd:chtab key=xcatsslversion site.value=TLSv1
+check:rc==0
 end

From 5bb5138c549cccf069b18118e01431f32e1d621b Mon Sep 17 00:00:00 2001
From: caomengmeng <bjcaomm@cn.ibm.com>
Date: Tue, 25 Oct 2016 11:13:34 +0800
Subject: [PATCH 3/4] change the check value method

---
 xCAT-test/autotest/testcase/xcatconfig/case0 | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0
index 06e53bf95..16b6bd966 100644
--- a/xCAT-test/autotest/testcase/xcatconfig/case0
+++ b/xCAT-test/autotest/testcase/xcatconfig/case0
@@ -90,32 +90,32 @@ end
 
 start:xcatconfig_u_check_xcatsslversion_rhels_sles
 description:after xcatconfig -u the site.xcatsslversion will not be changed
-cmd:tabdump site | grep xcatsslversion
-check:output=~TLSv1
+cmd:default_value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$default_value" = "TLSv1" ]; then echo "xcatsslversion default value is TLSv1"; else echo "xcatsslversion is $default_value"; fi
+check:output=~xcatsslversion default value is TLSv1
 cmd:chtab key=xcatsslversion site.value=TLSv12
 check:rc==0
-cmd:tabdump site | grep "xcatsslversion"
-check:output=~TLSv12
+cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv12" ]; then echo "xcatsslversion is changed to be TLSv12"; else echo "xcatsslversion is $value"; fi
+check:output=~xcatsslversion is changed to be TLSv12
 cmd:xcatconfig -u
 check:rc==0
-cmd:tabdump site | grep "xcatsslversion"
-check:output=~TLSv12
+cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv12" ]; then echo "xcatsslversion is still TLSv12"; else echo "xcatsslversion is $value"; fi
+check:output=~xcatsslversion is still TLSv12
 cmd:chtab key=xcatsslversion site.value=TLSv1
 check:rc==0
 end
 
 start:xcatconfig_u_check_xcatsslversion_ubuntu
 description:after xcatconfig -u the site.xcatsslversion will not be changed
-cmd:tabdump site | grep xcatsslversion
-check:output=~TLSv1
+cmd:default_value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$default_value" = "TLSv1" ]; then echo "xcatsslversion default value is TLSv1"; else echo "xcatsslversion is $default_value"; fi
+check:output=~xcatsslversion default value is TLSv1
 cmd:chtab key=xcatsslversion site.value=TLSv1_2
 check:rc==0
-cmd:tabdump site | grep "xcatsslversion"
-check:output=~TLSv1_2
+cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv1_2" ]; then echo "xcatsslversion is changed to be TLSv1_2"; else echo "xcatsslversion is $value"; fi
+check:output=~xcatsslversion is changed to be TLSv1_2
 cmd:xcatconfig -u
 check:rc==0
-cmd:tabdump site | grep "xcatsslversion"
-check:output=~TLSv1_2
+cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv1_2" ]; then echo "xcatsslversion is still TLSv1_2"; else echo "xcatsslversion is $value"; fi
+check:output=~xcatsslversion is still TLSv1_2
 cmd:chtab key=xcatsslversion site.value=TLSv1
 check:rc==0
 end

From beb9c1e519c979f20ad62136f97cd2e1f70d6749 Mon Sep 17 00:00:00 2001
From: caomengmeng <bjcaomm@cn.ibm.com>
Date: Tue, 25 Oct 2016 11:46:14 +0800
Subject: [PATCH 4/4] update the value check method again

---
 xCAT-test/autotest/testcase/xcatconfig/case0 | 25 ++++++++++----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0
index 16b6bd966..b434e4101 100644
--- a/xCAT-test/autotest/testcase/xcatconfig/case0
+++ b/xCAT-test/autotest/testcase/xcatconfig/case0
@@ -90,32 +90,33 @@ end
 
 start:xcatconfig_u_check_xcatsslversion_rhels_sles
 description:after xcatconfig -u the site.xcatsslversion will not be changed
-cmd:default_value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$default_value" = "TLSv1" ]; then echo "xcatsslversion default value is TLSv1"; else echo "xcatsslversion is $default_value"; fi
-check:output=~xcatsslversion default value is TLSv1
+cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1$'
+check:rc==0
 cmd:chtab key=xcatsslversion site.value=TLSv12
 check:rc==0
-cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv12" ]; then echo "xcatsslversion is changed to be TLSv12"; else echo "xcatsslversion is $value"; fi
-check:output=~xcatsslversion is changed to be TLSv12
+cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv12$'
+check:rc==0
 cmd:xcatconfig -u
 check:rc==0
-cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv12" ]; then echo "xcatsslversion is still TLSv12"; else echo "xcatsslversion is $value"; fi
-check:output=~xcatsslversion is still TLSv12
+cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv12$'
+check:rc==0
 cmd:chtab key=xcatsslversion site.value=TLSv1
 check:rc==0
 end
 
+
 start:xcatconfig_u_check_xcatsslversion_ubuntu
 description:after xcatconfig -u the site.xcatsslversion will not be changed
-cmd:default_value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$default_value" = "TLSv1" ]; then echo "xcatsslversion default value is TLSv1"; else echo "xcatsslversion is $default_value"; fi
-check:output=~xcatsslversion default value is TLSv1
+cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1$'
+check:rc==0
 cmd:chtab key=xcatsslversion site.value=TLSv1_2
 check:rc==0
-cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv1_2" ]; then echo "xcatsslversion is changed to be TLSv1_2"; else echo "xcatsslversion is $value"; fi
-check:output=~xcatsslversion is changed to be TLSv1_2
+cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1_2$'
+check:rc==0
 cmd:xcatconfig -u
 check:rc==0
-cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv1_2" ]; then echo "xcatsslversion is still TLSv1_2"; else echo "xcatsslversion is $value"; fi
-check:output=~xcatsslversion is still TLSv1_2
+cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1_2$'
+check:rc==0
 cmd:chtab key=xcatsslversion site.value=TLSv1
 check:rc==0
 end