opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10162 from ioito/hotfix/qx-server-detach-network

Browse Source 
fix(region): struct input for detach server network
This commit is contained in:
Zexi Li
2021-03-18 10:18:20 +08:00
committed by GitHub
parent a263fb853a 95a9327d90
commit a3f0e40408
2 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/guests.go
+11
View File
@@ -507,3 +507,14 @@ type ServerDeleteInput struct {
// default: false
DeleteDisks bool
}
type ServerDetachnetworkInput struct {
// 是否保留IP地址(ip地址会进入到预留ip)
Reserve bool `json:"reserve"`
// 通过IP子网地址, 优先级最高
NetId string `json:"net_id"`
// 通过IP解绑网卡, 优先级高于mac
IpAddr string `json:"ip_addr"`
// 通过Mac解绑网卡, 优先级低于ip_addr
Mac string `json:"mac"`
}
pkg/compute/models/guest_actions.go
+25 -33
View File
@@ -51,6 +51,7 @@ import (
"yunion.io/x/onecloud/pkg/cloudcommon/notifyclient"
"yunion.io/x/onecloud/pkg/cloudcommon/policy"
"yunion.io/x/onecloud/pkg/cloudcommon/userdata"
"yunion.io/x/onecloud/pkg/cloudcommon/validators"
"yunion.io/x/onecloud/pkg/cloudprovider"
guestdriver_types "yunion.io/x/onecloud/pkg/compute/guestdrivers/types"
"yunion.io/x/onecloud/pkg/compute/options"
@@ -2188,65 +2189,56 @@ func (self *SGuest) AllowPerformDetachnetwork(ctx context.Context, userCred mccl
return self.IsOwner(userCred) || db.IsAdminAllowPerform(userCred, self, "detachnetwork")
}
func (self *SGuest) PerformDetachnetwork(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
func (self *SGuest) PerformDetachnetwork(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input api.ServerDetachnetworkInput) (jsonutils.JSONObject, error) {
if !utils.IsInStringArray(self.Status, []string{api.VM_READY, api.VM_RUNNING}) {
return nil, httperrors.NewInvalidStatusError("Cannot detach network in status %s", self.Status)
}
if err := self.GetDriver().ValidateDetachNetwork(ctx, userCred, self); err != nil {
err := self.GetDriver().ValidateDetachNetwork(ctx, userCred, self)
if err != nil {
return nil, err
}
var (
reserve = jsonutils.QueryBoolean(data, "reserve", false)
netStr, _ = data.GetString("net_id")
gns []SGuestnetwork
err error
)
if len(netStr) > 0 {
netObj, err := NetworkManager.FetchByIdOrName(userCred, netStr)
var gns []SGuestnetwork
if len(input.NetId) > 0 {
netObj, err := validators.ValidateModel(userCred, NetworkManager, &input.NetId)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(NetworkManager.Keyword(), netStr)
}
return nil, httperrors.NewGeneralError(err)
return nil, err
}
gns, err = self.GetNetworks(netObj.GetId())
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
}
ipStr, _ := data.GetString("ip_addr")
if len(ipStr) > 0 {
gn, err := self.GetGuestnetworkByIp(ipStr)
} else if len(input.IpAddr) > 0 {
gn, err := self.GetGuestnetworkByIp(input.IpAddr)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewNotFoundError("ip %s not found", ipStr)
return nil, httperrors.NewNotFoundError("ip %s not found", input.IpAddr)
}
return nil, httperrors.NewGeneralError(err)
}
gns = []SGuestnetwork{*gn}
}
macStr, _ := data.GetString("mac")
if len(macStr) > 0 {
gn, err := self.GetGuestnetworkByMac(macStr)
} else if len(input.Mac) > 0 {
gn, err := self.GetGuestnetworkByMac(input.Mac)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewNotFoundError("mac %s not found", macStr)
return nil, httperrors.NewNotFoundError("mac %s not found", input.Mac)
}
return nil, httperrors.NewGeneralError(err)
}
gns = []SGuestnetwork{*gn}
}
if self.Status == api.VM_READY {
err = self.detachNetworks(ctx, userCred, gns, reserve, true)
return nil, err
} else {
err = self.detachNetworks(ctx, userCred, gns, reserve, false)
if err != nil {
return nil, err
}
return nil, self.StartSyncTask(ctx, userCred, false, "")
return nil, httperrors.NewMissingParameterError("net_id")
}
if self.Status == api.VM_READY {
return nil, self.detachNetworks(ctx, userCred, gns, input.Reserve, true)
}
err = self.detachNetworks(ctx, userCred, gns, input.Reserve, false)
if err != nil {
return nil, err
}
return nil, self.StartSyncTask(ctx, userCred, false, "")
}
func (self *SGuest) AllowPerformAttachnetwork(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {