From e58b6c9cb21f629ef6dd6b40b1d928d313c9254a Mon Sep 17 00:00:00 2001 From: litingt Date: Tue, 27 Nov 2018 22:44:59 -0500 Subject: [PATCH] update the error label --- .../bionic-ppc64el.sources.list | 0 .../{go-xcat => go_xcat}/bionic-x86_64.sources.list | 0 .../autotest/testcase/{go-xcat => go_xcat}/case0 | 0 .../autotest/testcase/{go-xcat => go_xcat}/case1 | 0 .../autotest/testcase/{go-xcat => go_xcat}/case2 | 0 .../autotest/testcase/{go-xcat => go_xcat}/case4 | 0 .../autotest/testcase/{go-xcat => go_xcat}/case5 | 0 .../trusty-ppc64el.sources.list | 0 .../{go-xcat => go_xcat}/trusty-x86_64.sources.list | 0 .../xenial-ppc64el.sources.list | 0 .../{go-xcat => go_xcat}/xenial-x86_64.sources.list | 0 ...ux_diskfull_installation_flat_postscripts_failed | 2 +- ...ux_diskless_installation_flat_postscripts_failed | 2 +- .../installation/ubuntu_full_installation_vm_docker | 2 +- .../snpool/cfg_wrong_cn_in_sn_pool_tftp_sync_mode | 2 +- .../not_set_xcatmaster_in_sn_pool_tftp_mount_mode | 2 +- ...catmaster_in_sn_pool_tftp_mount_mode_checkresult | 2 +- .../set_disjointdhcps_in_sn_pool_tftp_sync_mode | 2 +- .../set_xcatmaster_in_sn_pool_tftp_mount_mode | 2 +- ...catmaster_in_sn_pool_tftp_mount_mode_checkresult | 2 +- .../snpool/set_xcatmaster_in_sn_pool_tftp_sync_mode | 2 +- .../testcase/snpool/setup_sn_pool_tftp_mount_mode | 2 +- .../testcase/snpool/setup_sn_pool_tftp_sync_mode | 2 +- .../{xcat-inventory => xcat_inventory}/cases.common | 0 .../cases.credential | 0 .../{xcat-inventory => xcat_inventory}/cases.diff | 0 .../cases.environment | 2 +- .../cases.include | 0 .../cases.network | 0 .../{xcat-inventory => xcat_inventory}/cases.nics | 0 .../{xcat-inventory => xcat_inventory}/cases.node | 0 .../cases.osimage | 0 .../cases.osimage.import_from_osimage_dir | 0 .../cases.osimage.validation | 0 .../{xcat-inventory => xcat_inventory}/cases.passwd | 0 .../{xcat-inventory => xcat_inventory}/cases.route | 0 .../{xcat-inventory => xcat_inventory}/cases.site | 0 .../cases.site.validation | 0 .../diff/change_name.sh | 0 .../diff/diff_files.result | 0 .../diff/diff_source.result | 0 .../diff/xcat-inventory_diff_file1.json | 0 .../diff/xcat-inventory_diff_file2.json | 0 .../templates/cluster_invdir/cluster.json | 0 .../osimage/test_myimage/definition.json | 0 .../osimage/test_myimage/test_myimage.stanza | 0 .../osimage/test_myimage/tmp/test_myimage/exlist | 0 .../test_myimage/tmp/test_myimage/otherpkglist | 0 .../test_myimage/tmp/test_myimage/partitionfile | 0 .../test_myimage/tmp/test_myimage/postinstall | 0 .../osimage/test_myimage/tmp/test_myimage/synclists | 0 .../osimage/test_myimage2/definition.json | 0 .../osimage/test_myimage2/test_myimage2.stanza | 0 .../osimage/test_myimage2/tmp/test_myimage2/exlist | 0 .../test_myimage2/tmp/test_myimage2/otherpkglist | 0 .../test_myimage2/tmp/test_myimage2/partitionfile | 0 .../test_myimage2/tmp/test_myimage2/postinstall | 0 .../test_myimage2/tmp/test_myimage2/synclists | 0 .../templates/diff/change_name.sh | 0 .../templates/diff/diff.result | 0 .../templates/diff/diff_files.result | 0 .../templates/diff/diff_source.result | 0 .../templates/diff/xcat-inventory_diff_file1.json | 0 .../templates/diff/xcat-inventory_diff_file2.json | 0 .../gitrepo/otherpkglist/test1.otherpkglist | 0 .../gitrepo/otherpkglist/test2.otherpkglist | 0 .../environment/gitrepo/pkglist/test1.pkglist | 0 .../environment/gitrepo/pkglist/test2.pkglist | 0 .../gitrepo/postinstall/test1.postinstall | 0 .../gitrepo/postinstall/test2.postinstall | 0 .../environment/gitrepo/syncfiles/synclist | 0 .../otherpkgdir/conserver-xcat-8.2.1-1.ppc64le.rpm | Bin .../perl-Net-Telnet-3.03-19.el7.noarch.rpm | Bin ...6761fa5a5171ab309a2aef1d4f6efe3-filelists.xml.gz | Bin ...b614c5a9ea473f9f5f6da76997276c1-other.sqlite.bz2 | Bin ...af7f096945143e6be4f69489eb59a4aa8-primary.xml.gz | Bin ...e7a9b30078ecc06d5710c0520dc56-primary.sqlite.bz2 | Bin ...72f63b394ce110227f7d48f999a86d90ede-other.xml.gz | Bin ...e92f845dd773b0550c7f191e3f8-filelists.sqlite.bz2 | Bin .../swdir/otherpkgdir/repodata/repomd.xml | 0 .../swdir/pkgdir/dhcp-4.2.5-68.el7.ppc64le.rpm | Bin ...ae972ea2347d46b43de8cf48931-filelists.sqlite.bz2 | Bin ...d03e5f823e5ba319d0ddbed4b2a2397-filelists.xml.gz | Bin ...1c0c1203bb1f59a73e373b5cebcf03d65-primary.xml.gz | Bin ...4d8060ad5227802c0c02bb73dd72ce1-other.sqlite.bz2 | Bin ...080db5f7423ec46cf25221fb1193e35611b-other.xml.gz | Bin ...0e051dd788e791d259673af365373-primary.sqlite.bz2 | Bin .../environment/swdir/pkgdir/repodata/repomd.xml | 0 .../swdir/pkgdir/tftp-5.2-22.el7.ppc64le.rpm | Bin .../environment/test.environments.osimage.stanza | 0 .../test.environments.osimage.update.json | 0 .../test.environments.osimage.update.yaml | 0 .../environment/test.environments.osimage.yaml | 0 .../templates/imagedata/test_osimage/exlist | 0 .../templates/imagedata/test_osimage/file1.1 | 0 .../templates/imagedata/test_osimage/file2.1 | 0 .../templates/imagedata/test_osimage/file2.2 | 0 .../templates/imagedata/test_osimage/file2.3 | 0 .../templates/imagedata/test_osimage/file3.1 | 0 .../templates/imagedata/test_osimage/file3.2 | 0 .../templates/imagedata/test_osimage/file3.3 | 0 .../templates/imagedata/test_osimage/file4.1 | 0 .../templates/imagedata/test_osimage/file4.2 | 0 .../templates/imagedata/test_osimage/file4.3 | 0 .../templates/imagedata/test_osimage/file5 | 0 .../templates/imagedata/test_osimage/file6 | 0 .../templates/imagedata/test_osimage/file7 | 0 .../templates/imagedata/test_osimage/otherpkglist | 0 .../templates/imagedata/test_osimage/partitionfile | 0 .../templates/imagedata/test_osimage/pkglist | 0 .../templates/imagedata/test_osimage/postinstall | 0 .../templates/imagedata/test_osimage/synclists | 0 .../templates/imagedata/test_osimage/template.tmpl | 0 .../imagedata/test_osimage/test_osimage.stanza | 0 .../templates/network.json | 0 .../templates/network.yaml | 0 .../templates/nics.csv | 0 .../templates/nics.json | 0 .../templates/nics.yaml | 0 .../templates/node.json | 0 .../templates/node.yaml | 0 .../templates/osimage.json | 0 .../templates/osimage.yaml | 0 .../templates/passwd.json | 0 .../templates/passwd.yaml | 0 .../templates/route.json | 0 .../templates/route.yaml | 0 .../templates/site.json | 0 .../templates/site.yaml | 0 .../validatehelper | 0 .../xcatdebugmode/rhels_xcatdebugmode_diskful | 12 ++++++------ .../xcatdebugmode/sles_xcatdebugmode_diskful | 8 ++++---- .../xcatdebugmode/ubuntu_xcatdebugmode_diskful | 8 ++++---- 133 files changed, 27 insertions(+), 27 deletions(-) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/bionic-ppc64el.sources.list (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/bionic-x86_64.sources.list (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/case0 (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/case1 (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/case2 (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/case4 (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/case5 (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/trusty-ppc64el.sources.list (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/trusty-x86_64.sources.list (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/xenial-ppc64el.sources.list (100%) rename xCAT-test/autotest/testcase/{go-xcat => go_xcat}/xenial-x86_64.sources.list (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.common (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.credential (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.diff (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.environment (99%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.include (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.network (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.nics (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.node (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.osimage (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.osimage.import_from_osimage_dir (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.osimage.validation (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.passwd (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.route (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.site (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/cases.site.validation (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/diff/change_name.sh (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/diff/diff_files.result (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/diff/diff_source.result (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/diff/xcat-inventory_diff_file1.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/diff/xcat-inventory_diff_file2.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/cluster.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage/definition.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/exlist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/otherpkglist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/partitionfile (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/postinstall (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/synclists (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage2/definition.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage2/test_myimage2.stanza (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/exlist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/otherpkglist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/partitionfile (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/postinstall (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/synclists (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/diff/change_name.sh (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/diff/diff.result (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/diff/diff_files.result (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/diff/diff_source.result (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/diff/xcat-inventory_diff_file1.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/diff/xcat-inventory_diff_file2.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/gitrepo/otherpkglist/test1.otherpkglist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/gitrepo/otherpkglist/test2.otherpkglist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/gitrepo/pkglist/test1.pkglist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/gitrepo/pkglist/test2.pkglist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/gitrepo/postinstall/test1.postinstall (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/gitrepo/postinstall/test2.postinstall (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/gitrepo/syncfiles/synclist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/otherpkgdir/conserver-xcat-8.2.1-1.ppc64le.rpm (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/otherpkgdir/perl-Net-Telnet-3.03-19.el7.noarch.rpm (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/otherpkgdir/repodata/2f8132e926de0ada34da23f1a63713a9e6761fa5a5171ab309a2aef1d4f6efe3-filelists.xml.gz (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/otherpkgdir/repodata/771b092d010ec878233b66dc1dba2ab81b614c5a9ea473f9f5f6da76997276c1-other.sqlite.bz2 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/otherpkgdir/repodata/8a1f4155ca9e8784d0a41e5a9b5b715af7f096945143e6be4f69489eb59a4aa8-primary.xml.gz (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/otherpkgdir/repodata/98590d4faf7b8f997493a85d6fcbb6aa2ede7a9b30078ecc06d5710c0520dc56-primary.sqlite.bz2 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/otherpkgdir/repodata/bd36e0c2e540280fd45799e9f755a72f63b394ce110227f7d48f999a86d90ede-other.xml.gz (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/otherpkgdir/repodata/e3cf2fc42c62b0328effe9e44a4ab1296905ae92f845dd773b0550c7f191e3f8-filelists.sqlite.bz2 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/otherpkgdir/repodata/repomd.xml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/pkgdir/dhcp-4.2.5-68.el7.ppc64le.rpm (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/pkgdir/repodata/2a9abe54b23615850e70c41456bd49ff3994eae972ea2347d46b43de8cf48931-filelists.sqlite.bz2 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/pkgdir/repodata/4160c0db6523d465541345245e8463eacd03e5f823e5ba319d0ddbed4b2a2397-filelists.xml.gz (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/pkgdir/repodata/75c2df3e4d5ca66a0c105562f4d0cea1c0c1203bb1f59a73e373b5cebcf03d65-primary.xml.gz (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/pkgdir/repodata/811daeb0fde54384fec22af72ecdcdd2d4d8060ad5227802c0c02bb73dd72ce1-other.sqlite.bz2 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/pkgdir/repodata/9fcfad63d06bdaba2be3507fbb1cd080db5f7423ec46cf25221fb1193e35611b-other.xml.gz (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/pkgdir/repodata/e4f965fd5f4b914c4e89d54b8784394b7760e051dd788e791d259673af365373-primary.sqlite.bz2 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/pkgdir/repodata/repomd.xml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/swdir/pkgdir/tftp-5.2-22.el7.ppc64le.rpm (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/test.environments.osimage.stanza (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/test.environments.osimage.update.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/test.environments.osimage.update.yaml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/environment/test.environments.osimage.yaml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/exlist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file1.1 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file2.1 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file2.2 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file2.3 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file3.1 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file3.2 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file3.3 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file4.1 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file4.2 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file4.3 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file5 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file6 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/file7 (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/otherpkglist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/partitionfile (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/pkglist (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/postinstall (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/synclists (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/template.tmpl (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/imagedata/test_osimage/test_osimage.stanza (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/network.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/network.yaml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/nics.csv (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/nics.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/nics.yaml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/node.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/node.yaml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/osimage.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/osimage.yaml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/passwd.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/passwd.yaml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/route.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/route.yaml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/site.json (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/templates/site.yaml (100%) rename xCAT-test/autotest/testcase/{xcat-inventory => xcat_inventory}/validatehelper (100%) diff --git a/xCAT-test/autotest/testcase/go-xcat/bionic-ppc64el.sources.list b/xCAT-test/autotest/testcase/go_xcat/bionic-ppc64el.sources.list similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/bionic-ppc64el.sources.list rename to xCAT-test/autotest/testcase/go_xcat/bionic-ppc64el.sources.list diff --git a/xCAT-test/autotest/testcase/go-xcat/bionic-x86_64.sources.list b/xCAT-test/autotest/testcase/go_xcat/bionic-x86_64.sources.list similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/bionic-x86_64.sources.list rename to xCAT-test/autotest/testcase/go_xcat/bionic-x86_64.sources.list diff --git a/xCAT-test/autotest/testcase/go-xcat/case0 b/xCAT-test/autotest/testcase/go_xcat/case0 similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/case0 rename to xCAT-test/autotest/testcase/go_xcat/case0 diff --git a/xCAT-test/autotest/testcase/go-xcat/case1 b/xCAT-test/autotest/testcase/go_xcat/case1 similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/case1 rename to xCAT-test/autotest/testcase/go_xcat/case1 diff --git a/xCAT-test/autotest/testcase/go-xcat/case2 b/xCAT-test/autotest/testcase/go_xcat/case2 similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/case2 rename to xCAT-test/autotest/testcase/go_xcat/case2 diff --git a/xCAT-test/autotest/testcase/go-xcat/case4 b/xCAT-test/autotest/testcase/go_xcat/case4 similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/case4 rename to xCAT-test/autotest/testcase/go_xcat/case4 diff --git a/xCAT-test/autotest/testcase/go-xcat/case5 b/xCAT-test/autotest/testcase/go_xcat/case5 similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/case5 rename to xCAT-test/autotest/testcase/go_xcat/case5 diff --git a/xCAT-test/autotest/testcase/go-xcat/trusty-ppc64el.sources.list b/xCAT-test/autotest/testcase/go_xcat/trusty-ppc64el.sources.list similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/trusty-ppc64el.sources.list rename to xCAT-test/autotest/testcase/go_xcat/trusty-ppc64el.sources.list diff --git a/xCAT-test/autotest/testcase/go-xcat/trusty-x86_64.sources.list b/xCAT-test/autotest/testcase/go_xcat/trusty-x86_64.sources.list similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/trusty-x86_64.sources.list rename to xCAT-test/autotest/testcase/go_xcat/trusty-x86_64.sources.list diff --git a/xCAT-test/autotest/testcase/go-xcat/xenial-ppc64el.sources.list b/xCAT-test/autotest/testcase/go_xcat/xenial-ppc64el.sources.list similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/xenial-ppc64el.sources.list rename to xCAT-test/autotest/testcase/go_xcat/xenial-ppc64el.sources.list diff --git a/xCAT-test/autotest/testcase/go-xcat/xenial-x86_64.sources.list b/xCAT-test/autotest/testcase/go_xcat/xenial-x86_64.sources.list similarity index 100% rename from xCAT-test/autotest/testcase/go-xcat/xenial-x86_64.sources.list rename to xCAT-test/autotest/testcase/go_xcat/xenial-x86_64.sources.list diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed index d61220f77..511a93fea 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat_postscripts_failed @@ -2,7 +2,7 @@ start:reg_linux_diskfull_installation_flat_postscripts_failed description:This case is for postscripts failed the status will return failed during diskfull installation. attribute:$$CN-The operation object of diskfull installation. os:Linux -label:others,postscripts,invoke_provison +label:others,postscripts,invoke_provision cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi cmd:MINIISO=NUll;if [[ "__GETNODEATTR($$CN,os)__" =~ "ubuntu" ]] && [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]];then mkdir /tmp/iso; mount -o loop $$MINIISO /tmp/iso ; mkdir -p /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/install/netboot; cp /tmp/iso/install/initrd.gz /install/__GETNODEATTR($$CN,os)__/__GETNODEATTR($$CN,arch)__/install/netboot;umount /tmp/iso; rmdir /tmp/iso; fi check:rc==0 diff --git a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat_postscripts_failed b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat_postscripts_failed index 0121d2249..d29e28cd0 100644 --- a/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat_postscripts_failed +++ b/xCAT-test/autotest/testcase/installation/reg_linux_diskless_installation_flat_postscripts_failed @@ -2,7 +2,7 @@ start:reg_linux_diskless_installation_flat_postscripts_failed description:This case is for postscripts failed the status will return failed during diskless installation. attribute:$$CN-The operation object of diskless installation. os:Linux -label:others,postscripts,invoke_provison +label:others,postscripts,invoke_provision cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN check:rc==0 diff --git a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker index e7aabd53b..c8e099502 100644 --- a/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker +++ b/xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker @@ -1,6 +1,6 @@ start:Full_installation_flat_docker os:Linux -label:others,docker,invoke_provison +label:others,docker,invoke_provision cmd:copycds $$ISO check:rc==0 cmd:makedns -n diff --git a/xCAT-test/autotest/testcase/snpool/cfg_wrong_cn_in_sn_pool_tftp_sync_mode b/xCAT-test/autotest/testcase/snpool/cfg_wrong_cn_in_sn_pool_tftp_sync_mode index 9dc4543b5..955bc1f21 100644 --- a/xCAT-test/autotest/testcase/snpool/cfg_wrong_cn_in_sn_pool_tftp_sync_mode +++ b/xCAT-test/autotest/testcase/snpool/cfg_wrong_cn_in_sn_pool_tftp_sync_mode @@ -1,6 +1,6 @@ start:cfg_wrong_cn_in_sn_pool_tftp_sync_mode description:The test case is intend to test the error handling of the service node pool when a compute has misconfigured node definition -label:others,invoke_provision,sn_pool +label:others,invoke_provision,snpool cmd:fdisk -l cmd:df -T #cmd:XCAT_DATABASE=$$XCAT_DATABASE /opt/xcat/share/xcat/tools/autotest/testcase/installation/pre_deploy_sn __GETNODEATTR($$SN,os)__ __GETNODEATTR($$SN,arch)__ diff --git a/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode b/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode index f56e03bfe..c44d061e0 100644 --- a/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode +++ b/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode @@ -1,6 +1,6 @@ start:not_set_xcatmaster_in_sn_pool_tftp_mount_mode description: this case is to test when compute nodes' xcatmaster is not set in service node pool environment,compute node's provision files are correctly set after nodeset. -label:others,invoke_provision,sn_pool +label:others,invoke_provision,snpool cmd:fdisk -l cmd:df -T #cmd:XCAT_DATABASE=$$XCAT_DATABASE /opt/xcat/share/xcat/tools/autotest/testcase/installation/pre_deploy_sn __GETNODEATTR($$SN,os)__ __GETNODEATTR($$SN,arch)__ diff --git a/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult b/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult index 51da0667e..1f2a75243 100644 --- a/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult +++ b/xCAT-test/autotest/testcase/snpool/not_set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult @@ -1,6 +1,6 @@ start:not_set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult description: this case is to check the configuration files after nodeset for case not_set_xcatmaster_in_sn_pool_tftp_mount_mode -label:others,invoke_provision,sn_pool +label:others,invoke_provision,snpool #create a test compute node, don't set it's xcatmaster, set it's service node as SN and CN cmd:mkdef -t node -o compute1 groups=compute ip=10.0.0.199 mac=4a:c8:f7:de:d0:09 profile=compute os=__GETNODEATTR($$CN,os)__ arch=__GETNODEATTR($$CN,arch)__ netboot=__GETNODEATTR($$CN,netboot)__ diff --git a/xCAT-test/autotest/testcase/snpool/set_disjointdhcps_in_sn_pool_tftp_sync_mode b/xCAT-test/autotest/testcase/snpool/set_disjointdhcps_in_sn_pool_tftp_sync_mode index 533a68a7a..086a659cd 100644 --- a/xCAT-test/autotest/testcase/snpool/set_disjointdhcps_in_sn_pool_tftp_sync_mode +++ b/xCAT-test/autotest/testcase/snpool/set_disjointdhcps_in_sn_pool_tftp_sync_mode @@ -1,6 +1,6 @@ start:set_disjointdhcps_in_sn_pool_tftp_sync_mode description: Verify the disjointdhcps feature when petitboot is used for OS loader. -label:others,invoke_provision,sn_pool,dhcp +label:others,invoke_provision,snpool,dhcp cmd:rmdef testnode1 cmd:rm -f /tftpboot/petitboot/testnode1 cmd:mkdef -t node -o testnode1 arch=ppc64le cons=bmc groups=ipmi ip=10.1.1.200 mac=e6:d4:d2:3a:ad:06 mgt=ipmi profile=compute os=rhels7.99 diff --git a/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode b/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode index fec54758b..e0853de30 100644 --- a/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode +++ b/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode @@ -1,6 +1,6 @@ start:set_xcatmaster_in_sn_pool_tftp_mount_mode description: this case is to test when compute nodes' xcatmaster is set in service node pool environment,compute node's provision files are correctly set after nodeset. -label:others,invoke_provision,sn_pool +label:others,invoke_provision,snpool cmd:fdisk -l cmd:df -T #cmd:XCAT_DATABASE=$$XCAT_DATABASE /opt/xcat/share/xcat/tools/autotest/testcase/installation/pre_deploy_sn __GETNODEATTR($$SN,os)__ __GETNODEATTR($$SN,arch)__ diff --git a/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult b/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult index 69ef75fae..48efb039f 100644 --- a/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult +++ b/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult @@ -1,6 +1,6 @@ start:set_xcatmaster_in_sn_pool_tftp_mount_mode_checkresult description: this case is to check the configuration files after nodeset for case set_xcatmaster_in_sn_pool_tftp_mount_mode -label:others,invoke_provision,sn_pool +label:others,invoke_provision,snpool #create a test compute node, set it's xcatmaster as SN, set it's service node as SN and CN cmd:mkdef -t node -o compute1 groups=compute ip=10.0.0.199 mac=4a:c8:f7:de:d0:09 profile=compute os=__GETNODEATTR($$CN,os)__ arch=__GETNODEATTR($$CN,arch)__ netboot=__GETNODEATTR($$CN,netboot)__ diff --git a/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_sync_mode b/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_sync_mode index a09faa03a..9131e8860 100644 --- a/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_sync_mode +++ b/xCAT-test/autotest/testcase/snpool/set_xcatmaster_in_sn_pool_tftp_sync_mode @@ -1,6 +1,6 @@ start:set_xcatmaster_in_sn_pool_tftp_sync_mode description: this case is to test when compute nodes' xcatmaster is set in service node pool environment,compute node's provision files are correctly set after nodeset. -label:others,invoke_provision,sn_pool +label:others,invoke_provision,snpool cmd:fdisk -l cmd:df -T #cmd:XCAT_DATABASE=$$XCAT_DATABASE /opt/xcat/share/xcat/tools/autotest/testcase/installation/pre_deploy_sn __GETNODEATTR($$SN,os)__ __GETNODEATTR($$SN,arch)__ diff --git a/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_mount_mode b/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_mount_mode index 0441e3e9c..06e0cd23a 100644 --- a/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_mount_mode +++ b/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_mount_mode @@ -1,6 +1,6 @@ start:setup_sn_pool_tftp_mount_mode description: this case is to test when sharedtftp=1 and installloc=/install are set on mn, after all service nodes are installed, /tftpboot and /install directory on all service nodes are mounted.Since test framework only support 1 sn and 1 cn parameter. This case will install CN as another service node. -label:others,invoke_provision,sn_pool +label:others,invoke_provision,snpool cmd:fdisk -l cmd:df -T #cmd:XCAT_DATABASE=$$XCAT_DATABASE /opt/xcat/share/xcat/tools/autotest/testcase/installation/pre_deploy_sn __GETNODEATTR($$SN,os)__ __GETNODEATTR($$SN,arch)__ diff --git a/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_sync_mode b/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_sync_mode index 7030f3f79..12d07824d 100644 --- a/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_sync_mode +++ b/xCAT-test/autotest/testcase/snpool/setup_sn_pool_tftp_sync_mode @@ -1,6 +1,6 @@ start:setup_sn_pool_tftp_sync_mode description: this case is to test when sharedtftp=0 and installloc=/install are not set on mn, after all service nodes are installed, /tftpboot and /install directory on all service nodes are separated and need to be rsynced. Since test framework only support 1 sn and 1 cn parameter. This case will install CN as another service node. -label:others,invoke_provision,sn_pool +label:others,invoke_provision,snpool cmd:fdisk -l cmd:df -T #cmd:XCAT_DATABASE=$$XCAT_DATABASE /opt/xcat/share/xcat/tools/autotest/testcase/installation/pre_deploy_sn __GETNODEATTR($$SN,os)__ __GETNODEATTR($$SN,arch)__ diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.common b/xCAT-test/autotest/testcase/xcat_inventory/cases.common similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.common rename to xCAT-test/autotest/testcase/xcat_inventory/cases.common diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.credential b/xCAT-test/autotest/testcase/xcat_inventory/cases.credential similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.credential rename to xCAT-test/autotest/testcase/xcat_inventory/cases.credential diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.diff b/xCAT-test/autotest/testcase/xcat_inventory/cases.diff similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.diff rename to xCAT-test/autotest/testcase/xcat_inventory/cases.diff diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.environment b/xCAT-test/autotest/testcase/xcat_inventory/cases.environment similarity index 99% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.environment rename to xCAT-test/autotest/testcase/xcat_inventory/cases.environment index 2fd08a52a..31b91dfc1 100644 --- a/xCAT-test/autotest/testcase/xcat-inventory/cases.environment +++ b/xCAT-test/autotest/testcase/xcat_inventory/cases.environment @@ -1,7 +1,7 @@ start:import_osimage_with_environments_in_yaml description:this case is to verify if osimage import could support environment variables. os:Linux -label:others,xcat_inventory,invoke_provison +label:others,xcat_inventory,invoke_provision cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN check:rc==0 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.include b/xCAT-test/autotest/testcase/xcat_inventory/cases.include similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.include rename to xCAT-test/autotest/testcase/xcat_inventory/cases.include diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.network b/xCAT-test/autotest/testcase/xcat_inventory/cases.network similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.network rename to xCAT-test/autotest/testcase/xcat_inventory/cases.network diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.nics b/xCAT-test/autotest/testcase/xcat_inventory/cases.nics similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.nics rename to xCAT-test/autotest/testcase/xcat_inventory/cases.nics diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.node b/xCAT-test/autotest/testcase/xcat_inventory/cases.node similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.node rename to xCAT-test/autotest/testcase/xcat_inventory/cases.node diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage b/xCAT-test/autotest/testcase/xcat_inventory/cases.osimage similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.osimage rename to xCAT-test/autotest/testcase/xcat_inventory/cases.osimage diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir b/xCAT-test/autotest/testcase/xcat_inventory/cases.osimage.import_from_osimage_dir similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir rename to xCAT-test/autotest/testcase/xcat_inventory/cases.osimage.import_from_osimage_dir diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.validation b/xCAT-test/autotest/testcase/xcat_inventory/cases.osimage.validation similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.validation rename to xCAT-test/autotest/testcase/xcat_inventory/cases.osimage.validation diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.passwd b/xCAT-test/autotest/testcase/xcat_inventory/cases.passwd similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.passwd rename to xCAT-test/autotest/testcase/xcat_inventory/cases.passwd diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.route b/xCAT-test/autotest/testcase/xcat_inventory/cases.route similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.route rename to xCAT-test/autotest/testcase/xcat_inventory/cases.route diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.site b/xCAT-test/autotest/testcase/xcat_inventory/cases.site similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.site rename to xCAT-test/autotest/testcase/xcat_inventory/cases.site diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.site.validation b/xCAT-test/autotest/testcase/xcat_inventory/cases.site.validation similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/cases.site.validation rename to xCAT-test/autotest/testcase/xcat_inventory/cases.site.validation diff --git a/xCAT-test/autotest/testcase/xcat-inventory/diff/change_name.sh b/xCAT-test/autotest/testcase/xcat_inventory/diff/change_name.sh similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/diff/change_name.sh rename to xCAT-test/autotest/testcase/xcat_inventory/diff/change_name.sh diff --git a/xCAT-test/autotest/testcase/xcat-inventory/diff/diff_files.result b/xCAT-test/autotest/testcase/xcat_inventory/diff/diff_files.result similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/diff/diff_files.result rename to xCAT-test/autotest/testcase/xcat_inventory/diff/diff_files.result diff --git a/xCAT-test/autotest/testcase/xcat-inventory/diff/diff_source.result b/xCAT-test/autotest/testcase/xcat_inventory/diff/diff_source.result similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/diff/diff_source.result rename to xCAT-test/autotest/testcase/xcat_inventory/diff/diff_source.result diff --git a/xCAT-test/autotest/testcase/xcat-inventory/diff/xcat-inventory_diff_file1.json b/xCAT-test/autotest/testcase/xcat_inventory/diff/xcat-inventory_diff_file1.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/diff/xcat-inventory_diff_file1.json rename to xCAT-test/autotest/testcase/xcat_inventory/diff/xcat-inventory_diff_file1.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/diff/xcat-inventory_diff_file2.json b/xCAT-test/autotest/testcase/xcat_inventory/diff/xcat-inventory_diff_file2.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/diff/xcat-inventory_diff_file2.json rename to xCAT-test/autotest/testcase/xcat_inventory/diff/xcat-inventory_diff_file2.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/cluster.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/cluster.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/cluster.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/cluster.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/definition.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/definition.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/definition.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/definition.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/exlist b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/exlist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/exlist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/exlist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/otherpkglist b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/otherpkglist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/otherpkglist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/otherpkglist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/partitionfile b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/partitionfile similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/partitionfile rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/partitionfile diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/postinstall b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/postinstall similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/postinstall rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/postinstall diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/synclists b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/synclists similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/synclists rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/synclists diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/definition.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/definition.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/definition.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/definition.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/test_myimage2.stanza b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/test_myimage2.stanza similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/test_myimage2.stanza rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/test_myimage2.stanza diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/exlist b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/exlist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/exlist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/exlist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/otherpkglist b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/otherpkglist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/otherpkglist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/otherpkglist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/partitionfile b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/partitionfile similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/partitionfile rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/partitionfile diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/postinstall b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/postinstall similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/postinstall rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/postinstall diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/synclists b/xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/synclists similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/synclists rename to xCAT-test/autotest/testcase/xcat_inventory/templates/cluster_invdir/osimage/test_myimage2/tmp/test_myimage2/synclists diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/diff/change_name.sh b/xCAT-test/autotest/testcase/xcat_inventory/templates/diff/change_name.sh similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/diff/change_name.sh rename to xCAT-test/autotest/testcase/xcat_inventory/templates/diff/change_name.sh diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/diff/diff.result b/xCAT-test/autotest/testcase/xcat_inventory/templates/diff/diff.result similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/diff/diff.result rename to xCAT-test/autotest/testcase/xcat_inventory/templates/diff/diff.result diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/diff/diff_files.result b/xCAT-test/autotest/testcase/xcat_inventory/templates/diff/diff_files.result similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/diff/diff_files.result rename to xCAT-test/autotest/testcase/xcat_inventory/templates/diff/diff_files.result diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/diff/diff_source.result b/xCAT-test/autotest/testcase/xcat_inventory/templates/diff/diff_source.result similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/diff/diff_source.result rename to xCAT-test/autotest/testcase/xcat_inventory/templates/diff/diff_source.result diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/diff/xcat-inventory_diff_file1.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/diff/xcat-inventory_diff_file1.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/diff/xcat-inventory_diff_file1.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/diff/xcat-inventory_diff_file1.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/diff/xcat-inventory_diff_file2.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/diff/xcat-inventory_diff_file2.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/diff/xcat-inventory_diff_file2.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/diff/xcat-inventory_diff_file2.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/otherpkglist/test1.otherpkglist b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/otherpkglist/test1.otherpkglist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/otherpkglist/test1.otherpkglist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/otherpkglist/test1.otherpkglist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/otherpkglist/test2.otherpkglist b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/otherpkglist/test2.otherpkglist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/otherpkglist/test2.otherpkglist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/otherpkglist/test2.otherpkglist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/pkglist/test1.pkglist b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/pkglist/test1.pkglist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/pkglist/test1.pkglist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/pkglist/test1.pkglist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/pkglist/test2.pkglist b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/pkglist/test2.pkglist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/pkglist/test2.pkglist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/pkglist/test2.pkglist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/postinstall/test1.postinstall similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/postinstall/test1.postinstall diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test2.postinstall b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/postinstall/test2.postinstall similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test2.postinstall rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/postinstall/test2.postinstall diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/syncfiles/synclist b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/syncfiles/synclist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/syncfiles/synclist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/gitrepo/syncfiles/synclist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/conserver-xcat-8.2.1-1.ppc64le.rpm b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/conserver-xcat-8.2.1-1.ppc64le.rpm similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/conserver-xcat-8.2.1-1.ppc64le.rpm rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/conserver-xcat-8.2.1-1.ppc64le.rpm diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/perl-Net-Telnet-3.03-19.el7.noarch.rpm b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/perl-Net-Telnet-3.03-19.el7.noarch.rpm similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/perl-Net-Telnet-3.03-19.el7.noarch.rpm rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/perl-Net-Telnet-3.03-19.el7.noarch.rpm diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/2f8132e926de0ada34da23f1a63713a9e6761fa5a5171ab309a2aef1d4f6efe3-filelists.xml.gz b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/2f8132e926de0ada34da23f1a63713a9e6761fa5a5171ab309a2aef1d4f6efe3-filelists.xml.gz similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/2f8132e926de0ada34da23f1a63713a9e6761fa5a5171ab309a2aef1d4f6efe3-filelists.xml.gz rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/2f8132e926de0ada34da23f1a63713a9e6761fa5a5171ab309a2aef1d4f6efe3-filelists.xml.gz diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/771b092d010ec878233b66dc1dba2ab81b614c5a9ea473f9f5f6da76997276c1-other.sqlite.bz2 b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/771b092d010ec878233b66dc1dba2ab81b614c5a9ea473f9f5f6da76997276c1-other.sqlite.bz2 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/771b092d010ec878233b66dc1dba2ab81b614c5a9ea473f9f5f6da76997276c1-other.sqlite.bz2 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/771b092d010ec878233b66dc1dba2ab81b614c5a9ea473f9f5f6da76997276c1-other.sqlite.bz2 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/8a1f4155ca9e8784d0a41e5a9b5b715af7f096945143e6be4f69489eb59a4aa8-primary.xml.gz b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/8a1f4155ca9e8784d0a41e5a9b5b715af7f096945143e6be4f69489eb59a4aa8-primary.xml.gz similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/8a1f4155ca9e8784d0a41e5a9b5b715af7f096945143e6be4f69489eb59a4aa8-primary.xml.gz rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/8a1f4155ca9e8784d0a41e5a9b5b715af7f096945143e6be4f69489eb59a4aa8-primary.xml.gz diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/98590d4faf7b8f997493a85d6fcbb6aa2ede7a9b30078ecc06d5710c0520dc56-primary.sqlite.bz2 b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/98590d4faf7b8f997493a85d6fcbb6aa2ede7a9b30078ecc06d5710c0520dc56-primary.sqlite.bz2 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/98590d4faf7b8f997493a85d6fcbb6aa2ede7a9b30078ecc06d5710c0520dc56-primary.sqlite.bz2 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/98590d4faf7b8f997493a85d6fcbb6aa2ede7a9b30078ecc06d5710c0520dc56-primary.sqlite.bz2 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/bd36e0c2e540280fd45799e9f755a72f63b394ce110227f7d48f999a86d90ede-other.xml.gz b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/bd36e0c2e540280fd45799e9f755a72f63b394ce110227f7d48f999a86d90ede-other.xml.gz similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/bd36e0c2e540280fd45799e9f755a72f63b394ce110227f7d48f999a86d90ede-other.xml.gz rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/bd36e0c2e540280fd45799e9f755a72f63b394ce110227f7d48f999a86d90ede-other.xml.gz diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/e3cf2fc42c62b0328effe9e44a4ab1296905ae92f845dd773b0550c7f191e3f8-filelists.sqlite.bz2 b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/e3cf2fc42c62b0328effe9e44a4ab1296905ae92f845dd773b0550c7f191e3f8-filelists.sqlite.bz2 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/e3cf2fc42c62b0328effe9e44a4ab1296905ae92f845dd773b0550c7f191e3f8-filelists.sqlite.bz2 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/e3cf2fc42c62b0328effe9e44a4ab1296905ae92f845dd773b0550c7f191e3f8-filelists.sqlite.bz2 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/repomd.xml b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/repomd.xml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/otherpkgdir/repodata/repomd.xml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/otherpkgdir/repodata/repomd.xml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/dhcp-4.2.5-68.el7.ppc64le.rpm b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/dhcp-4.2.5-68.el7.ppc64le.rpm similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/dhcp-4.2.5-68.el7.ppc64le.rpm rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/dhcp-4.2.5-68.el7.ppc64le.rpm diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/2a9abe54b23615850e70c41456bd49ff3994eae972ea2347d46b43de8cf48931-filelists.sqlite.bz2 b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/2a9abe54b23615850e70c41456bd49ff3994eae972ea2347d46b43de8cf48931-filelists.sqlite.bz2 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/2a9abe54b23615850e70c41456bd49ff3994eae972ea2347d46b43de8cf48931-filelists.sqlite.bz2 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/2a9abe54b23615850e70c41456bd49ff3994eae972ea2347d46b43de8cf48931-filelists.sqlite.bz2 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/4160c0db6523d465541345245e8463eacd03e5f823e5ba319d0ddbed4b2a2397-filelists.xml.gz b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/4160c0db6523d465541345245e8463eacd03e5f823e5ba319d0ddbed4b2a2397-filelists.xml.gz similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/4160c0db6523d465541345245e8463eacd03e5f823e5ba319d0ddbed4b2a2397-filelists.xml.gz rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/4160c0db6523d465541345245e8463eacd03e5f823e5ba319d0ddbed4b2a2397-filelists.xml.gz diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/75c2df3e4d5ca66a0c105562f4d0cea1c0c1203bb1f59a73e373b5cebcf03d65-primary.xml.gz b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/75c2df3e4d5ca66a0c105562f4d0cea1c0c1203bb1f59a73e373b5cebcf03d65-primary.xml.gz similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/75c2df3e4d5ca66a0c105562f4d0cea1c0c1203bb1f59a73e373b5cebcf03d65-primary.xml.gz rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/75c2df3e4d5ca66a0c105562f4d0cea1c0c1203bb1f59a73e373b5cebcf03d65-primary.xml.gz diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/811daeb0fde54384fec22af72ecdcdd2d4d8060ad5227802c0c02bb73dd72ce1-other.sqlite.bz2 b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/811daeb0fde54384fec22af72ecdcdd2d4d8060ad5227802c0c02bb73dd72ce1-other.sqlite.bz2 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/811daeb0fde54384fec22af72ecdcdd2d4d8060ad5227802c0c02bb73dd72ce1-other.sqlite.bz2 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/811daeb0fde54384fec22af72ecdcdd2d4d8060ad5227802c0c02bb73dd72ce1-other.sqlite.bz2 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/9fcfad63d06bdaba2be3507fbb1cd080db5f7423ec46cf25221fb1193e35611b-other.xml.gz b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/9fcfad63d06bdaba2be3507fbb1cd080db5f7423ec46cf25221fb1193e35611b-other.xml.gz similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/9fcfad63d06bdaba2be3507fbb1cd080db5f7423ec46cf25221fb1193e35611b-other.xml.gz rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/9fcfad63d06bdaba2be3507fbb1cd080db5f7423ec46cf25221fb1193e35611b-other.xml.gz diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/e4f965fd5f4b914c4e89d54b8784394b7760e051dd788e791d259673af365373-primary.sqlite.bz2 b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/e4f965fd5f4b914c4e89d54b8784394b7760e051dd788e791d259673af365373-primary.sqlite.bz2 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/e4f965fd5f4b914c4e89d54b8784394b7760e051dd788e791d259673af365373-primary.sqlite.bz2 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/e4f965fd5f4b914c4e89d54b8784394b7760e051dd788e791d259673af365373-primary.sqlite.bz2 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/repomd.xml b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/repomd.xml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/repodata/repomd.xml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/repodata/repomd.xml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/tftp-5.2-22.el7.ppc64le.rpm b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/tftp-5.2-22.el7.ppc64le.rpm similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/swdir/pkgdir/tftp-5.2-22.el7.ppc64le.rpm rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/swdir/pkgdir/tftp-5.2-22.el7.ppc64le.rpm diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.stanza b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/test.environments.osimage.stanza similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.stanza rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/test.environments.osimage.stanza diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/test.environments.osimage.update.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/test.environments.osimage.update.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/test.environments.osimage.update.yaml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/test.environments.osimage.update.yaml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/environment/test.environments.osimage.yaml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/environment/test.environments.osimage.yaml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/exlist b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/exlist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/exlist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/exlist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file1.1 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file1.1 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file1.1 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file1.1 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file2.1 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file2.1 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file2.1 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file2.1 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file2.2 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file2.2 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file2.2 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file2.2 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file2.3 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file2.3 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file2.3 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file2.3 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file3.1 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file3.1 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file3.1 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file3.1 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file3.2 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file3.2 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file3.2 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file3.2 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file3.3 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file3.3 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file3.3 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file3.3 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file4.1 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file4.1 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file4.1 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file4.1 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file4.2 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file4.2 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file4.2 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file4.2 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file4.3 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file4.3 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file4.3 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file4.3 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file5 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file5 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file5 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file5 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file6 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file6 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file6 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file6 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file7 b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file7 similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/file7 rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/file7 diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/otherpkglist b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/otherpkglist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/otherpkglist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/otherpkglist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/partitionfile b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/partitionfile similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/partitionfile rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/partitionfile diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/pkglist b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/pkglist similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/pkglist rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/pkglist diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/postinstall b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/postinstall similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/postinstall rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/postinstall diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/synclists b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/synclists similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/synclists rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/synclists diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/template.tmpl b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/template.tmpl similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/template.tmpl rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/template.tmpl diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/test_osimage.stanza b/xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/test_osimage.stanza similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/imagedata/test_osimage/test_osimage.stanza rename to xCAT-test/autotest/testcase/xcat_inventory/templates/imagedata/test_osimage/test_osimage.stanza diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/network.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/network.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/network.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/network.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/network.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/network.yaml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/network.yaml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/network.yaml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/nics.csv b/xCAT-test/autotest/testcase/xcat_inventory/templates/nics.csv similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/nics.csv rename to xCAT-test/autotest/testcase/xcat_inventory/templates/nics.csv diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/nics.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/nics.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/nics.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/nics.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/nics.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/nics.yaml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/nics.yaml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/nics.yaml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/node.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/node.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/node.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/node.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/node.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/node.yaml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/node.yaml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/node.yaml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/osimage.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/osimage.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/osimage.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/osimage.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/osimage.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/osimage.yaml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/osimage.yaml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/osimage.yaml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/passwd.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/passwd.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/passwd.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/passwd.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/passwd.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/passwd.yaml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/passwd.yaml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/passwd.yaml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/route.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/route.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/route.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/route.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/route.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/route.yaml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/route.yaml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/route.yaml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/site.json b/xCAT-test/autotest/testcase/xcat_inventory/templates/site.json similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/site.json rename to xCAT-test/autotest/testcase/xcat_inventory/templates/site.json diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/site.yaml b/xCAT-test/autotest/testcase/xcat_inventory/templates/site.yaml similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/templates/site.yaml rename to xCAT-test/autotest/testcase/xcat_inventory/templates/site.yaml diff --git a/xCAT-test/autotest/testcase/xcat-inventory/validatehelper b/xCAT-test/autotest/testcase/xcat_inventory/validatehelper similarity index 100% rename from xCAT-test/autotest/testcase/xcat-inventory/validatehelper rename to xCAT-test/autotest/testcase/xcat_inventory/validatehelper diff --git a/xCAT-test/autotest/testcase/xcatdebugmode/rhels_xcatdebugmode_diskful b/xCAT-test/autotest/testcase/xcatdebugmode/rhels_xcatdebugmode_diskful index a73c52cf5..603d19fa0 100644 --- a/xCAT-test/autotest/testcase/xcatdebugmode/rhels_xcatdebugmode_diskful +++ b/xCAT-test/autotest/testcase/xcatdebugmode/rhels_xcatdebugmode_diskful @@ -1,7 +1,7 @@ start:reg_set_xcatdebugmode_off_rhels_diskful_flat os:linux description:site.xcatdebugmode value is 0, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN check:rc==0 @@ -58,7 +58,7 @@ end start:reg_set_xcatdebugmode_value_one_rhels_diskful_flat os:linux description:site.xcatdebugmode value is 1, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:echo " " > /var/log/xcat/computes.log check:rc==0 @@ -146,7 +146,7 @@ end start:reg_set_xcatdebugmode_value_two_rhels_diskful_flat os:linux description:site.xcatdebugmode value is 2, , the following logs will be shown and ssh is supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:echo " " > /var/log/xcat/computes.log check:rc==0 @@ -234,7 +234,7 @@ end start:set_xcatdebugmode_off_rhels_diskful_flat_p8_le os:Linux description:site.xcatdebugmode value is 0, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:chtab key=xcatdebugmode site.value="0" check:rc==0 @@ -287,7 +287,7 @@ end start:set_xcatdebugmode_value_one_rhels_diskful_flat_p8_le os:Linux description:site.xcatdebugmode value is 1, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:echo " " > /var/log/xcat/computes.log check:rc==0 @@ -377,7 +377,7 @@ end start:set_xcatdebugmode_value_two_rhels_diskful_flat_p8_le os:Linux description:site.xcatdebugmode value is 2, the following logs will be shown and ssh is supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:echo " " > /var/log/xcat/computes.log check:rc==0 diff --git a/xCAT-test/autotest/testcase/xcatdebugmode/sles_xcatdebugmode_diskful b/xCAT-test/autotest/testcase/xcatdebugmode/sles_xcatdebugmode_diskful index 71eb112e9..f8033badc 100644 --- a/xCAT-test/autotest/testcase/xcatdebugmode/sles_xcatdebugmode_diskful +++ b/xCAT-test/autotest/testcase/xcatdebugmode/sles_xcatdebugmode_diskful @@ -1,7 +1,7 @@ start:reg_set_xcatdebugmode_off_sles_diskful_flat os:linux description:site.xcatdebugmode value is 0, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN @@ -68,7 +68,7 @@ end start:reg_set_xcatdebugmode_value_one_sles_diskful_flat os:linux description:site.xcatdebugmode value is 1, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:echo " " > /var/log/xcat/computes.log check:rc==0 @@ -162,7 +162,7 @@ end start:set_xcatdebugmode_off_sles_diskful_flat_p8_le os:linux description:site.xcatdebugmode value is 0, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:chtab key=xcatdebugmode site.value="0" check:rc==0 @@ -224,7 +224,7 @@ end start:set_xcatdebugmode_value_one_sles_diskful_flat_p8_le os:linux description:site.xcatdebugmode value is 1, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:echo " " > /var/log/xcat/computes.log check:rc==0 diff --git a/xCAT-test/autotest/testcase/xcatdebugmode/ubuntu_xcatdebugmode_diskful b/xCAT-test/autotest/testcase/xcatdebugmode/ubuntu_xcatdebugmode_diskful index e55e7b381..70d8cc3a9 100644 --- a/xCAT-test/autotest/testcase/xcatdebugmode/ubuntu_xcatdebugmode_diskful +++ b/xCAT-test/autotest/testcase/xcatdebugmode/ubuntu_xcatdebugmode_diskful @@ -1,7 +1,7 @@ start:set_xcatdebugmode_off_ubuntule_diskful os:linux description:site.xcatdebugmode value is 0, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:chtab key=xcatdebugmode site.value="0" check:rc==0 cmd:copycds $$ISO @@ -45,7 +45,7 @@ end start:set_xcatdebugmode_off_ubuntux_vm_diskful os:linux description:site.xcatdebugmode value is 0, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:makedns -n check:rc==0 cmd:sleep 60 @@ -88,7 +88,7 @@ end start:set_xcatdebugmode_value_one_ubuntule_diskful os:linux description:site.xcatdebugmode value is 1, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:echo " " > /var/log/xcat/computes.log check:rc==0 cmd:chtab key=xcatdebugmode site.value="1" @@ -160,7 +160,7 @@ end start:set_xcatdebugmode_value_one_ubuntux_vm_diskful os:linux description:site.xcatdebugmode value is 1, the following logs will be shown and ssh is not supported. -label:flat_cn_diskful,invoke_provison,xcatdebugmode +label:flat_cn_diskful,invoke_provision,xcatdebugmode cmd:echo " " > /var/log/xcat/computes.log check:rc==0