Skip to content

🐛 Include more device_owners when looking for a port for floating ip #1996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Apr 9, 2024
+16 −2
Merged

🐛 Include more device_owners when looking for a port for floating ip #1996

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions pkg/cloud/services/networking/port.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"strings"
"time"

"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/portsbinding"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/portsecurity"
"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
Expand Down Expand Up @@ -58,6 +59,19 @@ func (s *Service) GetPortFromInstanceIP(instanceID string, ip string) ([]ports.P
return s.client.ListPort(portOpts)
}

type PortListOpts struct {
DeviceOwner []string `q:"device_owner"`
NetworkID string `q:"network_id"`
}
Comment on lines +62 to +65

@dulek dulek Apr 5, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pierreprinetti: I know you've been looking at this from Gophercloud perspective. Is this the way to go here?

@mdbooth mdbooth Apr 9, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually hopefully not, but I think this is the only way to go currently.


func (p *PortListOpts) ToPortListQuery() (string, error) {
q, err := gophercloud.BuildQueryString(p)
if err != nil {
return "", err
}
return q.String(), nil
}

func (s *Service) GetPortForExternalNetwork(instanceID string, externalNetworkID string) (*ports.Port, error) {
instancePortsOpts := ports.ListOpts{
DeviceID: instanceID,
Expand All @@ -68,9 +82,9 @@ func (s *Service) GetPortForExternalNetwork(instanceID string, externalNetworkID
}

for _, instancePort := range instancePorts {
networkPortsOpts := ports.ListOpts{
networkPortsOpts := &PortListOpts{
NetworkID: instancePort.NetworkID,
DeviceOwner: "network:router_interface",
DeviceOwner: []string{"network:router_interface", "network:router_interface_distributed", "network:ha_router_replicated_interface", "network:router_ha_interface"},

@mdbooth mdbooth Apr 9, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the stuff I'd really like to push into the domain of gophercloud.

}

networkPorts, err := s.client.ListPort(networkPortsOpts)
Expand Down