From 6dc70bb0f36349422e865cb9fbc514574025bd5a Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Thu, 26 Jul 2018 22:20:40 -0400
Subject: [PATCH 1/3] add cases for xcat-inventory support credential export
 and import

---
 .../testcase/xcat-inventory/cases.credential  | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 xCAT-test/autotest/testcase/xcat-inventory/cases.credential

diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.credential b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
new file mode 100644
index 000000000..3efb1f951
--- /dev/null
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
@@ -0,0 +1,39 @@
+start:export_import_credential
+description:This case is used to test xcat-inventory support credential export and import.
+label:others,xcat_inventory
+cmd:dir="/tmp/credential";if [ -e "${dir}" ];then mv ${dir} ${dir}".bak"; fi; mkdir -p $dir
+cmd:dir="/tmp/backup";if [ -e "${dir}" ];then mv ${dir} ${dir}".bak"; fi; mkdir -p $dir
+cmd:cp -rf /etc/xcat/ca/ca-cert.pem /etc/xcat/ca/private/ca-key.pem /etc/xcat/cert/server-cred.pem /root/.xcat/client-key.pem /tmp/backup
+check:rc==0
+cmd:xcat-inventory export -t credential -d /tmp/credential
+check:rc==0
+check:output=~The credential objects has been exported to directory /tmp/credential
+cmd:diff -y /etc/xcat/ca/ca-cert.pem /tmp/credential/credential/etc/xcat/ca/ca-cert.pem
+check:rc==0
+cmd:diff -y /etc/xcat/ca/private/ca-key.pem  /tmp/credential/credential/etc/xcat/ca/private/ca-key.pem
+check:rc==0
+cmd:diff -y  /etc/xcat/cert/server-cred.pem  /tmp/credential/credential/etc/xcat/cert/server-cred.pem
+check:rc==0
+cmd:diff -y /root/.xcat/client-key.pem  /tmp/credential/credential/root/.xcat/client-key.pem
+check:rc==0
+cmd:xcat-inventory import -t credential -d /tmp/credential 
+check:rc==0
+check:output=~Inventory import successfully!
+check:output=~Warning: the /etc/xcat/ca/ca-cert.pem already exists, will be overwritten
+check:output=~Warning: the /etc/xcat/ca/private/ca-key.pem already exists, will be overwritten
+check:output=~Warning: the /root/.xcat/client-key.pem already exists, will be overwritten
+check:output=~Warning: the /etc/xcat/cert/server-cred.pem already exists, will be overwritten
+check:output=~The object credential has been imported
+cmd:diff -y /etc/xcat/ca/ca-cert.pem /tmp/backup/ca-cert.pem
+check:rc==0
+cmd:diff -y /etc/xcat/ca/private/ca-key.pem  /tmp/backup/ca-key.pem
+check:rc==0
+cmd:diff -y  /etc/xcat/cert/server-cred.pem  /tmp/backup/server-cred.pem
+check:rc==0
+cmd:diff -y /root/.xcat/client-key.pem  /tmp/backup/client-key.pem
+check:rc==0
+cmd:rm -rf /tmp/credential
+cmd:rm -rf /tmp/backup
+cmd:dir="/tmp/credential.bak";if [ -e "${dir}" ];then mv ${dir}".bak" ${dir}; fi;
+cmd:dir="/tmp/backup.bak";if [ -e "${dir}" ];then mv ${dir}".bak" ${dir}; fi;
+end

From a4e9076c92f8cba953dc88b633e5685c901c5146 Mon Sep 17 00:00:00 2001
From: "litingt@cn.ibm.com" <litingt@cn.ibm.com>
Date: Sat, 28 Jul 2018 09:17:10 -0400
Subject: [PATCH 2/3] update the case according to comment

---
 .../autotest/testcase/xcat-inventory/cases.credential     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.credential b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
index 3efb1f951..a78febfaf 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
@@ -16,6 +16,14 @@ cmd:diff -y  /etc/xcat/cert/server-cred.pem  /tmp/credential/credential/etc/xcat
 check:rc==0
 cmd:diff -y /root/.xcat/client-key.pem  /tmp/credential/credential/root/.xcat/client-key.pem
 check:rc==0
+cmd:sed -i '$a\test' /etc/xcat/ca/ca-cert.pem
+check:rc==0
+cmd:sed -i '$a\test' /etc/xcat/ca/private/ca-key.pem
+check:rc==0
+cmd:sed -i '$a\test' /etc/xcat/cert/server-cred.pem
+check:rc==0
+cmd:sed -i '$a\test' /root/.xcat/client-key.pem
+check:rc==0
 cmd:xcat-inventory import -t credential -d /tmp/credential 
 check:rc==0
 check:output=~Inventory import successfully!

From 2790444a95f13f691a16f4f3499311c86789ec62 Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Tue, 14 Aug 2018 14:09:51 +0800
Subject: [PATCH 3/3] recovery files, fix directory problem

---
 .../autotest/testcase/xcat-inventory/cases.credential     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.credential b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
index a78febfaf..ddf9b5ab5 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.credential
@@ -41,7 +41,11 @@ check:rc==0
 cmd:diff -y /root/.xcat/client-key.pem  /tmp/backup/client-key.pem
 check:rc==0
 cmd:rm -rf /tmp/credential
+cmd:cp -rf /tmp/backup/ca-cert.pem /etc/xcat/ca/ca-cert.pem
+cmd:cp -rf /tmp/backup/ca-key.pem /etc/xcat/ca/private/ca-key.pem
+cmd:cp -rf /tmp/backup/server-cred.pem /etc/xcat/cert/server-cred.pem
+cmd:cp -rf /tmp/backup/client-key.pem /root/.xcat/client-key.pem
 cmd:rm -rf /tmp/backup
-cmd:dir="/tmp/credential.bak";if [ -e "${dir}" ];then mv ${dir}".bak" ${dir}; fi;
-cmd:dir="/tmp/backup.bak";if [ -e "${dir}" ];then mv ${dir}".bak" ${dir}; fi;
+cmd:dir="/tmp/credential";if [ -e "${dir}" ];then mv ${dir}".bak" ${dir}; fi;
+cmd:dir="/tmp/backup";if [ -e "${dir}" ];then mv ${dir}".bak" ${dir}; fi;
 end