From 74932360b5fdb8af5684e43dbb964fa10b1521c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 2 Feb 2024 17:15:18 +0800 Subject: [PATCH] fix(region): ipv6 free ip (#19418) --- pkg/compute/models/guestnetworks.go | 2 +- pkg/compute/models/networks.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/guestnetworks.go b/pkg/compute/models/guestnetworks.go index 4f249c428a..2e712a0d3a 100644 --- a/pkg/compute/models/guestnetworks.go +++ b/pkg/compute/models/guestnetworks.go @@ -392,7 +392,7 @@ func (manager *SGuestnetworkManager) newGuestNetwork( } } - ip6Addr, err := network.GetFreeIP(ctx, userCred, addrTable, recentAddrTable, address, allocDir, reserved, api.AddressTypeIPv6) + ip6Addr, err := network.GetFreeIP(ctx, userCred, addrTable, recentAddrTable, address6, allocDir, reserved, api.AddressTypeIPv6) if err != nil { return nil, errors.Wrap(err, "GetFreeIPv6") } diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index ec9b615c97..6c80a1a98c 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -341,7 +341,7 @@ func (snet *SNetwork) getFreeIP6(addrTable map[string]bool, recentUsedAddrTable return "", errors.Wrap(err, "NewIPV6Addr") } if !iprange.Contains(candIP) { - return "", httperrors.NewInputParameterError("candidate %s out of range", candidate) + return "", httperrors.NewInputParameterError("candidate %s out of range %s", candidate, iprange.String()) } if _, ok := addrTable[candidate]; !ok { return candidate, nil