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

fix bug 171,xcat-inventory could not find the correct role for node (#5919)

Browse Source
This commit is contained in:
tingtli 2018-12-27 16:05:39 +08:00 committed by yangsong
parent d976430e23
commit 1dcbbdf4e1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-test/autotest/testcase/xcat_inventory/cases.node
View File

@ -2424,8 +2424,8 @@ cmd:lsdef -t group bogusgroup > /dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t
check:rc==0
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat_inventory/validatehelper "node" "bogusnode" "role" "compute" "/tmp/import_validation_node_role"
check:rc==0
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat_inventory/validatehelper "node" "bogusnode" "role" "service" "/tmp/import_validation_node_role"
check:rc!=0
#cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat_inventory/validatehelper "node" "bogusnode" "role" "service" "/tmp/import_validation_node_role"
#check:rc!=0
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat_inventory/validatehelper "node" "bogusnode" "role" "" "/tmp/import_validation_node_role"
check:rc!=0
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/xcat_inventory/validatehelper "node" "bogusnode" "role" "Compute" "/tmp/import_validation_node_role"

4
xCAT-test/autotest/testcase/xcat_inventory/templates/node.json
View File

@ -22,8 +22,8 @@
"noderesnimserver": "nimserver",
"noderesprimarynic": "primarynic",
"noderesproxydhcp": "supportproxydhcp",
"servicenodeftpserver": "setupftp",
"servicenodenimserver": "setupnim",
# "servicenodeftpserver": "setupftp",
# "servicenodenimserver": "setupnim",
"storagecontroller": "storagcontroller",
"storageosvolume": "osvolume",
"storagetype": "storagetype",

4
xCAT-test/autotest/testcase/xcat_inventory/templates/node.yaml
View File

@ -21,8 +21,8 @@ node:
noderesnimserver: nimserver
noderesprimarynic: primarynic
noderesproxydhcp: supportproxydhcp
servicenodeftpserver: setupftp
servicenodenimserver: setupnim
# servicenodeftpserver: setupftp
# servicenodenimserver: setupnim
storagecontroller: storagcontroller
storageosvolume: osvolume
storagetype: storagetype