From f7ee73934a9047c78ea369a155bde2db35c5e0fa Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Tue, 15 Jan 2019 11:43:29 +0800 Subject: [PATCH] fix network split --- pkg/compute/models/networks.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index d7382e1661..052c573e93 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -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 })