xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-22 05:55:35 +00:00
Code Issues Releases Wiki Activity

refine code according to comments

Browse Source
This commit is contained in:
yangsbj
2018-05-24 03:33:44 -04:00
parent 380beadb37
commit f25c9119f5
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir
View File

@ -9,7 +9,7 @@ cmd:lsdef -t osimage -o test_myimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsd
cmd:rmdef -t osimage -o test_myimage
cmd: lsdef -t osimage -o test_myimage
check:rc!=0
cmd: rm -rf /tmp/test_myimage
cmd:dir="/tmp/test_myimage";if [ -d "${dir}" ];then mv ${dir} ${dir}".old"; fi
#import test_myimage
cmd: xcat-inventory import -d /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage
@ -26,10 +26,10 @@ check:rc==0
#cleanup
cmd:rmdef -t osimage -o test_myimage
cmd:rm -rf /tmp/test_myimage
cmd:dir="/tmp/test_myimage"; rm -rf $dir; if [ -d ${dir}".old" ];then mv ${dir}".old" $dir; fi
#restore the original test_myimage if any
#cmd: [ -e '/tmp/export_import_an_osimage_directory/backup/test_myimage.stanza' ] && cat /tmp/export_import_an_osimage_directory/backup/test_myimage.stanza|mkdef -z
cmd: if [ -e '/tmp/export_import_an_osimage_directory/backup/test_myimage.stanza' ]; then cat /tmp/export_import_an_osimage_directory/backup/test_myimage.stanza|mkdef -z;fi
cmd: rm -rf /tmp/export_import_an_osimage_directory
end
@ -50,8 +50,8 @@ cmd: lsdef -t osimage -o test_myimage
check:rc!=0
cmd: lsdef -t osimage -o test_myimage2
check:rc!=0
cmd: rm -rf /tmp/test_myimage
cmd: rm -rf /tmp/test_myimage2
cmd:dir="/tmp/test_myimage";if [ -d "${dir}" ];then mv ${dir} ${dir}".old"; fi
cmd:dir="/tmp/test_myimage2";if [ -d "${dir}" ];then mv ${dir} ${dir}".old"; fi
#import osimages
cmd: xcat-inventory import -d /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/
@ -74,9 +74,10 @@ check:rc==0
#cleanup
cmd:rmdef -t osimage -o test_myimage
cmd:rm -rf /tmp/test_myimage
cmd:dir="/tmp/test_myimage"; rm -rf $dir; if [ -d ${dir}".old" ];then mv ${dir}".old" $dir; fi
cmd:rmdef -t osimage -o test_myimage2
cmd:rm -rf /tmp/test_myimage2
cmd:dir="/tmp/test_myimage2"; rm -rf $dir; if [ -d ${dir}".old" ];then mv ${dir}".old" $dir; fi
#restore the original osimages if any
cmd: if [ -e '/tmp/export_import_multiple_osimages_from_osimage_directory/backup/test_myimage.stanza' ]; then cat /tmp/export_import_multiple_osimages_from_osimage_directory/backup/test_myimage.stanza|mkdef -z;fi
@ -99,7 +100,7 @@ cmd:lsdef -t osimage -o test_myimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsd
cmd:rmdef -t osimage -o test_myimage
cmd: lsdef -t osimage -o test_myimage
check:rc!=0
cmd: rm -rf /tmp/test_myimage
cmd:dir="/tmp/test_myimage";if [ -d "${dir}" ];then mv ${dir} ${dir}".old"; fi
#import test_myimage
cmd: xcat-inventory import -d /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/ -t osimage -o test_myimage
@ -116,9 +117,9 @@ check:rc==0
#cleanup
cmd:rmdef -t osimage -o test_myimage
cmd:rm -rf /tmp/test_myimage
cmd:dir="/tmp/test_myimage"; rm -rf $dir; if [ -d ${dir}".old" ];then mv ${dir}".old" $dir; fi
#restore the original test_myimage if any
#cmd: [ -e '/tmp/export_import_specified_from_osimage_directory/backup/test_myimage.stanza' ] && cat /tmp/export_import_specified_from_osimage_directory/backup/test_myimage.stanza|mkdef -z
cmd: if [ -e '/tmp/export_import_specified_from_osimage_directory/backup/test_myimage.stanza' ]; then cat /tmp/export_import_specified_from_osimage_directory/backup/test_myimage.stanza|mkdef -z;fi
cmd: rm -rf /tmp/export_import_specified_from_osimage_directory
end