Merge pull request #51 from kgube/feature/project-scoped-openstack-li…

…stings Scope IP and Port listings to current project
cloudandheat · Nov 3, 2023 · 2bcbe2c · 2bcbe2c
2 parents d7121d9 + 094e037
commit 2bcbe2c
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 8 deletions.
diff --git a/internal/openstack/client.go b/internal/openstack/client.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack"
+	tokens3 "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens"
 	"github.com/gophercloud/utils/openstack/clientconfig"
 
 	netutil "k8s.io/apimachinery/pkg/util/net"
@@ -64,8 +65,9 @@ type Config struct {
 }
 
 type OpenStackClient struct {
-	provider *gophercloud.ProviderClient
-	region   string
+	provider  *gophercloud.ProviderClient
+	region    string
+	projectID string
 }
 
 func (cfg AuthOpts) ToAuthOptions() gophercloud.AuthOptions {
@@ -143,9 +145,18 @@ func NewClient(cfg *AuthOpts) (*OpenStackClient, error) {
 		return nil, err
 	}
 
+	projectID := cfg.ProjectID
+	if projectID == "" {
+		projectID, err = getProjectID(provider)
+		if err != nil {
+			return nil, err
+		}
+	}
+
 	return &OpenStackClient{
-		provider: provider,
-		region:   cfg.Region,
+		provider:  provider,
+		region:    cfg.Region,
+		projectID: projectID,
 	}, nil
 }
 
@@ -154,3 +165,23 @@ func (client *OpenStackClient) NewNetworkV2() (*gophercloud.ServiceClient, error
 		Region: client.region,
 	})
 }
+
+// Extract project ID from the provider client authentication result.
+func getProjectID(provider *gophercloud.ProviderClient) (string, error) {
+	authResult := provider.GetAuthResult()
+	if authResult == nil {
+		return "", fmt.Errorf("no AuthResult from provider client")
+	}
+
+	// We expect only identity v3 tokens
+	token, ok := authResult.(tokens3.CreateResult)
+	if !ok {
+		return "", fmt.Errorf("unexpected AuthResult type %t", authResult)
+	}
+
+	project, err := token.ExtractProject()
+	if err != nil {
+		return "", err
+	}
+	return project.ID, nil
+}
diff --git a/internal/openstack/port_manager.go b/internal/openstack/port_manager.go
@@ -63,6 +63,7 @@ func (opts CustomCreateOpts) ToPortCreateMap() (map[string]interface{}, error) {
 type OpenStackL3PortManager struct {
 	client    *gophercloud.ServiceClient
 	networkID string
+	projectID string
 	cfg       *NetworkingOpts
 	ports     PortClient
 }
@@ -84,10 +85,12 @@ func (client *OpenStackClient) NewOpenStackL3PortManager(networkConfig *Networki
 		client:    networkingclient,
 		cfg:       networkConfig,
 		networkID: networkID,
+		projectID: client.projectID,
 		ports: NewPortClient(
 			networkingclient,
 			TagLBManagedPort,
 			networkConfig.UseFloatingIPs,
+			client.projectID,
 		),
 	}, nil
 }
@@ -205,7 +208,8 @@ func (pm *OpenStackL3PortManager) deleteUnusedFloatingIPs() error {
 	pager := floatingipsv2.List(
 		pm.client,
 		floatingipsv2.ListOpts{
-			Tags: TagLBManagedPort,
+			Tags:      TagLBManagedPort,
+			ProjectID: pm.projectID,
 		},
 	)
 

diff --git a/internal/openstack/ports.go b/internal/openstack/ports.go
@@ -32,25 +32,27 @@ type UncachedClient struct {
 	client         *gophercloud.ServiceClient
 	tag            string
 	useFloatingIPs bool
+	projectID      string
 }
 
 type PortClient interface {
 	GetPorts() ([]portsv2.Port, error)
 	GetPortByID(ID string) (*portsv2.Port, *floatingipsv2.FloatingIP, error)
 }
 
-func NewPortClient(networkingclient *gophercloud.ServiceClient, tag string, useFloatingIPs bool) *UncachedClient {
+func NewPortClient(networkingclient *gophercloud.ServiceClient, tag string, useFloatingIPs bool, projectID string) *UncachedClient {
 	return &UncachedClient{
 		client:         networkingclient,
 		tag:            tag,
 		useFloatingIPs: useFloatingIPs,
+		projectID:      projectID,
 	}
 }
 
 func (pc *UncachedClient) GetPorts() (ports []portsv2.Port, err error) {
 	err = portsv2.List(
 		pc.client,
-		portsv2.ListOpts{Tags: pc.tag},
+		portsv2.ListOpts{Tags: pc.tag, ProjectID: pc.projectID},
 	).EachPage(func(page pagination.Page) (bool, error) {
 		fetched_ports, err := portsv2.ExtractPorts(page)
 		if err != nil {
@@ -79,7 +81,7 @@ func (pc *UncachedClient) GetPortByID(ID string) (port *portsv2.Port, fip *float
 	if pc.useFloatingIPs {
 		err = floatingipsv2.List(
 			pc.client,
-			floatingipsv2.ListOpts{Tags: pc.tag, PortID: ID},
+			floatingipsv2.ListOpts{Tags: pc.tag, PortID: ID, ProjectID: pc.projectID},
 		).EachPage(func(page pagination.Page) (bool, error) {
 			fips, err := floatingipsv2.ExtractFloatingIPs(page)
 			if err != nil {