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 #11949 from tb365/automated-cherry-pick-of-#11948-upstream-release-3.7

Browse Source 
Automated cherry pick of #11948: huawei cloud getInstanceByIP add ip filter
This commit is contained in:
Zexi Li
2021-08-19 14:26:42 +08:00
committed by GitHub
parent 0bcfe82417 7c026aa8d8
commit bbd3988c2f
2 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/huawei/loadbalancer_backend.go
+9 -12
View File
@@ -19,7 +19,6 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/utils"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudprovider"
@@ -144,23 +143,21 @@ func (self *SRegion) getInstanceByIP(privateIP string) (*SInstance, error) {
queries["project_id"] = self.client.projectId
}
if len(privateIP) > 0 {
queries["ip"] = privateIP
}
instances := make([]SInstance, 0)
err := doListAllWithOffset(self.ecsClient.Servers.List, queries, &instances)
if err != nil {
return nil, err
}
for _, instance := range instances {
ips := []string{}
for _, addresses := range instance.Addresses {
for _, ip := range addresses {
ips = append(ips, ip.Addr)
}
}
if utils.IsInStringArray(privateIP, ips) {
return &instance, nil
}
if len(instances) == 1 {
return &instances[0], nil
} else if len(instances) > 1 {
log.Warningln("SRegion.getInstanceByIP %s result: multiple server find", privateIP)
return &instances[0], nil
}
return nil, cloudprovider.ErrNotFound
pkg/multicloud/huaweistack/loadbalancer_backend.go
+9 -12
View File
@@ -19,7 +19,6 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/utils"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudprovider"
@@ -148,23 +147,21 @@ func (self *SRegion) getInstanceByIP(privateIP string) (*SInstance, error) {
queries["project_id"] = self.client.projectId
}
if len(privateIP) > 0 {
queries["ip"] = privateIP
}
instances := make([]SInstance, 0)
err := doListAllWithOffset(self.ecsClient.Servers.List, queries, &instances)
if err != nil {
return nil, err
}
for _, instance := range instances {
ips := []string{}
for _, addresses := range instance.Addresses {
for _, ip := range addresses {
ips = append(ips, ip.Addr)
}
}
if utils.IsInStringArray(privateIP, ips) {
return &instance, nil
}
if len(instances) == 1 {
return &instances[0], nil
} else if len(instances) > 1 {
log.Warningln("SRegion.getInstanceByIP %s result: multiple server find", privateIP)
return &instances[0], nil
}
return nil, cloudprovider.ErrNotFound