opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16384 from ioito/hotfix/qx-vender-update-openstack-nic

Browse Source 
fix(region): vendor update for openstack nic
This commit is contained in:
Zexi Li
2023-04-07 18:44:58 +08:00
committed by GitHub
parent bf96485591 d8531624e5
commit 01aa753847
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -83,7 +83,7 @@ require (
k8s.io/client-go v0.19.3
k8s.io/cluster-bootstrap v0.19.3
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230407021603-b6a10ceb21d1
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230407095611-39a9ba527094
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd
yunion.io/x/log v1.0.0
go.sum
+2 -2
View File
@@ -1164,8 +1164,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230407021603-b6a10ceb21d1 h1:3k+/5AfeDT/TPKOubnbEuOR+OfpBOhVs2h7xe/x9Iiw=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230407021603-b6a10ceb21d1/go.mod h1:VBAtfyGMDW11x5JmF0vUEmn/PmNpZ8CKBAQCiyz+cDY=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230407095611-39a9ba527094 h1:PqPoLi4z31X08y8hTtt+LyuXRigO1tezic3LRVv9Ml0=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230407095611-39a9ba527094/go.mod h1:VBAtfyGMDW11x5JmF0vUEmn/PmNpZ8CKBAQCiyz+cDY=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1442,7 +1442,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
## explicit; go 1.12
sigs.k8s.io/yaml
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230407021603-b6a10ceb21d1
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230407095611-39a9ba527094
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/instancenic.go
Generated Vendored
+11 -2
View File
@@ -90,9 +90,18 @@ func (nic *SInstancePort) GetINetworkId() string {
if regutils.MatchIPAddr(nic.FixedIps[i].IpAddress) {
network, err := nic.region.GetNetwork(nic.FixedIps[i].SubnetId)
if err != nil {
return nic.FixedIps[i].SubnetId
continue
}
pools := network.AllocationPools
for j := range pools {
if !pools[j].IsValid() {
continue
}
network.AllocationPools = []AllocationPool{pools[j]}
if network.Contains(nic.FixedIps[i].IpAddress) {
return network.GetGlobalId()
}
}
return network.GetGlobalId()
}
}
return ""