From 9201d7fb99b417e1e8d177477c692d4d103011e7 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Thu, 17 Jan 2019 11:51:29 +0800 Subject: [PATCH] fix network merge --- pkg/compute/models/networks.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index 052c573e93..0fdd9b6ace 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -1529,7 +1529,7 @@ func (self *SNetwork) PerformMerge(ctx context.Context, userCred mcclient.TokenC if ipNE.StepUp() == ipSS { startIp, endIp = net.GuestIpStart, self.GuestIpEnd - } else if ipSE == ipNS { + } else if ipSE.StepUp() == ipNS { startIp, endIp = self.GuestIpStart, net.GuestIpEnd } else { note := "Incontinuity Network for %s and %s"