Automatic merge from release/2.2.0 -> release/2.3.0

* commit '2f9e835f3ec3a6c3e59bdf03e3f08e21df07c0d3':
  适配裸金属服务器操作状态
This commit is contained in:
邱剑
2018-11-12 20:13:32 +08:00
+12
View File
@@ -76,6 +76,18 @@ func (self *SBaremetalGuestDriver) PrepareDiskRaidConfig(host *models.SHost, par
}
}
func (self *SBaremetalGuestDriver) GetRebuildRootStatus() ([]string, error) {
return []string{models.VM_READY, models.VM_ADMIN}, nil
}
func (self *SBaremetalGuestDriver) GetChangeConfigStatus() ([]string, error) {
return nil, httperrors.NewUnsupportOperationError("Cannot change config for baremtal")
}
func (self *SBaremetalGuestDriver) GetDeployStatus() ([]string, error) {
return []string{models.VM_READY, models.VM_ADMIN}, nil
}
func (self *SBaremetalGuestDriver) GetNamedNetworkConfiguration(guest *models.SGuest, userCred mcclient.TokenCredential, host *models.SHost, netConfig *models.SNetworkConfig) (*models.SNetwork, string, int8, models.IPAddlocationDirection) {
netif, net := host.GetNetinterfaceWithNetworkAndCredential(netConfig.Network, userCred, netConfig.Reserved)
if netif != nil {