diff --git a/xCAT-test/autotest/testcase/xcat_inventory/cases.node b/xCAT-test/autotest/testcase/xcat_inventory/cases.node index bbbb52229..27c1bf40c 100644 --- a/xCAT-test/autotest/testcase/xcat_inventory/cases.node +++ b/xCAT-test/autotest/testcase/xcat_inventory/cases.node @@ -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" diff --git a/xCAT-test/autotest/testcase/xcat_inventory/templates/node.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/node.json index 57ba3f76a..145198cd7 100644 --- a/xCAT-test/autotest/testcase/xcat_inventory/templates/node.json +++ b/xCAT-test/autotest/testcase/xcat_inventory/templates/node.json @@ -22,8 +22,8 @@ "noderesnimserver": "nimserver", "noderesprimarynic": "primarynic", "noderesproxydhcp": "supportproxydhcp", - "servicenodeftpserver": "setupftp", - "servicenodenimserver": "setupnim", +# "servicenodeftpserver": "setupftp", +# "servicenodenimserver": "setupnim", "storagecontroller": "storagcontroller", "storageosvolume": "osvolume", "storagetype": "storagetype", diff --git a/xCAT-test/autotest/testcase/xcat_inventory/templates/node.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/node.yaml index ee09a0b63..4c8b4382c 100644 --- a/xCAT-test/autotest/testcase/xcat_inventory/templates/node.yaml +++ b/xCAT-test/autotest/testcase/xcat_inventory/templates/node.yaml @@ -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