Merge pull request #1013 from ioito/hotfix/qx-gcp-eip-list

fix(gcp): eip list without internal ip
yunionio · Jul 5, 2024 · 7fe0241 · 7fe0241
2 parents 6a30207 + 2077d73
commit 7fe0241
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/multicloud/google/eip.go b/pkg/multicloud/google/eip.go
@@ -16,6 +16,7 @@ package google
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"yunion.io/x/jsonutils"
@@ -49,9 +50,11 @@ type SAddress struct {
 func (region *SRegion) GetEips(address string, maxResults int, pageToken string) ([]SAddress, error) {
 	eips := []SAddress{}
 	params := map[string]string{}
+	filters := []string{"addressType=EXTERNAL"}
 	if len(address) > 0 {
-		params["filter"] = fmt.Sprintf(`address="%s"`, address)
+		filters = append(filters, fmt.Sprintf(`address="%s"`, address))
 	}
+	params["filter"] = strings.Join(filters, " ADN ")
 	resource := fmt.Sprintf("regions/%s/addresses", region.Name)
 	return eips, region.List(resource, params, maxResults, pageToken, &eips)
 }

diff --git a/pkg/multicloud/google/globaleip.go b/pkg/multicloud/google/globaleip.go
@@ -99,9 +99,12 @@ func (addr *SGlobalAddress) GetProjectId() string {
 func (region *SGlobalRegion) GetEips(address string) ([]SGlobalAddress, error) {
 	eips := []SGlobalAddress{}
 	params := map[string]string{}
+	filters := []string{"addressType=EXTERNAL"}
 	if len(address) > 0 {
-		params["filter"] = fmt.Sprintf(`address="%s"`, address)
+		filters = append(filters, fmt.Sprintf(`address="%s"`, address))
 	}
+	params["filter"] = strings.Join(filters, " ADN ")
+
 	resource := "global/addresses"
 
 	err := region.ListAll(resource, params, &eips)