diff --git a/xCAT-test/autotest/bundle/le_rhels_cmd.bundle b/xCAT-test/autotest/bundle/le_rhels_cmd.bundle
index 742b6066c..dce4dad64 100644
--- a/xCAT-test/autotest/bundle/le_rhels_cmd.bundle
+++ b/xCAT-test/autotest/bundle/le_rhels_cmd.bundle
@@ -85,7 +85,6 @@ nodels_noderange_table
 nodels_tablevalue
 nodels_tablevalue_tablecolumn
 nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
 nodels_h
 nodels_v
 xcatstanzafile_colon
diff --git a/xCAT-test/autotest/bundle/le_sles_cmd.bundle b/xCAT-test/autotest/bundle/le_sles_cmd.bundle
index ee0f0e23e..f6173e756 100644
--- a/xCAT-test/autotest/bundle/le_sles_cmd.bundle
+++ b/xCAT-test/autotest/bundle/le_sles_cmd.bundle
@@ -87,7 +87,6 @@ nodels_noderange_table
 nodels_tablevalue
 nodels_tablevalue_tablecolumn
 nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
 nodels_h
 nodels_v
 xcatstanzafile_colon
diff --git a/xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle b/xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle
index 452f1e480..80fccf734 100644
--- a/xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle
+++ b/xCAT-test/autotest/bundle/le_ubuntu_cmd.bundle
@@ -84,7 +84,6 @@ nodels_noderange_table
 nodels_tablevalue
 nodels_tablevalue_tablecolumn
 nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
 nodels_h
 nodels_v
 xcatstanzafile_colon
@@ -198,7 +197,6 @@ lskit_C
 lskitcomp_v
 lskitcomp_h
 lskitcomp_C
-lskitcomp_C
 lskitcomp_S
 lskitdeployparam_v
 lskitdeployparam_h
diff --git a/xCAT-test/autotest/bundle/p_rhels_cmd.bundle b/xCAT-test/autotest/bundle/p_rhels_cmd.bundle
index 32095c6cc..886f512ba 100644
--- a/xCAT-test/autotest/bundle/p_rhels_cmd.bundle
+++ b/xCAT-test/autotest/bundle/p_rhels_cmd.bundle
@@ -120,7 +120,6 @@ nodels_noderange_table
 nodels_tablevalue
 nodels_tablevalue_tablecolumn
 nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
 nodels_h
 nodels_v
 xcatstanzafile_normal
diff --git a/xCAT-test/autotest/bundle/p_sles_cmd.bundle b/xCAT-test/autotest/bundle/p_sles_cmd.bundle
index 00d550171..3e9509dcb 100644
--- a/xCAT-test/autotest/bundle/p_sles_cmd.bundle
+++ b/xCAT-test/autotest/bundle/p_sles_cmd.bundle
@@ -102,7 +102,6 @@ nodels_noderange_table
 nodels_tablevalue
 nodels_tablevalue_tablecolumn
 nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
 nodels_h
 nodels_v
 xcatstanzafile_normal
diff --git a/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle
index 7c2237687..ee6a786f9 100644
--- a/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle
@@ -1,306 +1,305 @@
-reg_linux_diskfull_installation_flat
-updatenode_h
-updatenode_v
-updatenode_diskful_syncfiles
-updatenode_diskful_syncfiles_rename
-updatenode_diskful_syncfiles_dir
-updatenode_diskful_syncfiles_multi_files
-updatenode_syncfile_EXECUTE
-updatenode_syncfile_EXECUTEALWAYS
-updatenode_syncfile_APPEND
-updatenode_syncfile_MERGE
-updatenode_P_script1
-updatenode_P_script2
-updatenode_f_incompatible_flags
-updatenode_k_incompatible_flags
-updatenode_diskful_syncfiles_P_script1
-updatenode_script3
-updatenode_P_script1_script2
-updatenode_without_flag
-chdef_null
-chdef_t_node
-chdef_t_network
-chdef_p
-chdef_m
-chdef_z
-chdef_group
-chdef_group_p
-chdef_dynamic_group
-chdef_multiple_keys
-chdef_n
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-getmacs_noderange
-getmacs_d
-getmacs_f_D
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rinv_bus
-rinv_config
-rinv_serial
-rinv_model
-rinv_firm
-rinv_all
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_off
-rpower_stat
-rpower_boot
-rpower_on
-rpower_reset
-rpower_noderange
-rpower_noderange_nodeps
-rpower_err_noderange
-rscan_noderange
-rscan_x
-rscan_z
-rscan_w
-rscan_x_w
-rscan_z_w
-rvitals_lcds
-rvitals_all
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_p_auditlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makehosts_h
-makehosts_help
-makehosts_null
-makehosts_l
-makehosts_d
-makehosts_n
-makehosts_n_noderange
-xdcp_src_dst
-makedns_h
-makedns_d_node
-makedns_n
-makedns
-noderange_individual_node
-noderange_individual_grp
-noderange_node01-node10
-noderange_group1-group3
-noderange_10-20
-noderange_XCAT_NODE_PREFIX
-noderange_XCAT_NODE_SUFFIX
-noderange_exclusion
-noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
-confignics_s
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-makentp_v
-makentp_h
-makentp_V
-makentp
-makentp_a
-nodeset_check_warninginfo
-runcmdinstaller_h
-runcmdinstaller_command
-get_xcat_postscripts_loginfo
-updatenode_postscripts_loginfo
-bmcdiscover_h
-bmcdiscover_nmap_range
-bmcdiscover_v
-bmcdiscover_check_paswd
-bmcdiscover_check_passwd_wrong
-bmcdiscover_get_ipsource
-bmcdiscover_range_w
-bmcdiscover_range_z
-xcatd_start
-xcatd_stop
-xcatd_restart
-run_command_with_XCATBYPASS
-disable_root_permission_in_policy_table
-assign_certain_command_permission
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
-SN_setup_case
-reg_linux_diskfull_installation_hierarchy
-reg_linux_diskless_installation_hierarchy
-reg_linux_statelite_installation_hierarchy_by_ramdisk
-reg_linux_statelite_installation_hierarchy_by_nfs
-redhat_migration1
-redhat_migration2
-clean_up_env
+reg_linux_diskfull_installation_flat
+updatenode_h
+updatenode_v
+updatenode_diskful_syncfiles
+updatenode_diskful_syncfiles_rename
+updatenode_diskful_syncfiles_dir
+updatenode_diskful_syncfiles_multi_files
+updatenode_syncfile_EXECUTE
+updatenode_syncfile_EXECUTEALWAYS
+updatenode_syncfile_APPEND
+updatenode_syncfile_MERGE
+updatenode_P_script1
+updatenode_P_script2
+updatenode_f_incompatible_flags
+updatenode_k_incompatible_flags
+updatenode_diskful_syncfiles_P_script1
+updatenode_script3
+updatenode_P_script1_script2
+updatenode_without_flag
+chdef_null
+chdef_t_node
+chdef_t_network
+chdef_p
+chdef_m
+chdef_z
+chdef_group
+chdef_group_p
+chdef_dynamic_group
+chdef_multiple_keys
+chdef_n
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+getmacs_noderange
+getmacs_d
+getmacs_f_D
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_bus
+rinv_config
+rinv_serial
+rinv_model
+rinv_firm
+rinv_all
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_off
+rpower_stat
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rscan_noderange
+rscan_x
+rscan_z
+rscan_w
+rscan_x_w
+rscan_z_w
+rvitals_lcds
+rvitals_all
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_p_auditlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makehosts_h
+makehosts_help
+makehosts_null
+makehosts_l
+makehosts_d
+makehosts_n
+makehosts_n_noderange
+xdcp_src_dst
+makedns_h
+makedns_d_node
+makedns_n
+makedns
+noderange_individual_node
+noderange_individual_grp
+noderange_node01-node10
+noderange_group1-group3
+noderange_10-20
+noderange_XCAT_NODE_PREFIX
+noderange_XCAT_NODE_SUFFIX
+noderange_exclusion
+noderange_group_intersection
+confignics_config_one_port_single_value
+confignics_config_multiple_ports_single_value
+confignics_config_multiple_ports_multiple_value
+confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
+confignics_config_multiple_port_withnicaliases_multiple_value
+confignics_disable_set_to_yes
+confignics_disable_set_to_1
+confignics_s
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+makentp_v
+makentp_h
+makentp_V
+makentp
+makentp_a
+nodeset_check_warninginfo
+runcmdinstaller_h
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
+updatenode_postscripts_loginfo
+bmcdiscover_h
+bmcdiscover_nmap_range
+bmcdiscover_v
+bmcdiscover_check_paswd
+bmcdiscover_check_passwd_wrong
+bmcdiscover_get_ipsource
+bmcdiscover_range_w
+bmcdiscover_range_z
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+redhat_migration1
+redhat_migration2
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle b/xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle
index 3fbc91c8b..01a401041 100644
--- a/xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.7_x86_64.bundle
@@ -1,209 +1,208 @@
-reg_linux_diskfull_installation_flat
-makehosts_h
-makehosts_help
-makehosts_n
-makehosts_n_noderange
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_noderange
-nodestat_err_node
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_n
-makedns
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_i_linux
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_check_warninginfo
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
-SN_setup_case
-reg_linux_diskfull_installation_hierarchy
-reg_linux_diskless_installation_hierarchy
-reg_linux_statelite_installation_hierarchy_by_ramdisk
-reg_linux_statelite_installation_hierarchy_by_nfs
-redhat_migration1
-redhat_migration2
-clean_up_env
+reg_linux_diskfull_installation_flat
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_check_warninginfo
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+redhat_migration1
+redhat_migration2
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle
index 9d4e27652..d75468017 100644
--- a/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle
@@ -1,304 +1,303 @@
-reg_linux_diskfull_installation_flat
-updatenode_h
-updatenode_v
-updatenode_diskful_syncfiles
-updatenode_diskful_syncfiles_rename
-updatenode_diskful_syncfiles_dir
-updatenode_diskful_syncfiles_multi_files
-updatenode_syncfile_EXECUTE
-updatenode_syncfile_EXECUTEALWAYS
-updatenode_syncfile_APPEND
-updatenode_syncfile_MERGE
-updatenode_P_script1
-updatenode_P_script2
-updatenode_f_incompatible_flags
-updatenode_k_incompatible_flags
-updatenode_diskful_syncfiles_P_script1
-updatenode_script3
-updatenode_P_script1_script2
-updatenode_without_flag
-chdef_null
-chdef_t_node
-chdef_t_network
-chdef_p
-chdef_m
-chdef_z
-chdef_group
-chdef_group_p
-chdef_dynamic_group
-chdef_multiple_keys
-chdef_n
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-getmacs_noderange
-getmacs_d
-getmacs_f_D
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rinv_bus
-rinv_config
-rinv_serial
-rinv_model
-rinv_firm
-rinv_all
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_off
-rpower_stat
-rpower_boot
-rpower_on
-rpower_reset
-rpower_noderange
-rpower_noderange_nodeps
-rpower_err_noderange
-rscan_noderange
-rscan_x
-rscan_z
-rscan_w
-rscan_x_w
-rscan_z_w
-rvitals_lcds
-rvitals_all
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_p_auditlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makehosts_h
-makehosts_help
-makehosts_null
-makehosts_l
-makehosts_d
-makehosts_n
-makehosts_n_noderange
-xdcp_src_dst
-makedns_h
-makedns_d_node
-makedns_n
-makedns
-noderange_individual_node
-noderange_individual_grp
-noderange_node01-node10
-noderange_group1-group3
-noderange_10-20
-noderange_XCAT_NODE_PREFIX
-noderange_XCAT_NODE_SUFFIX
-noderange_exclusion
-noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
-confignics_s
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-makentp_v
-makentp_h
-makentp_V
-makentp
-makentp_a
-nodeset_check_warninginfo
-runcmdinstaller_h
-runcmdinstaller_command
-get_xcat_postscripts_loginfo
-updatenode_postscripts_loginfo
-bmcdiscover_h
-bmcdiscover_nmap_range
-bmcdiscover_v
-bmcdiscover_check_paswd
-bmcdiscover_check_passwd_wrong
-bmcdiscover_get_ipsource
-bmcdiscover_range_w
-bmcdiscover_range_z
-xcatd_start
-xcatd_stop
-xcatd_restart
-run_command_with_XCATBYPASS
-disable_root_permission_in_policy_table
-assign_certain_command_permission
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
-SN_setup_case
-reg_linux_diskfull_installation_hierarchy
-reg_linux_diskless_installation_hierarchy
-reg_linux_statelite_installation_hierarchy_by_ramdisk
-reg_linux_statelite_installation_hierarchy_by_nfs
-clean_up_env
+reg_linux_diskfull_installation_flat
+updatenode_h
+updatenode_v
+updatenode_diskful_syncfiles
+updatenode_diskful_syncfiles_rename
+updatenode_diskful_syncfiles_dir
+updatenode_diskful_syncfiles_multi_files
+updatenode_syncfile_EXECUTE
+updatenode_syncfile_EXECUTEALWAYS
+updatenode_syncfile_APPEND
+updatenode_syncfile_MERGE
+updatenode_P_script1
+updatenode_P_script2
+updatenode_f_incompatible_flags
+updatenode_k_incompatible_flags
+updatenode_diskful_syncfiles_P_script1
+updatenode_script3
+updatenode_P_script1_script2
+updatenode_without_flag
+chdef_null
+chdef_t_node
+chdef_t_network
+chdef_p
+chdef_m
+chdef_z
+chdef_group
+chdef_group_p
+chdef_dynamic_group
+chdef_multiple_keys
+chdef_n
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+getmacs_noderange
+getmacs_d
+getmacs_f_D
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_bus
+rinv_config
+rinv_serial
+rinv_model
+rinv_firm
+rinv_all
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_off
+rpower_stat
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rscan_noderange
+rscan_x
+rscan_z
+rscan_w
+rscan_x_w
+rscan_z_w
+rvitals_lcds
+rvitals_all
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_p_auditlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makehosts_h
+makehosts_help
+makehosts_null
+makehosts_l
+makehosts_d
+makehosts_n
+makehosts_n_noderange
+xdcp_src_dst
+makedns_h
+makedns_d_node
+makedns_n
+makedns
+noderange_individual_node
+noderange_individual_grp
+noderange_node01-node10
+noderange_group1-group3
+noderange_10-20
+noderange_XCAT_NODE_PREFIX
+noderange_XCAT_NODE_SUFFIX
+noderange_exclusion
+noderange_group_intersection
+confignics_config_one_port_single_value
+confignics_config_multiple_ports_single_value
+confignics_config_multiple_ports_multiple_value
+confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
+confignics_config_multiple_port_withnicaliases_multiple_value
+confignics_disable_set_to_yes
+confignics_disable_set_to_1
+confignics_s
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+makentp_v
+makentp_h
+makentp_V
+makentp
+makentp_a
+nodeset_check_warninginfo
+runcmdinstaller_h
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
+updatenode_postscripts_loginfo
+bmcdiscover_h
+bmcdiscover_nmap_range
+bmcdiscover_v
+bmcdiscover_check_paswd
+bmcdiscover_check_passwd_wrong
+bmcdiscover_get_ipsource
+bmcdiscover_range_w
+bmcdiscover_range_z
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle b/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle
index 61895f193..3e6821598 100644
--- a/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle
@@ -1,210 +1,209 @@
-reg_linux_diskfull_installation_flat
-makehosts_h
-makehosts_help
-makehosts_n
-makehosts_n_noderange
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_noderange
-nodestat_err_node
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_n
-makedns
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_i_linux
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-nodeset_check_warninginfo
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
-SN_setup_case
-reg_linux_diskfull_installation_hierarchy
-reg_linux_diskless_installation_hierarchy
-reg_linux_statelite_installation_hierarchy_by_ramdisk
-reg_linux_statelite_installation_hierarchy_by_nfs
-clean_up_env
+reg_linux_diskfull_installation_flat
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+nodeset_check_warninginfo
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle
index 7c2237687..ee6a786f9 100644
--- a/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle
@@ -1,306 +1,305 @@
-reg_linux_diskfull_installation_flat
-updatenode_h
-updatenode_v
-updatenode_diskful_syncfiles
-updatenode_diskful_syncfiles_rename
-updatenode_diskful_syncfiles_dir
-updatenode_diskful_syncfiles_multi_files
-updatenode_syncfile_EXECUTE
-updatenode_syncfile_EXECUTEALWAYS
-updatenode_syncfile_APPEND
-updatenode_syncfile_MERGE
-updatenode_P_script1
-updatenode_P_script2
-updatenode_f_incompatible_flags
-updatenode_k_incompatible_flags
-updatenode_diskful_syncfiles_P_script1
-updatenode_script3
-updatenode_P_script1_script2
-updatenode_without_flag
-chdef_null
-chdef_t_node
-chdef_t_network
-chdef_p
-chdef_m
-chdef_z
-chdef_group
-chdef_group_p
-chdef_dynamic_group
-chdef_multiple_keys
-chdef_n
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-getmacs_noderange
-getmacs_d
-getmacs_f_D
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rinv_bus
-rinv_config
-rinv_serial
-rinv_model
-rinv_firm
-rinv_all
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_off
-rpower_stat
-rpower_boot
-rpower_on
-rpower_reset
-rpower_noderange
-rpower_noderange_nodeps
-rpower_err_noderange
-rscan_noderange
-rscan_x
-rscan_z
-rscan_w
-rscan_x_w
-rscan_z_w
-rvitals_lcds
-rvitals_all
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_p_auditlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makehosts_h
-makehosts_help
-makehosts_null
-makehosts_l
-makehosts_d
-makehosts_n
-makehosts_n_noderange
-xdcp_src_dst
-makedns_h
-makedns_d_node
-makedns_n
-makedns
-noderange_individual_node
-noderange_individual_grp
-noderange_node01-node10
-noderange_group1-group3
-noderange_10-20
-noderange_XCAT_NODE_PREFIX
-noderange_XCAT_NODE_SUFFIX
-noderange_exclusion
-noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
-confignics_s
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-makentp_v
-makentp_h
-makentp_V
-makentp
-makentp_a
-nodeset_check_warninginfo
-runcmdinstaller_h
-runcmdinstaller_command
-get_xcat_postscripts_loginfo
-updatenode_postscripts_loginfo
-bmcdiscover_h
-bmcdiscover_nmap_range
-bmcdiscover_v
-bmcdiscover_check_paswd
-bmcdiscover_check_passwd_wrong
-bmcdiscover_get_ipsource
-bmcdiscover_range_w
-bmcdiscover_range_z
-xcatd_start
-xcatd_stop
-xcatd_restart
-run_command_with_XCATBYPASS
-disable_root_permission_in_policy_table
-assign_certain_command_permission
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
-SN_setup_case
-reg_linux_diskfull_installation_hierarchy
-reg_linux_diskless_installation_hierarchy
-reg_linux_statelite_installation_hierarchy_by_ramdisk
-reg_linux_statelite_installation_hierarchy_by_nfs
-redhat_migration1
-redhat_migration2
-clean_up_env
+reg_linux_diskfull_installation_flat
+updatenode_h
+updatenode_v
+updatenode_diskful_syncfiles
+updatenode_diskful_syncfiles_rename
+updatenode_diskful_syncfiles_dir
+updatenode_diskful_syncfiles_multi_files
+updatenode_syncfile_EXECUTE
+updatenode_syncfile_EXECUTEALWAYS
+updatenode_syncfile_APPEND
+updatenode_syncfile_MERGE
+updatenode_P_script1
+updatenode_P_script2
+updatenode_f_incompatible_flags
+updatenode_k_incompatible_flags
+updatenode_diskful_syncfiles_P_script1
+updatenode_script3
+updatenode_P_script1_script2
+updatenode_without_flag
+chdef_null
+chdef_t_node
+chdef_t_network
+chdef_p
+chdef_m
+chdef_z
+chdef_group
+chdef_group_p
+chdef_dynamic_group
+chdef_multiple_keys
+chdef_n
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+getmacs_noderange
+getmacs_d
+getmacs_f_D
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_bus
+rinv_config
+rinv_serial
+rinv_model
+rinv_firm
+rinv_all
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_off
+rpower_stat
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rscan_noderange
+rscan_x
+rscan_z
+rscan_w
+rscan_x_w
+rscan_z_w
+rvitals_lcds
+rvitals_all
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_p_auditlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makehosts_h
+makehosts_help
+makehosts_null
+makehosts_l
+makehosts_d
+makehosts_n
+makehosts_n_noderange
+xdcp_src_dst
+makedns_h
+makedns_d_node
+makedns_n
+makedns
+noderange_individual_node
+noderange_individual_grp
+noderange_node01-node10
+noderange_group1-group3
+noderange_10-20
+noderange_XCAT_NODE_PREFIX
+noderange_XCAT_NODE_SUFFIX
+noderange_exclusion
+noderange_group_intersection
+confignics_config_one_port_single_value
+confignics_config_multiple_ports_single_value
+confignics_config_multiple_ports_multiple_value
+confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
+confignics_config_multiple_port_withnicaliases_multiple_value
+confignics_disable_set_to_yes
+confignics_disable_set_to_1
+confignics_s
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+makentp_v
+makentp_h
+makentp_V
+makentp
+makentp_a
+nodeset_check_warninginfo
+runcmdinstaller_h
+runcmdinstaller_command
+get_xcat_postscripts_loginfo
+updatenode_postscripts_loginfo
+bmcdiscover_h
+bmcdiscover_nmap_range
+bmcdiscover_v
+bmcdiscover_check_paswd
+bmcdiscover_check_passwd_wrong
+bmcdiscover_get_ipsource
+bmcdiscover_range_w
+bmcdiscover_range_z
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+redhat_migration1
+redhat_migration2
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle
index 3eb078815..2b2bb560c 100644
--- a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle
@@ -1,200 +1,199 @@
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
-makehosts_h
-makehosts_help
-makehosts_n
-makehosts_n_noderange
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_n
-makedns
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_i_linux
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-redhat_migration1
-redhat_migration2
-clean_up_env
+Diskless_installation_flat_p8_le
+Full_installation_flat_p8_le
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+redhat_migration1
+redhat_migration2
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle b/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle
index 88c8dec6c..0025be4bd 100644
--- a/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle
@@ -1,212 +1,211 @@
-reg_linux_diskfull_installation_flat
-makehosts_h
-makehosts_help
-makehosts_n
-makehosts_n_noderange
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_noderange
-nodestat_err_node
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_n
-makedns
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_i_linux
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_check_warninginfo
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
-SN_setup_case
-reg_linux_diskfull_installation_hierarchy
-reg_linux_diskless_installation_hierarchy
-reg_linux_statelite_installation_hierarchy_by_ramdisk
-reg_linux_statelite_installation_hierarchy_by_nfs
-redhat_migration1
-redhat_migration2
-clean_up_env
+reg_linux_diskfull_installation_flat
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_check_warninginfo
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+redhat_migration1
+redhat_migration2
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
index 75ffb4dde..74d153401 100644
--- a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
@@ -1,270 +1,269 @@
-reg_linux_diskfull_installation_flat
-chdef_null
-chdef_t_node
-chdef_t_network
-chdef_p
-chdef_m
-chdef_z
-chdef_group
-chdef_group_p
-chdef_dynamic_group
-chdef_multiple_keys
-chdef_n
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-getmacs_noderange
-getmacs_d
-getmacs_f_D
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rinv_bus
-rinv_config
-rinv_serial
-rinv_model
-rinv_firm
-rinv_all
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_off
-rpower_stat
-rpower_boot
-rpower_on
-rpower_reset
-rpower_noderange
-rpower_noderange_nodeps
-rpower_err_noderange
-rscan_noderange
-rscan_x
-rscan_z
-rscan_w
-rscan_x_w
-rscan_z_w
-rvitals_lcds
-rvitals_all
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_p_auditlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makehosts_h
-makehosts_help
-makehosts_null
-makehosts_l
-makehosts_d
-makehosts_n
-makehosts_n_noderange
-xdcp_src_dst
-makedns_h
-makedns_d_node
-makedns_n
-makedns
-noderange_individual_node
-noderange_individual_grp
-noderange_node01-node10
-noderange_group1-group3
-noderange_10-20
-noderange_XCAT_NODE_PREFIX
-noderange_XCAT_NODE_SUFFIX
-noderange_exclusion
-noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
-confignics_s
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-makentp_v
-makentp_h
-makentp_V
-makentp
-makentp_a
-nodeset_check_warninginfo
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
-SN_setup_case
-reg_linux_diskfull_installation_hierarchy
-reg_linux_diskless_installation_hierarchy
-reg_linux_statelite_installation_hierarchy_by_ramdisk
-reg_linux_statelite_installation_hierarchy_by_nfs
-sles_migration1
-sles_migration2
-clean_up_env
+reg_linux_diskfull_installation_flat
+chdef_null
+chdef_t_node
+chdef_t_network
+chdef_p
+chdef_m
+chdef_z
+chdef_group
+chdef_group_p
+chdef_dynamic_group
+chdef_multiple_keys
+chdef_n
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+getmacs_noderange
+getmacs_d
+getmacs_f_D
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_bus
+rinv_config
+rinv_serial
+rinv_model
+rinv_firm
+rinv_all
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_off
+rpower_stat
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rscan_noderange
+rscan_x
+rscan_z
+rscan_w
+rscan_x_w
+rscan_z_w
+rvitals_lcds
+rvitals_all
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_p_auditlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makehosts_h
+makehosts_help
+makehosts_null
+makehosts_l
+makehosts_d
+makehosts_n
+makehosts_n_noderange
+xdcp_src_dst
+makedns_h
+makedns_d_node
+makedns_n
+makedns
+noderange_individual_node
+noderange_individual_grp
+noderange_node01-node10
+noderange_group1-group3
+noderange_10-20
+noderange_XCAT_NODE_PREFIX
+noderange_XCAT_NODE_SUFFIX
+noderange_exclusion
+noderange_group_intersection
+confignics_config_one_port_single_value
+confignics_config_multiple_ports_single_value
+confignics_config_multiple_ports_multiple_value
+confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
+confignics_config_multiple_port_withnicaliases_multiple_value
+confignics_disable_set_to_yes
+confignics_disable_set_to_1
+confignics_s
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+makentp_v
+makentp_h
+makentp_V
+makentp
+makentp_a
+nodeset_check_warninginfo
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+sles_migration1
+sles_migration2
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
index c2bdbc84b..4af6e5508 100644
--- a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
@@ -1,222 +1,221 @@
-reg_linux_diskfull_installation_flat
-makehosts_h
-makehosts_help
-makehosts_n
-makehosts_n_noderange
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_err_symble
-chtab_err_table
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_noderange
-nodestat_err_node
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_n
-makedns
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_i_linux
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-nodeset_check_warninginfo
-xcatd_start
-xcatd_stop
-xcatd_restart
-run_command_with_XCATBYPASS
-disable_root_permission_in_policy_table
-assign_certain_command_permission
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
-SN_setup_case
-reg_linux_diskfull_installation_hierarchy
-reg_linux_diskless_installation_hierarchy
-reg_linux_statelite_installation_hierarchy_by_ramdisk
-reg_linux_statelite_installation_hierarchy_by_nfs
-sles_migration1
-sles_migration2
-clean_up_env
+reg_linux_diskfull_installation_flat
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_err_symble
+chtab_err_table
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+nodeset_check_warninginfo
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
+SN_setup_case
+reg_linux_diskfull_installation_hierarchy
+reg_linux_diskless_installation_hierarchy
+reg_linux_statelite_installation_hierarchy_by_ramdisk
+reg_linux_statelite_installation_hierarchy_by_nfs
+sles_migration1
+sles_migration2
+clean_up_env
diff --git a/xCAT-test/autotest/bundle/sles12.1_ppc64.bundle b/xCAT-test/autotest/bundle/sles12.1_ppc64.bundle
index 04a1ebe34..f7f478c0a 100644
--- a/xCAT-test/autotest/bundle/sles12.1_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/sles12.1_ppc64.bundle
@@ -1,262 +1,261 @@
-reg_linux_diskfull_installation_flat
-chdef_null
-chdef_t_node
-chdef_t_network
-chdef_p
-chdef_m
-chdef_z
-chdef_group
-chdef_group_p
-chdef_dynamic_group
-chdef_multiple_keys
-chdef_n
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-getmacs_noderange
-getmacs_d
-getmacs_f_D
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rinv_bus
-rinv_config
-rinv_serial
-rinv_model
-rinv_firm
-rinv_all
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_off
-rpower_stat
-rpower_boot
-rpower_on
-rpower_reset
-rpower_noderange
-rpower_noderange_nodeps
-rpower_err_noderange
-rscan_noderange
-rscan_x
-rscan_z
-rscan_w
-rscan_x_w
-rscan_z_w
-rvitals_lcds
-rvitals_all
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_p_auditlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makehosts_h
-makehosts_help
-makehosts_null
-makehosts_l
-makehosts_d
-makehosts_n
-makehosts_n_noderange
-xdcp_src_dst
-makedns_h
-makedns_d_node
-makedns_n
-makedns
-noderange_individual_node
-noderange_individual_grp
-noderange_node01-node10
-noderange_group1-group3
-noderange_10-20
-noderange_XCAT_NODE_PREFIX
-noderange_XCAT_NODE_SUFFIX
-noderange_exclusion
-noderange_group_intersection
-confignics_config_one_port_single_value
-confignics_config_multiple_ports_single_value
-confignics_config_multiple_ports_multiple_value
-confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
-confignics_config_multiple_port_withnicaliases_multiple_value
-confignics_disable_set_to_yes
-confignics_disable_set_to_1
-confignics_s
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-makentp_v
-makentp_h
-makentp_V
-makentp
-makentp_a
-nodeset_check_warninginfo
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
+reg_linux_diskfull_installation_flat
+chdef_null
+chdef_t_node
+chdef_t_network
+chdef_p
+chdef_m
+chdef_z
+chdef_group
+chdef_group_p
+chdef_dynamic_group
+chdef_multiple_keys
+chdef_n
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+getmacs_noderange
+getmacs_d
+getmacs_f_D
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_bus
+rinv_config
+rinv_serial
+rinv_model
+rinv_firm
+rinv_all
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_off
+rpower_stat
+rpower_boot
+rpower_on
+rpower_reset
+rpower_noderange
+rpower_noderange_nodeps
+rpower_err_noderange
+rscan_noderange
+rscan_x
+rscan_z
+rscan_w
+rscan_x_w
+rscan_z_w
+rvitals_lcds
+rvitals_all
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_p_auditlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makehosts_h
+makehosts_help
+makehosts_null
+makehosts_l
+makehosts_d
+makehosts_n
+makehosts_n_noderange
+xdcp_src_dst
+makedns_h
+makedns_d_node
+makedns_n
+makedns
+noderange_individual_node
+noderange_individual_grp
+noderange_node01-node10
+noderange_group1-group3
+noderange_10-20
+noderange_XCAT_NODE_PREFIX
+noderange_XCAT_NODE_SUFFIX
+noderange_exclusion
+noderange_group_intersection
+confignics_config_one_port_single_value
+confignics_config_multiple_ports_single_value
+confignics_config_multiple_ports_multiple_value
+confignics_config_multiple_port_withnichostnamesuffixes_multiple_value
+confignics_config_multiple_port_withnicaliases_multiple_value
+confignics_disable_set_to_yes
+confignics_disable_set_to_1
+confignics_s
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+makentp_v
+makentp_h
+makentp_V
+makentp
+makentp_a
+nodeset_check_warninginfo
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
diff --git a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
index fbe5b25ca..2caa4876b 100644
--- a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
@@ -1,209 +1,208 @@
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
-makehosts_h
-makehosts_help
-makehosts_n
-makehosts_n_noderange
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_err_symble
-chtab_err_table
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_n
-makedns
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_i_linux
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
-sles_migration1
-sles_migration2
+Diskless_installation_flat_p8_le
+Full_installation_flat_p8_le
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_err_symble
+chtab_err_table
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+xcatd_start_systemd
+xcatd_stop_systemd
+xcatd_restart_systemd
+run_command_with_XCATBYPASS_systemd
+disable_root_permission_in_policy_table_systemd
+assign_certain_command_permission_systemd
+sles_migration1
+sles_migration2
diff --git a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle
index 1381b3c1b..757cbc2bf 100644
--- a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle
@@ -1,216 +1,215 @@
-reg_linux_diskfull_installation_flat
-makehosts_h
-makehosts_help
-makehosts_n
-makehosts_n_noderange
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_err_symble
-chtab_err_table
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_noderange
-nodestat_err_node
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_n
-makedns
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_i_linux
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-nodeset_check_warninginfo
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
-sles_migration1
-sles_migration2
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
+reg_linux_diskfull_installation_flat
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_err_symble
+chtab_err_table
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+nodeset_check_warninginfo
+xcatd_start_systemd
+xcatd_stop_systemd
+xcatd_restart_systemd
+run_command_with_XCATBYPASS_systemd
+disable_root_permission_in_policy_table_systemd
+assign_certain_command_permission_systemd
+sles_migration1
+sles_migration2
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
diff --git a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
index fbe5b25ca..2caa4876b 100644
--- a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
@@ -1,209 +1,208 @@
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
-makehosts_h
-makehosts_help
-makehosts_n
-makehosts_n_noderange
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_err_symble
-chtab_err_table
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_n
-makedns
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_i_linux
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
-sles_migration1
-sles_migration2
+Diskless_installation_flat_p8_le
+Full_installation_flat_p8_le
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_err_symble
+chtab_err_table
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+xcatd_start_systemd
+xcatd_stop_systemd
+xcatd_restart_systemd
+run_command_with_XCATBYPASS_systemd
+disable_root_permission_in_policy_table_systemd
+assign_certain_command_permission_systemd
+sles_migration1
+sles_migration2
diff --git a/xCAT-test/autotest/bundle/sles12_x86_64.bundle b/xCAT-test/autotest/bundle/sles12_x86_64.bundle
index e0714d5ad..8e3413dd1 100644
--- a/xCAT-test/autotest/bundle/sles12_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles12_x86_64.bundle
@@ -1,214 +1,213 @@
-reg_linux_diskfull_installation_flat
-makehosts_h
-makehosts_help
-makehosts_n
-makehosts_n_noderange
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_err_symble
-chtab_err_table
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-lslite_i
-lslite_noderange
-lslite_h
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a
-makedhcp_a_d
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_noderange
-nodestat_err_node
-rinv_noderange_err
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_n
-makedns
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_i_linux
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-nodeset_check_warninginfo
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
-reg_linux_diskless_installation_flat
-reg_linux_statelite_installation_flat
+reg_linux_diskfull_installation_flat
+makehosts_h
+makehosts_help
+makehosts_n
+makehosts_n_noderange
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_err_symble
+chtab_err_table
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+lslite_i
+lslite_noderange
+lslite_h
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a
+makedhcp_a_d
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rinv_noderange_err
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_n
+makedns
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_i_linux
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+nodeset_check_warninginfo
+xcatd_start_systemd
+xcatd_stop_systemd
+xcatd_restart_systemd
+run_command_with_XCATBYPASS_systemd
+disable_root_permission_in_policy_table_systemd
+assign_certain_command_permission_systemd
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
index c15d8835d..c369a3c47 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
@@ -1,247 +1,245 @@
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
-makehosts_h
-makehosts_help
-makehosts_n_noderange
-makehosts_n
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a_ubuntu
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_specificvalue
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_tab
-xcatstanzafile_normal
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_ubuntu_n
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-addkit_v
-addkit_h
-addkit_kit
-addkit_i
-addkit_multikit
-addkit_p
-addkitcomp_v
-addkitcomp_h
-addkitcomp_i
-addkitcomp_f
-buildkit_v
-buildkit_h
-buildkit_create
-buildkit_create_l
-buildkit_cleanrepo_all
-buildkit_buildtar
-chkkitcomp_v
-chkkitcomp_h
-chkkitcomp_V
-lskit_v
-lskit_h
-lskit_F
-lskit_K
-lskit_R
-lskit_C
-lskitcomp_v
-lskitcomp_h
-lskitcomp_C
-lskitcomp_C
-lskitcomp_S
-lskitdeployparam_v
-lskitdeployparam_h
-lskitdeployparam_no_param
-lskitdeployparam_k_1
-lskitdeployparam_c_1
-rmkit_v
-rmkit_h
-rmkit_t_no
-rmkit_t_yes
-rmkit_f
-rmkit_V
-rmkitcomp_v
-rmkitcomp_h
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-xcatd_start
-xcatd_stop
-xcatd_restart
-run_command_with_XCATBYPASS
-disable_root_permission_in_policy_table
-assign_certain_command_permission
-ubuntu_migration1_p8le
-ubuntu_migration2_p8le
+Diskless_installation_flat_p8_le
+Full_installation_flat_p8_le
+makehosts_h
+makehosts_help
+makehosts_n_noderange
+makehosts_n
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a_ubuntu
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_specificvalue
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_tab
+xcatstanzafile_normal
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_ubuntu_n
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+addkit_v
+addkit_h
+addkit_kit
+addkit_i
+addkit_multikit
+addkit_p
+addkitcomp_v
+addkitcomp_h
+addkitcomp_i
+addkitcomp_f
+buildkit_v
+buildkit_h
+buildkit_create
+buildkit_create_l
+buildkit_cleanrepo_all
+buildkit_buildtar
+chkkitcomp_v
+chkkitcomp_h
+chkkitcomp_V
+lskit_v
+lskit_h
+lskit_F
+lskit_K
+lskit_R
+lskit_C
+lskitcomp_v
+lskitcomp_h
+lskitcomp_C
+lskitcomp_S
+lskitdeployparam_v
+lskitdeployparam_h
+lskitdeployparam_no_param
+lskitdeployparam_k_1
+lskitdeployparam_c_1
+rmkit_v
+rmkit_h
+rmkit_t_no
+rmkit_t_yes
+rmkit_f
+rmkit_V
+rmkitcomp_v
+rmkitcomp_h
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
+ubuntu_migration1_p8le
+ubuntu_migration2_p8le
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
index 9847cc792..a43d7cf69 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
@@ -1,264 +1,262 @@
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
-makehosts_h
-makehosts_help
-makehosts_n_noderange
-makehosts_n
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a_ubuntu
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_noderange
-nodestat_err_node
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_ubuntu_n
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-addkit_v
-addkit_h
-addkit_kit
-addkit_i
-addkit_multikit
-addkit_p
-addkitcomp_v
-addkitcomp_h
-addkitcomp_i
-addkitcomp_f
-buildkit_v
-buildkit_h
-buildkit_create
-buildkit_create_l
-buildkit_buildrepo_all
-buildkit_buildrepo_ubuntu
-buildkit_cleanrepo_all
-buildkit_cleanrepo_ubuntu
-buildkit_listrepo
-buildkit_buildtar
-buildkit_cleantar
-buildkit_partialkit_ubuntu
-buildkit_partialkit_completekit
-chkkitcomp_v
-chkkitcomp_h
-chkkitcomp_V
-lskit_v
-lskit_h
-lskit_F
-lskit_K
-lskit_R
-lskit_C
-lskitcomp_v
-lskitcomp_h
-lskitcomp_C
-lskitcomp_C
-lskitcomp_S
-lskitdeployparam_v
-lskitdeployparam_h
-lskitdeployparam_no_param
-lskitdeployparam_k_1
-lskitdeployparam_c_1
-rmkit_v
-rmkit_h
-rmkit_t_no
-rmkit_t_yes
-rmkit_f
-rmkit_V
-rmkitcomp_v
-rmkitcomp_h
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-nodeset_check_warninginfo
-Full_installation_flat_docker
-rpower_stop
-rpower_start
-rpower_state
-rpower_restart
-rpower_pause
-rpower_unpause
-mkdocker_h
-mkdocker_command
-rmdocker_h
-rmdocker_command
-rmdocker_f_command
-lsdocker_h_command
-lsdocker_l_command
-ubuntux_migration1_vm
-ubuntux_migration2_vm
+Ubuntu_diskless_installation_flat_x86_vm
+Ubuntu_full_installation_flat_x86_vm
+makehosts_h
+makehosts_help
+makehosts_n_noderange
+makehosts_n
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a_ubuntu
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_ubuntu_n
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+addkit_v
+addkit_h
+addkit_kit
+addkit_i
+addkit_multikit
+addkit_p
+addkitcomp_v
+addkitcomp_h
+addkitcomp_i
+addkitcomp_f
+buildkit_v
+buildkit_h
+buildkit_create
+buildkit_create_l
+buildkit_buildrepo_all
+buildkit_buildrepo_ubuntu
+buildkit_cleanrepo_all
+buildkit_cleanrepo_ubuntu
+buildkit_listrepo
+buildkit_buildtar
+buildkit_cleantar
+buildkit_partialkit_ubuntu
+buildkit_partialkit_completekit
+chkkitcomp_v
+chkkitcomp_h
+chkkitcomp_V
+lskit_v
+lskit_h
+lskit_F
+lskit_K
+lskit_R
+lskit_C
+lskitcomp_v
+lskitcomp_h
+lskitcomp_C
+lskitcomp_S
+lskitdeployparam_v
+lskitdeployparam_h
+lskitdeployparam_no_param
+lskitdeployparam_k_1
+lskitdeployparam_c_1
+rmkit_v
+rmkit_h
+rmkit_t_no
+rmkit_t_yes
+rmkit_f
+rmkit_V
+rmkitcomp_v
+rmkitcomp_h
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+nodeset_check_warninginfo
+Full_installation_flat_docker
+rpower_stop
+rpower_start
+rpower_state
+rpower_restart
+rpower_pause
+rpower_unpause
+mkdocker_h
+mkdocker_command
+rmdocker_h
+rmdocker_command
+rmdocker_f_command
+lsdocker_h_command
+lsdocker_l_command
+ubuntux_migration1_vm
+ubuntux_migration2_vm
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
index d93f4ad1d..36ec63e99 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
@@ -1,245 +1,243 @@
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
-makehosts_h
-makehosts_help
-makehosts_n_noderange
-makehosts_n
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a_ubuntu
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_specificvalue
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_tab
-xcatstanzafile_normal
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_ubuntu_n
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-addkit_v
-addkit_h
-addkit_kit
-addkit_i
-addkit_multikit
-addkit_p
-addkitcomp_v
-addkitcomp_h
-addkitcomp_i
-addkitcomp_f
-buildkit_v
-buildkit_h
-buildkit_create
-buildkit_create_l
-buildkit_cleanrepo_all
-buildkit_buildtar
-chkkitcomp_v
-chkkitcomp_h
-chkkitcomp_V
-lskit_v
-lskit_h
-lskit_F
-lskit_K
-lskit_R
-lskit_C
-lskitcomp_v
-lskitcomp_h
-lskitcomp_C
-lskitcomp_C
-lskitcomp_S
-lskitdeployparam_v
-lskitdeployparam_h
-lskitdeployparam_no_param
-lskitdeployparam_k_1
-lskitdeployparam_c_1
-rmkit_v
-rmkit_h
-rmkit_t_no
-rmkit_t_yes
-rmkit_f
-rmkit_V
-rmkitcomp_v
-rmkitcomp_h
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-xcatd_start
-xcatd_stop
-xcatd_restart
-run_command_with_XCATBYPASS
-disable_root_permission_in_policy_table
-assign_certain_command_permission
+Diskless_installation_flat_p8_le
+Full_installation_flat_p8_le
+makehosts_h
+makehosts_help
+makehosts_n_noderange
+makehosts_n
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a_ubuntu
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_specificvalue
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_tab
+xcatstanzafile_normal
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_ubuntu_n
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+addkit_v
+addkit_h
+addkit_kit
+addkit_i
+addkit_multikit
+addkit_p
+addkitcomp_v
+addkitcomp_h
+addkitcomp_i
+addkitcomp_f
+buildkit_v
+buildkit_h
+buildkit_create
+buildkit_create_l
+buildkit_cleanrepo_all
+buildkit_buildtar
+chkkitcomp_v
+chkkitcomp_h
+chkkitcomp_V
+lskit_v
+lskit_h
+lskit_F
+lskit_K
+lskit_R
+lskit_C
+lskitcomp_v
+lskitcomp_h
+lskitcomp_C
+lskitcomp_S
+lskitdeployparam_v
+lskitdeployparam_h
+lskitdeployparam_no_param
+lskitdeployparam_k_1
+lskitdeployparam_c_1
+rmkit_v
+rmkit_h
+rmkit_t_no
+rmkit_t_yes
+rmkit_f
+rmkit_V
+rmkitcomp_v
+rmkitcomp_h
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+xcatd_start
+xcatd_stop
+xcatd_restart
+run_command_with_XCATBYPASS
+disable_root_permission_in_policy_table
+assign_certain_command_permission
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
index f8e5006ad..7a307a29d 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
@@ -1,262 +1,260 @@
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
-makehosts_h
-makehosts_help
-makehosts_n_noderange
-makehosts_n
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a_ubuntu
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_noderange
-nodestat_err_node
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_ubuntu_n
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-addkit_v
-addkit_h
-addkit_kit
-addkit_i
-addkit_multikit
-addkit_p
-addkitcomp_v
-addkitcomp_h
-addkitcomp_i
-addkitcomp_f
-buildkit_v
-buildkit_h
-buildkit_create
-buildkit_create_l
-buildkit_buildrepo_all
-buildkit_buildrepo_ubuntu
-buildkit_cleanrepo_all
-buildkit_cleanrepo_ubuntu
-buildkit_listrepo
-buildkit_buildtar
-buildkit_cleantar
-buildkit_partialkit_ubuntu
-buildkit_partialkit_completekit
-chkkitcomp_v
-chkkitcomp_h
-chkkitcomp_V
-lskit_v
-lskit_h
-lskit_F
-lskit_K
-lskit_R
-lskit_C
-lskitcomp_v
-lskitcomp_h
-lskitcomp_C
-lskitcomp_C
-lskitcomp_S
-lskitdeployparam_v
-lskitdeployparam_h
-lskitdeployparam_no_param
-lskitdeployparam_k_1
-lskitdeployparam_c_1
-rmkit_v
-rmkit_h
-rmkit_t_no
-rmkit_t_yes
-rmkit_f
-rmkit_V
-rmkitcomp_v
-rmkitcomp_h
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-nodeset_check_warninginfo
-Full_installation_flat_docker
-rpower_stop
-rpower_start
-rpower_state
-rpower_restart
-rpower_pause
-rpower_unpause
-mkdocker_h
-mkdocker_command
-rmdocker_h
-rmdocker_command
-rmdocker_f_command
-lsdocker_h_command
-lsdocker_l_command
+Ubuntu_diskless_installation_flat_x86_vm
+Ubuntu_full_installation_flat_x86_vm
+makehosts_h
+makehosts_help
+makehosts_n_noderange
+makehosts_n
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a_ubuntu
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_ubuntu_n
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+addkit_v
+addkit_h
+addkit_kit
+addkit_i
+addkit_multikit
+addkit_p
+addkitcomp_v
+addkitcomp_h
+addkitcomp_i
+addkitcomp_f
+buildkit_v
+buildkit_h
+buildkit_create
+buildkit_create_l
+buildkit_buildrepo_all
+buildkit_buildrepo_ubuntu
+buildkit_cleanrepo_all
+buildkit_cleanrepo_ubuntu
+buildkit_listrepo
+buildkit_buildtar
+buildkit_cleantar
+buildkit_partialkit_ubuntu
+buildkit_partialkit_completekit
+chkkitcomp_v
+chkkitcomp_h
+chkkitcomp_V
+lskit_v
+lskit_h
+lskit_F
+lskit_K
+lskit_R
+lskit_C
+lskitcomp_v
+lskitcomp_h
+lskitcomp_C
+lskitcomp_S
+lskitdeployparam_v
+lskitdeployparam_h
+lskitdeployparam_no_param
+lskitdeployparam_k_1
+lskitdeployparam_c_1
+rmkit_v
+rmkit_h
+rmkit_t_no
+rmkit_t_yes
+rmkit_f
+rmkit_V
+rmkitcomp_v
+rmkitcomp_h
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+nodeset_check_warninginfo
+Full_installation_flat_docker
+rpower_stop
+rpower_start
+rpower_state
+rpower_restart
+rpower_pause
+rpower_unpause
+mkdocker_h
+mkdocker_command
+rmdocker_h
+rmdocker_command
+rmdocker_f_command
+lsdocker_h_command
+lsdocker_l_command
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
index 0857fb8ae..32328d594 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
@@ -1,245 +1,243 @@
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
-makehosts_h
-makehosts_help
-makehosts_n_noderange
-makehosts_n
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a_ubuntu
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_specificvalue
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_tab
-xcatstanzafile_normal
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_err_node
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_ubuntu_n
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-addkit_v
-addkit_h
-addkit_kit
-addkit_i
-addkit_multikit
-addkit_p
-addkitcomp_v
-addkitcomp_h
-addkitcomp_i
-addkitcomp_f
-buildkit_v
-buildkit_h
-buildkit_create
-buildkit_create_l
-buildkit_cleanrepo_all
-buildkit_buildtar
-chkkitcomp_v
-chkkitcomp_h
-chkkitcomp_V
-lskit_v
-lskit_h
-lskit_F
-lskit_K
-lskit_R
-lskit_C
-lskitcomp_v
-lskitcomp_h
-lskitcomp_C
-lskitcomp_C
-lskitcomp_S
-lskitdeployparam_v
-lskitdeployparam_h
-lskitdeployparam_no_param
-lskitdeployparam_k_1
-lskitdeployparam_c_1
-rmkit_v
-rmkit_h
-rmkit_t_no
-rmkit_t_yes
-rmkit_f
-rmkit_V
-rmkitcomp_v
-rmkitcomp_h
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
+Diskless_installation_flat_p8_le
+Full_installation_flat_p8_le
+makehosts_h
+makehosts_help
+makehosts_n_noderange
+makehosts_n
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a_ubuntu
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_specificvalue
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_tab
+xcatstanzafile_normal
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_err_node
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_ubuntu_n
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+addkit_v
+addkit_h
+addkit_kit
+addkit_i
+addkit_multikit
+addkit_p
+addkitcomp_v
+addkitcomp_h
+addkitcomp_i
+addkitcomp_f
+buildkit_v
+buildkit_h
+buildkit_create
+buildkit_create_l
+buildkit_cleanrepo_all
+buildkit_buildtar
+chkkitcomp_v
+chkkitcomp_h
+chkkitcomp_V
+lskit_v
+lskit_h
+lskit_F
+lskit_K
+lskit_R
+lskit_C
+lskitcomp_v
+lskitcomp_h
+lskitcomp_C
+lskitcomp_S
+lskitdeployparam_v
+lskitdeployparam_h
+lskitdeployparam_no_param
+lskitdeployparam_k_1
+lskitdeployparam_c_1
+rmkit_v
+rmkit_h
+rmkit_t_no
+rmkit_t_yes
+rmkit_f
+rmkit_V
+rmkitcomp_v
+rmkitcomp_h
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+xcatd_start_systemd
+xcatd_stop_systemd
+xcatd_restart_systemd
+run_command_with_XCATBYPASS_systemd
+disable_root_permission_in_policy_table_systemd
+assign_certain_command_permission_systemd
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
index 15c77f4a6..8413bfedc 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
@@ -1,254 +1,252 @@
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
-makehosts_h
-makehosts_help
-makehosts_n_noderange
-makehosts_n
-chdef_null
-chdef_z
-chdef_t_o_error
-chtab_null
-chtab_d
-chtab_modify_node
-chtab_modify_key
-chtab_h
-chtab_v
-packimage_o_p_a_m
-packimage_p_a_o
-packimage_imagename
-packimage_h
-packimage_v
-pping_h
-pping_v
-pping_node
-gettab_key_table
-gettab_H
-gettab_err
-gettab_h
-lsdef_null
-lsdef_a
-lsdef_t_o_l
-lsdef_t_o_l_z
-lsdef_t
-lsdef_t_i_o
-lsdef_t_w
-lsdef_t_err
-makeconservercf_null
-makeconservercf_noderange
-makeconservercf_d
-makedhcp_n
-makedhcp_a_ubuntu
-makedhcp_d
-mkdef_null
-mkdef_z
-mkdef_t_o_error
-nodeadd_noderange
-nodeadd_err_symbol
-nodeadd_null
-nodeadd_noderange_nodetype
-nodeadd_v
-nodeadd_h
-nodegrpch_v
-nodegrpch_h
-nodegrpch_groups
-nodegrpch_err
-nodech_noderange_table
-nodech_noderange_table_comma
-nodech_noderange_table_arrow
-nodech_noderanage_table_at
-nodech_delete
-nodech_error_node
-nodech_error_table
-nodech_h
-nodech_v
-nodech_noderange_table_include
-nodech_noderange_table_uninclude
-nodech_noderange_table_equal
-nodech_noderange_table_unequal
-nodech_noderange_shortname_groups
-nodech_noderange_shortname_tags
-nodech_noderange_shortname_mgt
-nodels_null
-nodels_H
-nodels_noderange
-nodels_err_symbol
-nodels_err_noderange
-nodels_noderange_shortname_groups
-nodels_noderange_shortname_tags
-nodels_noderange_shortname_mgt
-nodels_table_include
-nodels_noderange_table_uninclude
-nodels_noderange_table_equal
-nodels_noderange_table_unequal
-nodels_b
-nodels_S
-nodels_noderange_table
-nodels_tablevalue
-nodels_tablevalue_tablecolumn
-nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
-nodels_h
-nodels_v
-xcatstanzafile_normal
-xcatstanzafile_colon
-xcatstanzafile_attribute
-xcatstanzafile_objtype
-xcatstanzafile_tab
-xcatstanzafile_multattr
-xcatstanzafile_defaultvalue
-xcatstanzafile_specificvalue
-noderm_noderange
-noderm_h
-noderm_null
-noderm_err_node
-nodeset_stat
-nodeset_noderange
-nodestat_noderange
-nodestat_err_node
-rmdef_null
-rmdef_t_err
-rpower_err_noderange
-rvitals_noderange_err
-tabdump_table
-tabdump_d
-tabdump_v
-tabdump_h
-tabdump_help
-tabdump_w_match
-tabdump_w_equal
-tabdump_w_ne
-tabdump_w_notmatch
-tabdump_w_gt
-tabdump_w_ge
-tabdump_w_lt
-tabdump_w_le
-tabdump_f_d
-tabdump_d_nodehm
-tabprune_h
-tabprune_v
-tabprune_a_eventlog
-tabprune_V_a_eventlog
-tabprune_i_auditlog
-tabprune_V_n_auditlog
-tabgrep_node
-tabgrep_null
-tabgrep_h
-tabgrep_err
-tabrestore_table
-tabrestore_null
-tabrestore_h
-tabrestore_err
-dumpxCATdb_h
-dumpxCATdb_v
-dumpxCATdb_p_nullskiptables
-dumpxCATdb_a_p_nullskiptables
-dumpxCATdb_p_skiptables
-dumpxCATdb_a_p_skiptables
-dumpxCATdb_p_nullskiptables_V
-dumpxCATdb_a_p_nullskiptables_V
-dumpxCATdb_p_V
-restorexCAT_h
-restorexCATdb_v
-restorexCATdb_p_V
-restorexCATdb_a_p_V
-restorexCATdb_wrongpath
-regnotif_null
-regnotif_o
-regnotif_err
-regnotif_h
-regnotif_v
-unregnotif_null
-unregnotif_f
-unregnotif_h
-unregnotif_v
-lsxcatd_null
-lsxcatd_h
-lsxcatd_d
-lsxcatd_a
-makedns_d_node
-makedns_ubuntu_n
-copycds_iso
-copycds_n
-copycds_a
-copycds_n_a
-copycds_a_err
-copycds_n_err
-addkit_v
-addkit_h
-addkit_kit
-addkit_i
-addkit_multikit
-addkit_p
-addkitcomp_v
-addkitcomp_h
-addkitcomp_i
-addkitcomp_f
-buildkit_v
-buildkit_h
-buildkit_create
-buildkit_create_l
-buildkit_buildrepo_all
-buildkit_buildrepo_ubuntu
-buildkit_cleanrepo_all
-buildkit_cleanrepo_ubuntu
-buildkit_listrepo
-buildkit_buildtar
-buildkit_cleantar
-buildkit_partialkit_ubuntu
-buildkit_partialkit_completekit
-chkkitcomp_v
-chkkitcomp_h
-chkkitcomp_V
-lskit_v
-lskit_h
-lskit_F
-lskit_K
-lskit_R
-lskit_C
-lskitcomp_v
-lskitcomp_h
-lskitcomp_C
-lskitcomp_C
-lskitcomp_S
-lskitdeployparam_v
-lskitdeployparam_h
-lskitdeployparam_no_param
-lskitdeployparam_k_1
-lskitdeployparam_c_1
-rmkit_v
-rmkit_h
-rmkit_t_no
-rmkit_t_yes
-rmkit_f
-rmkit_V
-rmkitcomp_v
-rmkitcomp_h
-xdsh_h
-xdsh_V
-xdsh_regular_command
-xdsh_Q_command
-xdsh_c_cn
-xdsh_e_filename
-xdsh_E
-xdsh_t
-xdsh_q
-xdsh_T
-xdsh_o
-switchdiscover_range_default
-switchdiscover_h
-switchdiscover_range_s
-switchdiscover_range_default_w
-switchdiscover_range_r
-switchdiscover_range_x
-switchdiscover_range_z
-switchdiscover_range_z_V
-nodeset_shell
-nodeset_cmdline
-nodeset_runimg
-xcatd_start_systemd
-xcatd_stop_systemd
-xcatd_restart_systemd
-run_command_with_XCATBYPASS_systemd
-disable_root_permission_in_policy_table_systemd
-assign_certain_command_permission_systemd
-nodeset_check_warninginfo
+Ubuntu_diskless_installation_flat_x86_vm
+Ubuntu_full_installation_flat_x86_vm
+makehosts_h
+makehosts_help
+makehosts_n_noderange
+makehosts_n
+chdef_null
+chdef_z
+chdef_t_o_error
+chtab_null
+chtab_d
+chtab_modify_node
+chtab_modify_key
+chtab_h
+chtab_v
+packimage_o_p_a_m
+packimage_p_a_o
+packimage_imagename
+packimage_h
+packimage_v
+pping_h
+pping_v
+pping_node
+gettab_key_table
+gettab_H
+gettab_err
+gettab_h
+lsdef_null
+lsdef_a
+lsdef_t_o_l
+lsdef_t_o_l_z
+lsdef_t
+lsdef_t_i_o
+lsdef_t_w
+lsdef_t_err
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+makedhcp_n
+makedhcp_a_ubuntu
+makedhcp_d
+mkdef_null
+mkdef_z
+mkdef_t_o_error
+nodeadd_noderange
+nodeadd_err_symbol
+nodeadd_null
+nodeadd_noderange_nodetype
+nodeadd_v
+nodeadd_h
+nodegrpch_v
+nodegrpch_h
+nodegrpch_groups
+nodegrpch_err
+nodech_noderange_table
+nodech_noderange_table_comma
+nodech_noderange_table_arrow
+nodech_noderanage_table_at
+nodech_delete
+nodech_error_node
+nodech_error_table
+nodech_h
+nodech_v
+nodech_noderange_table_include
+nodech_noderange_table_uninclude
+nodech_noderange_table_equal
+nodech_noderange_table_unequal
+nodech_noderange_shortname_groups
+nodech_noderange_shortname_tags
+nodech_noderange_shortname_mgt
+nodels_null
+nodels_H
+nodels_noderange
+nodels_err_symbol
+nodels_err_noderange
+nodels_noderange_shortname_groups
+nodels_noderange_shortname_tags
+nodels_noderange_shortname_mgt
+nodels_table_include
+nodels_noderange_table_uninclude
+nodels_noderange_table_equal
+nodels_noderange_table_unequal
+nodels_b
+nodels_S
+nodels_noderange_table
+nodels_tablevalue
+nodels_tablevalue_tablecolumn
+nodels_noderange_tablecolumn
+nodels_h
+nodels_v
+xcatstanzafile_normal
+xcatstanzafile_colon
+xcatstanzafile_attribute
+xcatstanzafile_objtype
+xcatstanzafile_tab
+xcatstanzafile_multattr
+xcatstanzafile_defaultvalue
+xcatstanzafile_specificvalue
+noderm_noderange
+noderm_h
+noderm_null
+noderm_err_node
+nodeset_stat
+nodeset_noderange
+nodestat_noderange
+nodestat_err_node
+rmdef_null
+rmdef_t_err
+rpower_err_noderange
+rvitals_noderange_err
+tabdump_table
+tabdump_d
+tabdump_v
+tabdump_h
+tabdump_help
+tabdump_w_match
+tabdump_w_equal
+tabdump_w_ne
+tabdump_w_notmatch
+tabdump_w_gt
+tabdump_w_ge
+tabdump_w_lt
+tabdump_w_le
+tabdump_f_d
+tabdump_d_nodehm
+tabprune_h
+tabprune_v
+tabprune_a_eventlog
+tabprune_V_a_eventlog
+tabprune_i_auditlog
+tabprune_V_n_auditlog
+tabgrep_node
+tabgrep_null
+tabgrep_h
+tabgrep_err
+tabrestore_table
+tabrestore_null
+tabrestore_h
+tabrestore_err
+dumpxCATdb_h
+dumpxCATdb_v
+dumpxCATdb_p_nullskiptables
+dumpxCATdb_a_p_nullskiptables
+dumpxCATdb_p_skiptables
+dumpxCATdb_a_p_skiptables
+dumpxCATdb_p_nullskiptables_V
+dumpxCATdb_a_p_nullskiptables_V
+dumpxCATdb_p_V
+restorexCAT_h
+restorexCATdb_v
+restorexCATdb_p_V
+restorexCATdb_a_p_V
+restorexCATdb_wrongpath
+regnotif_null
+regnotif_o
+regnotif_err
+regnotif_h
+regnotif_v
+unregnotif_null
+unregnotif_f
+unregnotif_h
+unregnotif_v
+lsxcatd_null
+lsxcatd_h
+lsxcatd_d
+lsxcatd_a
+makedns_d_node
+makedns_ubuntu_n
+copycds_iso
+copycds_n
+copycds_a
+copycds_n_a
+copycds_a_err
+copycds_n_err
+addkit_v
+addkit_h
+addkit_kit
+addkit_i
+addkit_multikit
+addkit_p
+addkitcomp_v
+addkitcomp_h
+addkitcomp_i
+addkitcomp_f
+buildkit_v
+buildkit_h
+buildkit_create
+buildkit_create_l
+buildkit_buildrepo_all
+buildkit_buildrepo_ubuntu
+buildkit_cleanrepo_all
+buildkit_cleanrepo_ubuntu
+buildkit_listrepo
+buildkit_buildtar
+buildkit_cleantar
+buildkit_partialkit_ubuntu
+buildkit_partialkit_completekit
+chkkitcomp_v
+chkkitcomp_h
+chkkitcomp_V
+lskit_v
+lskit_h
+lskit_F
+lskit_K
+lskit_R
+lskit_C
+lskitcomp_v
+lskitcomp_h
+lskitcomp_C
+lskitcomp_S
+lskitdeployparam_v
+lskitdeployparam_h
+lskitdeployparam_no_param
+lskitdeployparam_k_1
+lskitdeployparam_c_1
+rmkit_v
+rmkit_h
+rmkit_t_no
+rmkit_t_yes
+rmkit_f
+rmkit_V
+rmkitcomp_v
+rmkitcomp_h
+xdsh_h
+xdsh_V
+xdsh_regular_command
+xdsh_Q_command
+xdsh_c_cn
+xdsh_e_filename
+xdsh_E
+xdsh_t
+xdsh_q
+xdsh_T
+xdsh_o
+switchdiscover_range_default
+switchdiscover_h
+switchdiscover_range_s
+switchdiscover_range_default_w
+switchdiscover_range_r
+switchdiscover_range_x
+switchdiscover_range_z
+switchdiscover_range_z_V
+nodeset_shell
+nodeset_cmdline
+nodeset_runimg
+xcatd_start_systemd
+xcatd_stop_systemd
+xcatd_restart_systemd
+run_command_with_XCATBYPASS_systemd
+disable_root_permission_in_policy_table_systemd
+assign_certain_command_permission_systemd
+nodeset_check_warninginfo
diff --git a/xCAT-test/autotest/bundle/x_rhels_cmd.bundle b/xCAT-test/autotest/bundle/x_rhels_cmd.bundle
index aac12e801..ed6ca7d43 100644
--- a/xCAT-test/autotest/bundle/x_rhels_cmd.bundle
+++ b/xCAT-test/autotest/bundle/x_rhels_cmd.bundle
@@ -88,7 +88,6 @@ nodels_noderange_table
 nodels_tablevalue
 nodels_tablevalue_tablecolumn
 nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
 nodels_h
 nodels_v
 xcatstanzafile_normal
diff --git a/xCAT-test/autotest/bundle/x_sles_cmd.bundle b/xCAT-test/autotest/bundle/x_sles_cmd.bundle
index fe978e117..eb160f912 100644
--- a/xCAT-test/autotest/bundle/x_sles_cmd.bundle
+++ b/xCAT-test/autotest/bundle/x_sles_cmd.bundle
@@ -90,7 +90,6 @@ nodels_noderange_table
 nodels_tablevalue
 nodels_tablevalue_tablecolumn
 nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
 nodels_h
 nodels_v
 xcatstanzafile_normal
diff --git a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
index fe3665fb8..4b6fe505a 100644
--- a/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
+++ b/xCAT-test/autotest/bundle/x_ubuntu_cmd.bundle
@@ -84,7 +84,6 @@ nodels_noderange_table
 nodels_tablevalue
 nodels_tablevalue_tablecolumn
 nodels_noderange_tablecolumn
-nodels_tablevalue_tablecolumn
 nodels_h
 nodels_v
 xcatstanzafile_normal
@@ -206,7 +205,6 @@ lskit_C
 lskitcomp_v
 lskitcomp_h
 lskitcomp_C
-lskitcomp_C
 lskitcomp_S
 lskitdeployparam_v
 lskitdeployparam_h