diff --git a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
index c790b2146..83c9b1185 100644
--- a/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.9_ppc64.bundle
@@ -310,6 +310,38 @@ run_command_with_XCATBYPASS
 disable_root_permission_in_policy_table
 assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_rhels_sles
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_grub2
+nodeset_yaboot
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 reg_linux_diskless_installation_flat
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_xz
diff --git a/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle b/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle
index df5b11571..e3a2c161d 100644
--- a/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/rhels6.9_x86_64.bundle
@@ -210,6 +210,37 @@ nodeset_cmdline
 nodeset_runimg
 nodeset_check_warninginfo
 xcatconfig_u_check_xcatsslversion_rhels_sles
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_xnba
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 reg_linux_diskless_installation_flat
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_xz
diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
index b61c79e07..4e3974aa5 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
@@ -311,6 +311,39 @@ run_command_with_XCATBYPASS
 disable_root_permission_in_policy_table
 assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_rhels_sles
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+mkdef_rhels73
+nodeset_errorcommand
+nodeset_grub2
+nodeset_yaboot
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 reg_linux_diskless_installation_flat
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_xz
diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
index b4b24da9c..c92c618bc 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
@@ -300,6 +300,39 @@ run_command_with_XCATBYPASS
 disable_root_permission_in_policy_table
 assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_rhels_sles
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+mkdef_rhels73
+nodeset_errorcommand
+nodeset_grub2
+nodeset_petitboot
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_xz
 packimage_m_tar_c_gzip
diff --git a/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle b/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle
index 63e7b5294..12839e1d4 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle
@@ -216,6 +216,38 @@ nodeset_shell
 nodeset_cmdline
 nodeset_runimg
 xcatconfig_u_check_xcatsslversion_rhels_sles
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+mkdef_rhels73
+nodeset_errorcommand
+nodeset_xnba
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 reg_linux_diskless_installation_flat
 reg_linux_statelite_installation_flat
 SN_setup_case
diff --git a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
index ecc350e90..f71d696a8 100644
--- a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
+++ b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
@@ -274,6 +274,38 @@ makentp_v
 makentp_h
 nodeset_check_warninginfo
 xcatconfig_u_check_xcatsslversion_rhels_sles
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_grub2
+nodeset_yaboot
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 reg_linux_diskless_installation_flat
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_xz
diff --git a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
index 338ffb049..55f013dee 100644
--- a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle
@@ -220,6 +220,37 @@ run_command_with_XCATBYPASS
 disable_root_permission_in_policy_table
 assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_rhels_sles
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_xnba
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 reg_linux_diskless_installation_flat
 packimage_m_cpio_c_gzip
 packimage_m_cpio_c_xz
diff --git a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
index cda0ea4f2..3b89a73a1 100644
--- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
@@ -234,6 +234,38 @@ run_command_with_XCATBYPASS_systemd
 disable_root_permission_in_policy_table_systemd
 assign_certain_command_permission_systemd
 xcatconfig_u_check_xcatsslversion_rhels_sles
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_grub2
+nodeset_petitboot
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 sles_migration1
 sles_migration2
 reg_linux_statelite_installation_flat
diff --git a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
index 1c9cedf37..c2c3d4096 100644
--- a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle
@@ -220,6 +220,37 @@ run_command_with_XCATBYPASS_systemd
 disable_root_permission_in_policy_table_systemd
 assign_certain_command_permission_systemd
 xcatconfig_u_check_xcatsslversion_rhels_sles
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_xnba
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 sles_migration1
 sles_migration2
 reg_linux_diskless_installation_flat
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
index 2f56db766..0d7131ffd 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
@@ -271,5 +271,37 @@ run_command_with_XCATBYPASS
 disable_root_permission_in_policy_table
 assign_certain_command_permission
 xcatconfig_u_check_xcatsslversion_ubuntu
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_grub2
+nodeset_petitboot
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 ubuntu_migration1_p8le
 ubuntu_migration2_p8le
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 eba0da466..b07bd9f55 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
@@ -277,5 +277,36 @@ rmdocker_f_command
 lsdocker_h_command
 lsdocker_l_command
 xcatconfig_u_check_xcatsslversion_ubuntu
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_xnba
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 ubuntu_migration1_vm
 ubuntu_migration2_vm
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
index 178c2ee8b..c03ecbfe0 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
@@ -272,6 +272,38 @@ run_command_with_XCATBYPASS_systemd
 disable_root_permission_in_policy_table_systemd
 assign_certain_command_permission_systemd
 xcatconfig_u_check_xcatsslversion_ubuntu
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_grub2
+nodeset_petitboot
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 ubuntu_migration1_p8le
 ubuntu_migration2_p8le
 
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
index 5ed165f5e..610c072c0 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
@@ -269,5 +269,36 @@ disable_root_permission_in_policy_table_systemd
 assign_certain_command_permission_systemd
 nodeset_check_warninginfo
 xcatconfig_u_check_xcatsslversion_ubuntu
+bmcdiscover_help
+bmcdiscover_q
+bmcdiscover_version
+chdef_nicips
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork__bridge_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+encrypted_passwd_md5_diskfull
+encrypted_passwd_openssl_diskfull
+encrypted_passwd_sha256_diskfull
+encrypted_passwd_sha512_diskfull
+makedhcp_remote_network
+makedns_n_noderange
+makeknownhosts_node_d
+mkdef_regex_bmc
+mkdef_regex_ip
+mkdef_regex_kvm
+mkdef_regex_nicsip
+nodeset_errorcommand
+nodeset_xnba
+nodestat_usage
+rmimage_diskless
+updatenode_diskful_syncfiles_failing
+xdcp_nonroot_user
+xdsh_permission_denied
 ubuntu_migration1_vm
 ubuntu_migration2_vm