xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-02 02:45:35 +00:00
Code Issues Releases Wiki Activity

Additional changes to the REST test cases and bundle based on Mark's comments

Browse Source
This commit is contained in:
Wai Yee Wong
2020-09-24 13:54:06 -04:00
parent c2876c9a1b
commit 4c5cd2c52b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-test/autotest/bundle/rhels_ppcle_daily.bundle
View File

@ -306,5 +306,5 @@ xcatstanzafile_normal
xcatstanzafile_objtype
xcatstanzafile_specificvalue
xcatstanzafile_tab
go_xcat_devel_from_repo
#INCLUDE:restapi.bundle#
go_xcat_devel_from_repo

10
xCAT-test/autotest/testcase/restapi/cases0
View File

@ -4,7 +4,7 @@ label:restapi
#Install the mod_ssl package on Red Hat
cmd:if cat /etc/*release | grep "Red Hat" >/dev/null; then yum install mod_ssl -y; rpm -qa | grep mod_ssl; fi
check:rc==0
cmd:sed -i 's/^\(\s*\)SSLCertificateFile.*$/\1SSLCertificateFile \/etc\/xcat\/cert\/server-cred.pem/' /etc/httpd/conf.d/ssl.conf
cmd:sed -i 's/^\(\s*\)SSLCertificateFile.*$/\1SSLCertificateFile \/etc\/xcat\/cert\/server-cred.pem/' /etc/httpd/conf.d/ssl.conf
cmd:sed -i 's/^\(\s*SSLCertificateKeyFile.*\)$/#\1/' /etc/httpd/conf.d/ssl.conf
cmd:if cat /etc/*release | grep "Red Hat" >/dev/null; then service httpd restart; fi
check:rc==0
@ -55,7 +55,7 @@ description: List nodes on the management node with "curl -X GET"
label:restapi
cmd:username=__GETTABLEVALUE(key,system,username,passwd)__;password=__GETTABLEVALUE(key,system,password,passwd)__;xdsh $$CN "curl -X GET -s --cacert /root/ca-cert.pem 'https://$$MN/xcatws/nodes?&userName=$username&userPW=$password'"
check:rc==0
check:output=~$$CN
check:output=~$$SN
end
start:restapi_list_node_CN
@ -71,7 +71,7 @@ description: List networks on the management node with "curl -X GET"
label:restapi
cmd:username=__GETTABLEVALUE(key,system,username,passwd)__;password=__GETTABLEVALUE(key,system,password,passwd)__;xdsh $$CN "curl -X GET -s -k --cacert /root/ca-cert.pem 'https://$$MN/xcatws/networks?userName=$username&userPW=$password'"
check:rc==0
check:output!~""
check:output=~__GETTABLEVALUE(mtu,1500,netname,networks)__
end
start:restapi_list_osimages
@ -108,7 +108,7 @@ check:output!~temp_node1
end
start:restapi_delete_temp_CN_2
description: Delete a temporary compute node with "curl -X DELETE"
description: Delete two temporary compute nodes with "curl -X DELETE"
label:restapi
cmd:username=__GETTABLEVALUE(key,system,username,passwd)__;password=__GETTABLEVALUE(key,system,password,passwd)__;xdsh $$CN "curl -X DELETE -s --cacert /root/ca-cert.pem 'https://$$MN/xcatws/nodes/temp_node[1-2]?userName=$username&userPW=$password'"
check:rc==0
@ -117,7 +117,7 @@ check:output!~temp_node1
end
start:restapi_list_temp_CN_2
description: Delete a temporary compute node with "curl -X DELETE"
description: List two temporary compute nodes with "curl -X DELETE" and with various range options
label:restapi
cmd:username=__GETTABLEVALUE(key,system,username,passwd)__;password=__GETTABLEVALUE(key,system,password,passwd)__;xdsh $$CN "curl -X GET -s --cacert /root/ca-cert.pem 'https://$$MN/xcatws/nodes/temp_node[1-2]?userName=$username&userPW=$password'"
check:rc==0