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

Automatic merge from release/2.5.0 -> release/2.6.0

Browse Source 
* commit 'ffc4a51b9757665c2e2253503a6ad5ac8478f850':
  fix network split
This commit is contained in:
邱剑
2019-01-15 12:03:17 +08:00
parent 74105ea108 ffc4a51b97
commit ea4c429f46
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/networks.go
+3 -3
View File
@@ -1656,9 +1656,9 @@ func (self *SNetwork) PerformSplit(ctx context.Context, userCred mcclient.TokenC
if len(name) > 0 {
if err := db.NewNameValidator(NetworkManager, userCred.GetProjectId(), name); err != nil {
return nil, httperrors.NewInputParameterError("Duplicate name %s", name)
} else {
name = db.GenerateName(NetworkManager, userCred.GetProjectId(), fmt.Sprintf("%s#", self.Name))
}
} else {
name = db.GenerateName(NetworkManager, userCred.GetProjectId(), fmt.Sprintf("%s#", self.Name))
}
network := &SNetwork{}
@@ -1687,7 +1687,7 @@ func (self *SNetwork) PerformSplit(ctx context.Context, userCred mcclient.TokenC
network.SetModelManager(NetworkManager)
self.GetModelManager().TableSpec().Update(self, func() error {
self.GuestIpEnd = iSplitIp.StepUp().String()
self.GuestIpEnd = iSplitIp.StepDown().String()
return nil
})