From 2f62326f04b21d1ea8987be2549e67655b76a574 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Fri, 2 Jun 2017 16:45:40 +0800
Subject: [PATCH] Do operating system deployment in migration test cases

---
 .../testcase/migration/redhat_migration       | 42 +++++++++++--------
 .../testcase/migration/sles_migration         | 38 ++++++++++-------
 .../testcase/migration/ubuntu_migration1_p8le | 19 +++++----
 .../testcase/migration/ubuntu_migration1_vm   | 19 +++++----
 .../testcase/migration/ubuntu_migration2_p8le | 19 +++++----
 .../testcase/migration/ubuntu_migration2_vm   | 19 +++++----
 6 files changed, 97 insertions(+), 59 deletions(-)

diff --git a/xCAT-test/autotest/testcase/migration/redhat_migration b/xCAT-test/autotest/testcase/migration/redhat_migration
index 57e67a268..6ce3b9432 100644
--- a/xCAT-test/autotest/testcase/migration/redhat_migration
+++ b/xCAT-test/autotest/testcase/migration/redhat_migration
@@ -71,11 +71,13 @@ check:output=~$$MIGRATION1_VERSION
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "chdef -t node -o node0001  nodetype=osi groups=linux"
+cmd:lsdef $$SN -z | ssh $$CN "mkdef -z"
+cmd:ssh $$CN "chdef $$SN servicenode= monserver= nfsserver= tftpserver= xcatmaster="
+cmd:makedhcp -d $$SN
+cmd:scp $$ISO $$CN:/tmp/foobar.iso
+cmd:ssh $$CN "copycds /tmp/foobar.iso"
+cmd:ssh $$CN "makedhcp -n"
 check:rc==0
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
-cmd:check==0
 cmd:xdsh $$CN "cd /; scp -r $$MN:/core-rpms-snap.tar.bz2 /"
 check:rc==0
 cmd:xdsh $$CN "cd /; scp -r $$MN:/xcat-dep*.tar.bz2 /"
@@ -93,14 +95,15 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
-cmd:xdsh $$CN "noderm node0001"
-check:rc==0
-cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test"
-check:rc==0
 cmd:latest_version_info=`lsxcatd -v`;xdsh $$CN "lsxcatd -v" | grep "$latest_version_info"
 check:rc==0
+cmd:ssh $$CN "rinstall $$SN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute"
+check:rc==0
+cmd:sleep 300
+cmd:ssh $$CN "a=0; while ! `lsdef -l $$SN | grep status | grep booted >/dev/null`; do ((++a > 90)) && exit 99; sleep 20; done"
+check:rc==0
+cmd:ssh $$CN "xdsh $$SN date"
+check:rc==0
 cmd:if [[ -f /tmp/servicelabel ]];then chdef $$SN -p groups=service;rm -rf /tmp/servicelabel;fi
 check:rc==0
 cmd:if [[ -f /tmp/poweroffsn ]];then rpower $$SN on > /dev/null;rm -rf /tmp/poweroffsn;fi
@@ -180,10 +183,12 @@ check:output=~$$MIGRATION2_VERSION
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "chdef -t node -o node0001  nodetype=osi groups=linux"
-check:rc==0
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
+cmd:lsdef $$SN -z | ssh $$CN "mkdef -z"
+cmd:ssh $$CN "chdef $$SN servicenode= monserver= nfsserver= tftpserver= xcatmaster="
+cmd:makedhcp -d $$SN
+cmd:scp $$ISO $$CN:/tmp/foobar.iso
+cmd:ssh $$CN "copycds /tmp/foobar.iso"
+cmd:ssh $$CN "makedhcp -n"
 cmd:check==0
 cmd:xdsh $$CN "cd /; scp -r $$MN:/core-rpms-snap.tar.bz2 /"
 check:rc==0
@@ -202,9 +207,12 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
-cmd:xdsh $$CN "noderm node0001"
+cmd:ssh $$CN "rinstall $$SN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute"
+check:rc==0
+cmd:sleep 300
+cmd:ssh $$CN "a=0; while ! `lsdef -l $$SN | grep status | grep booted >/dev/null`; do ((++a > 90)) && exit 99; sleep 20; done"
+check:rc==0
+cmd:ssh $$CN "xdsh $$SN date"
 check:rc==0
 cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test"
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/migration/sles_migration b/xCAT-test/autotest/testcase/migration/sles_migration
index 36e6002fa..d822385e0 100644
--- a/xCAT-test/autotest/testcase/migration/sles_migration
+++ b/xCAT-test/autotest/testcase/migration/sles_migration
@@ -74,10 +74,12 @@ check:output=~$$MIGRATION1_VERSION
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "chdef -t node -o node0001  nodetype=osi groups=linux"
-check:rc==0
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
+cmd:lsdef $$SN -z | ssh $$CN "mkdef -z"
+cmd:ssh $$CN "chdef $$SN servicenode= monserver= nfsserver= tftpserver= xcatmaster="
+cmd:makedhcp -d $$SN
+cmd:scp $$ISO $$CN:/tmp/foobar.iso
+cmd:ssh $$CN "copycds /tmp/foobar.iso"
+cmd:ssh $$CN "makedhcp -n"
 cmd:xdsh $$CN "cd /; scp -r $$MN:/core-rpms-snap.tar.bz2 /"
 check:rc==0
 cmd:xdsh $$CN "cd /; scp -r $$MN:/xcat-dep*.tar.bz2 /"
@@ -95,9 +97,12 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
-cmd:xdsh $$CN "noderm node0001"
+cmd:ssh $$CN "rinstall $$SN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute"
+check:rc==0
+cmd:sleep 300
+cmd:ssh $$CN "a=0; while ! `lsdef -l $$SN | grep status | grep booted >/dev/null`; do ((++a > 90)) && exit 99; sleep 20; done"
+check:rc==0
+cmd:ssh $$CN "xdsh $$SN date"
 check:rc==0
 cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test"
 check:rc==0
@@ -186,10 +191,12 @@ check:output=~$$MIGRATION2_VERSION
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "chdef -t node -o node0001  nodetype=osi groups=linux"
-check:rc==0
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
+cmd:lsdef $$SN -z | ssh $$CN "mkdef -z"
+cmd:ssh $$CN "chdef $$SN servicenode= monserver= nfsserver= tftpserver= xcatmaster="
+cmd:makedhcp -d $$SN
+cmd:scp $$ISO $$CN:/tmp/foobar.iso
+cmd:ssh $$CN "copycds /tmp/foobar.iso"
+cmd:ssh $$CN "makedhcp -n"
 cmd:xdsh $$CN "cd /; scp -r $$MN:/core-rpms-snap.tar.bz2 /"
 check:rc==0
 cmd:xdsh $$CN "cd /; scp -r $$MN:/xcat-dep*.tar.bz2 /"
@@ -207,9 +214,12 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "lsdef"
-check:output=~node0001
-cmd:xdsh $$CN "noderm node0001"
+cmd:ssh $$CN "rinstall $$SN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute"
+check:rc==0
+cmd:sleep 300
+cmd:ssh $$CN "a=0; while ! `lsdef -l $$SN | grep status | grep booted >/dev/null`; do ((++a > 90)) && exit 99; sleep 20; done"
+check:rc==0
+cmd:ssh $$CN "xdsh $$SN date"
 check:rc==0
 cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test"
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le
index e9f12e354..2a6c8af8f 100644
--- a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le
+++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_p8le
@@ -80,10 +80,12 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;chdef -t node -o node0001  nodetype=osi groups=linux"
-check:rc==0
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef"
-check:output=~node0001
+cmd:lsdef $$SN -z | ssh $$CN "/opt/xcat/bin/mkdef -z"
+cmd:ssh $$CN "/opt/xcat/bin/chdef $$SN servicenode= monserver= nfsserver= tftpserver= xcatmaster="
+cmd:makedhcp -d $$SN
+cmd:scp $$ISO $$CN:/tmp/foobar.iso
+cmd:ssh $$CN "/opt/xcat/sbin/copycds /tmp/foobar.iso"
+cmd:ssh $$CN "/opt/xcat/sbin/makedhcp -n"
 cmd:xdsh $$CN "rm -rf /newxcat"
 cmd:xdsh $$CN "mkdir -p /newxcat"
 check:rc==0
@@ -114,10 +116,13 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;rmdef node0001"
+cmd:ssh $$CN "/opt/xcat/bin/rinstall $$SN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute"
+check:rc==0
+cmd:sleep 300
+cmd:ssh $$CN "a=0; while ! `/opt/xcat/bin/lsdef -l $$SN | grep status | grep booted >/dev/null`; do ((++a > 90)) && exit 99; sleep 20; done"
+check:rc==0
+cmd:ssh $$CN "/opt/xcat/bin/xdsh $$SN date"
 check:rc==0
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef"
-check:output!~node0001
 cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test"
 check:rc==0
 cmd:xdsh $$CN "diff /oldxcat/old_version /newxcat/new_version"
diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm
index 1c72822a7..8c519b898 100644
--- a/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm
+++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration1_vm
@@ -79,10 +79,12 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;chdef -t node -o node0001  nodetype=osi groups=linux"
-check:rc==0
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef"
-check:output=~node0001
+cmd:lsdef $$SN -z | ssh $$CN "/opt/xcat/bin/mkdef -z"
+cmd:ssh $$CN "/opt/xcat/bin/chdef $$SN servicenode= monserver= nfsserver= tftpserver= xcatmaster="
+cmd:makedhcp -d $$SN
+cmd:scp $$ISO $$CN:/tmp/foobar.iso
+cmd:ssh $$CN "/opt/xcat/sbin/copycds /tmp/foobar.iso"
+cmd:ssh $$CN "/opt/xcat/sbin/makedhcp -n"
 cmd:xdsh $$CN "rm -rf /newxcat"
 cmd:xdsh $$CN "mkdir -p /newxcat"
 check:rc==0
@@ -113,10 +115,13 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;rmdef node0001"
+cmd:ssh $$CN "/opt/xcat/bin/rinstall $$SN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute"
+check:rc==0
+cmd:sleep 300
+cmd:ssh $$CN "a=0; while ! `/opt/xcat/bin/lsdef -l $$SN | grep status | grep booted >/dev/null`; do ((++a > 90)) && exit 99; sleep 20; done"
+check:rc==0
+cmd:ssh $$CN "/opt/xcat/bin/xdsh $$SN date"
 check:rc==0
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef"
-check:output!~node0001
 cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test"
 check:rc==0
 cmd:xdsh $$CN "diff /oldxcat/old_version /newxcat/new_version"
diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le
index a1509715b..ca3fe6569 100644
--- a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le
+++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_p8le
@@ -80,10 +80,12 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;chdef -t node -o node0001  nodetype=osi groups=linux"
-check:rc==0
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef"
-check:output=~node0001
+cmd:lsdef $$SN -z | ssh $$CN "/opt/xcat/bin/mkdef -z"
+cmd:ssh $$CN "/opt/xcat/bin/chdef $$SN servicenode= monserver= nfsserver= tftpserver= xcatmaster="
+cmd:makedhcp -d $$SN
+cmd:scp $$ISO $$CN:/tmp/foobar.iso
+cmd:ssh $$CN "/opt/xcat/sbin/copycds /tmp/foobar.iso"
+cmd:ssh $$CN "/opt/xcat/sbin/makedhcp -n"
 cmd:xdsh $$CN "rm -rf /newxcat"
 cmd:xdsh $$CN "mkdir -p /newxcat"
 check:rc==0
@@ -114,10 +116,13 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;rmdef node0001"
+cmd:ssh $$CN "/opt/xcat/bin/rinstall $$SN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute"
+check:rc==0
+cmd:sleep 300
+cmd:ssh $$CN "a=0; while ! `/opt/xcat/bin/lsdef -l $$SN | grep status | grep booted >/dev/null`; do ((++a > 90)) && exit 99; sleep 20; done"
+check:rc==0
+cmd:ssh $$CN "/opt/xcat/bin/xdsh $$SN date"
 check:rc==0
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef"
-check:output!~node0001
 cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test"
 check:rc==0
 cmd:xdsh $$CN "diff /oldxcat/old_version /newxcat/new_version"
diff --git a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm
index d4af68b22..adfe3244a 100644
--- a/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm
+++ b/xCAT-test/autotest/testcase/migration/ubuntu_migration2_vm
@@ -79,10 +79,12 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;chdef -t node -o node0001  nodetype=osi groups=linux"
-check:rc==0
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef"
-check:output=~node0001
+cmd:lsdef $$SN -z | ssh $$CN "/opt/xcat/bin/mkdef -z"
+cmd:ssh $$CN "/opt/xcat/bin/chdef $$SN servicenode= monserver= nfsserver= tftpserver= xcatmaster="
+cmd:makedhcp -d $$SN
+cmd:scp $$ISO $$CN:/tmp/foobar.iso
+cmd:ssh $$CN "/opt/xcat/sbin/copycds /tmp/foobar.iso"
+cmd:ssh $$CN "/opt/xcat/sbin/makedhcp -n"
 cmd:xdsh $$CN "rm -rf /newxcat"
 cmd:xdsh $$CN "mkdir -p /newxcat"
 check:rc==0
@@ -113,10 +115,13 @@ check:rc==0
 cmd:xdsh $$CN "service xcatd status"
 check:rc==0
 check:output=~running
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;rmdef node0001"
+cmd:ssh $$CN "/opt/xcat/bin/rinstall $$SN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute"
+check:rc==0
+cmd:sleep 300
+cmd:ssh $$CN "a=0; while ! `/opt/xcat/bin/lsdef -l $$SN | grep status | grep booted >/dev/null`; do ((++a > 90)) && exit 99; sleep 20; done"
+check:rc==0
+cmd:ssh $$CN "/opt/xcat/bin/xdsh $$SN date"
 check:rc==0
-cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsdef"
-check:output!~node0001
 cmd:xdsh $$CN "/opt/xcat/share/xcat/tools/go-xcat smoke-test"
 check:rc==0
 cmd:xdsh $$CN "diff /oldxcat/old_version /newxcat/new_version"