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

vm online detach network

Browse Source
This commit is contained in:
wanyaoqi
2020-03-30 21:30:44 +08:00
parent e86909c43a
commit 790f9fc1a3
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+19 -10
View File
@@ -2030,12 +2030,16 @@ func (self *SGuest) AllowPerformDetachnetwork(ctx context.Context, userCred mccl
}
func (self *SGuest) PerformDetachnetwork(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
if self.Status != api.VM_READY {
if !utils.IsInStringArray(self.Status, []string{api.VM_READY, api.VM_RUNNING}) {
return nil, httperrors.NewInvalidStatusError("Cannot detach network in status %s", self.Status)
}
reserve := jsonutils.QueryBoolean(data, "reserve", false)
var (
reserve = jsonutils.QueryBoolean(data, "reserve", false)
netStr, _ = data.GetString("net_id")
gns []SGuestnetwork
err error
)
netStr, _ := data.GetString("net_id")
if len(netStr) > 0 {
netObj, err := NetworkManager.FetchByIdOrName(userCred, netStr)
if err != nil {
@@ -2044,12 +2048,10 @@ func (self *SGuest) PerformDetachnetwork(ctx context.Context, userCred mcclient.
}
return nil, httperrors.NewGeneralError(err)
}
gns, err := self.GetNetworks(netObj.GetId())
gns, err = self.GetNetworks(netObj.GetId())
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
err = self.detachNetworks(ctx, userCred, gns, reserve, true)
return nil, err
}
ipStr, _ := data.GetString("ip_addr")
if len(ipStr) > 0 {
@@ -2060,8 +2062,7 @@ func (self *SGuest) PerformDetachnetwork(ctx context.Context, userCred mcclient.
}
return nil, httperrors.NewGeneralError(err)
}
err = self.detachNetworks(ctx, userCred, []SGuestnetwork{*gn}, reserve, true)
return nil, err
gns = []SGuestnetwork{*gn}
}
macStr, _ := data.GetString("mac")
if len(macStr) > 0 {
@@ -2072,10 +2073,18 @@ func (self *SGuest) PerformDetachnetwork(ctx context.Context, userCred mcclient.
}
return nil, httperrors.NewGeneralError(err)
}
err = self.detachNetworks(ctx, userCred, []SGuestnetwork{*gn}, reserve, true)
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.NewInputParameterError("no either ip_addr, mac or network specified")
}
func (self *SGuest) AllowPerformAttachnetwork(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {