diff --git a/xCAT-test/autotest/bundle/physical_node_openpower_ipmi.bundle b/xCAT-test/autotest/bundle/physical_node_openpower_ipmi.bundle
new file mode 100644
index 000000000..067b8f90e
--- /dev/null
+++ b/xCAT-test/autotest/bundle/physical_node_openpower_ipmi.bundle
@@ -0,0 +1,25 @@
+#INCLUDE:hdctrl_openpower_ipmi.bundle#
+reg_linux_diskfull_installation_flat
+confignetwork_static_installnic
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+confignetwork__bridge_false
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+reg_linux_diskless_installation_flat
diff --git a/xCAT-test/autotest/bundle/physical_node_openpower_openbmc_perl.bundle b/xCAT-test/autotest/bundle/physical_node_openpower_openbmc_perl.bundle
new file mode 100644
index 000000000..e1ddfb6bb
--- /dev/null
+++ b/xCAT-test/autotest/bundle/physical_node_openpower_openbmc_perl.bundle
@@ -0,0 +1,26 @@
+#INCLUDE:hdctrl_openpower_openbmc.bundle#
+reg_linux_diskfull_installation_flat
+confignetwork_static_installnic
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+confignetwork__bridge_false
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
diff --git a/xCAT-test/autotest/bundle/physical_node_openpower_openbmc_python.bundle b/xCAT-test/autotest/bundle/physical_node_openpower_openbmc_python.bundle
new file mode 100644
index 000000000..c4dcbbc9d
--- /dev/null
+++ b/xCAT-test/autotest/bundle/physical_node_openpower_openbmc_python.bundle
@@ -0,0 +1,76 @@
+set_up_env_for_support_openbmc_in_python
+#INCLUDE:hdctrl_general.bundle#
+rinv_cpu
+rinv_dimm
+rinv_check_active_fw_count
+rinv_check_active_fw_count_verbose
+rinv_wrongbmcpasswd
+rvitals_wattage
+rvitals_fanspeed
+rvitals_power
+rvitals_altitude
+rsetboot_net_statcheck
+rsetboot_cd_statcheck
+rsetboot_default_statcheck
+rsetboot_h
+rsetboot_help
+rsetboot_v
+rsetboot_node_invalidnode
+rsetboot_noderange_net
+rsetboot_node_invalidaction
+rsetboot_group_net
+rspconfig_set_ip
+rspconfig_ip_invalid
+rspconfig_ip_null
+rspconfig_set_netmask
+rspconfig_netmask_invalid
+rspconfig_set_gateway
+rspconfig_gateway_invalid
+rspconfig_node_invalid
+rspconfig_list_all
+rspconfig_list_gateway
+rspconfig_list_ip
+rspconfig_list_netmask
+rspconfig_list_vlan
+rspconfig_noderange_invalid
+rspconfig_set_all_invalid
+rspconfig_set_vlan
+rspconfig_set_vlan_invalid
+rspconfig_set_hostname_equal_star_with_bmc_is_ip
+rspconfig_set_hostname_equal_star_with_bmc_is_hostname
+rspconfig_get_hostname
+rspconfig_hostname_with_error_input
+rspconfig_set_hostname
+rspconfig_set_admin_passwd_with_error_input
+rspconfig_set_admin_passwd_with_error_origin_password
+rspconfig_sshcfg_with_error_input
+reventlog_s_openbmc
+rpower_softoff
+rpower_suspend_OpenpowerBmc
+rpower_wake_OpenpowerBmc
+rpower_errorcommand_OpenpowerBmc
+reg_linux_diskfull_installation_flat
+confignetwork_static_installnic
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+confignetwork__bridge_false
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
diff --git a/xCAT-test/autotest/bundle/physical_node_power_hmc.bundle b/xCAT-test/autotest/bundle/physical_node_power_hmc.bundle
new file mode 100644
index 000000000..5eff8ec15
--- /dev/null
+++ b/xCAT-test/autotest/bundle/physical_node_power_hmc.bundle
@@ -0,0 +1,28 @@
+#INCLUDE:hdctrl_ppc_hmc.bundle#
+reg_linux_diskfull_installation_flat
+confignetwork_static_installnic
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+confignetwork__bridge_false
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat
diff --git a/xCAT-test/autotest/bundle/physical_node_x86_ipmi.bundle b/xCAT-test/autotest/bundle/physical_node_x86_ipmi.bundle
new file mode 100644
index 000000000..c452eec75
--- /dev/null
+++ b/xCAT-test/autotest/bundle/physical_node_x86_ipmi.bundle
@@ -0,0 +1,28 @@
+#INCLUDE:hdctrl_bmc.bundle#
+reg_linux_diskfull_installation_flat
+confignetwork_static_installnic
+confignetwork_s_installnic_secondarynic_updatenode
+confignetwork_secondarynic_updatenode
+confignetwork_secondarynic_nicaliases_updatenode
+confignetwork_secondarynic_nicextraparams_updatenode
+confignetwork_disable_set_to_yes
+confignetwork_disable_set_to_1
+confignetwork_niccustomscripts
+confignetwork_secondarynic_thirdnic_multiplevalue_updatenode
+confignetwork_secondarynic_nicnetworks_updatenode_false
+confignetwork_secondarynic_nicips_updatenode_false
+confignetwork_secondarynic_nictype_updatenode_false
+confignetwork_2eth_bridge_br0
+confignetwork_2eth_bridge_br22_br33
+confignetwork_bond_eth2_eth3
+confignetwork_bond_false
+confignetwork_installnic_2eth_bridge_br22_br33
+confignetwork_vlan_bond
+confignetwork_vlan_eth0
+confignetwork_vlan_false
+confignetwork__bridge_false
+makeconservercf_null
+makeconservercf_noderange
+makeconservercf_d
+reg_linux_diskless_installation_flat
+reg_linux_statelite_installation_flat