From c91ad4a705e22a9adf7a813d5eb8ca199e8cb6fe Mon Sep 17 00:00:00 2001 From: rainzm Date: Thu, 17 Dec 2020 10:08:56 +0800 Subject: [PATCH] fix(region): exclude network recommended for host when suggesting network for guest --- pkg/compute/models/cloudaccounts.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/compute/models/cloudaccounts.go b/pkg/compute/models/cloudaccounts.go index 7666c0512b..53c7358f7f 100644 --- a/pkg/compute/models/cloudaccounts.go +++ b/pkg/compute/models/cloudaccounts.go @@ -655,6 +655,15 @@ func (scm *SCloudaccountManager) parseAndSuggest(params sParseAndSuggest) api.Cl } } + for i := range wireNet.HostSuggestedNetworks { + ipStart, _ := netutils.NewIPV4Addr(wireNet.HostSuggestedNetworks[i].GuestIpStart) + ipEnd, _ := netutils.NewIPV4Addr(wireNet.HostSuggestedNetworks[i].GuestIpEnd) + existedNetMap[ipStart] = simpleNet{} + if ipEnd != ipStart { + existedNetMap[ipEnd] = simpleNet{} + } + } + guests := make([]api.CAGuestNet, len(ni.VMs)) for i := range guests { guests[i].Name = ni.VMs[i].Name