From 08f92a8d89aab3f14a98008380132cb3a6f42619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Mon, 5 Feb 2024 11:24:10 +0800 Subject: [PATCH] fix(region): cloudpods ipv6 sync (#19445) --- pkg/compute/models/networks.go | 3 +++ pkg/mcclient/cloudpods/vpc.go | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index 1a734fdc41..79bbf3b771 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -333,6 +333,9 @@ func isIpUsed(ipstr string, addrTable map[string]bool, recentUsedAddrTable map[s } func (snet *SNetwork) getFreeIP6(addrTable map[string]bool, recentUsedAddrTable map[string]bool, candidate string) (string, error) { + if !snet.IsSupportIPv6() { + return "", errors.Wrapf(cloudprovider.ErrNotSupported, "ipv6") + } iprange := snet.getIPRange6() // Try candidate first if len(candidate) > 0 { diff --git a/pkg/mcclient/cloudpods/vpc.go b/pkg/mcclient/cloudpods/vpc.go index bbb5eca584..bdb380227b 100644 --- a/pkg/mcclient/cloudpods/vpc.go +++ b/pkg/mcclient/cloudpods/vpc.go @@ -60,6 +60,10 @@ func (self *SVpc) GetCidrBlock() string { return self.CidrBlock } +func (self *SVpc) GetCidrBlock6() string { + return self.CidrBlock6 +} + func (self *SVpc) GetIRouteTableById(id string) (cloudprovider.ICloudRouteTable, error) { return nil, cloudprovider.ErrNotImplemented }