Openstack port resources derived from network

pkg/resources/openstack/network.go

@@ -115,6 +115,14 @@ func (os *clusterDiscoveryOS) ListNetwork() ([]*resources.Resource, error) {
 			resourceTrackers = append(resourceTrackers, resourceTracker)
 
 		}
+
+		// Ports
+		portTrackers, err := os.ListPorts(network)
+		if err != nil {
+			return resourceTrackers, err
+		}
+		resourceTrackers = append(resourceTrackers, portTrackers...)
+
 		resourceTracker := &resources.Resource{
 			Name: network.Name,
 			ID:   network.ID,

pkg/resources/openstack/openstack.go

@@ -47,7 +47,6 @@ func ListResources(cloud openstack.OpenstackCloud, clusterName string) (map[stri
 		os.ListInstances,
 		os.ListServerGroups,
 		os.ListVolumes,
-		os.ListPorts,
 		os.ListSecurityGroups,
 		os.ListNetwork,
 		os.ListDNSRecordsets,

pkg/resources/openstack/ports.go

@@ -17,39 +17,39 @@ limitations under the License.
 package openstack
 
 import (
-	"strings"
-
+	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
 	"k8s.io/kops/pkg/resources"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/openstack"
 )
 
 const (
-	typePort = "Port"
+	typePort        = "Port"
+	typeDynamicPort = "DynamicPort"
 )
 
-func (os *clusterDiscoveryOS) ListPorts() ([]*resources.Resource, error) {
+func (os *clusterDiscoveryOS) ListPorts(network networks.Network) ([]*resources.Resource, error) {
 	var resourceTrackers []*resources.Resource
 
-	ports, err := os.osCloud.ListPorts(ports.ListOpts{})
+	ports, err := os.osCloud.ListPorts(ports.ListOpts{
+		TenantID:  network.ProjectID,
+		NetworkID: network.ID,
+	})
 	if err != nil {
 		return nil, err
 	}
 
 	for _, port := range ports {
-		clusteReplaced := strings.Replace(os.clusterName, ".", "-", -1)
-		if strings.HasSuffix(port.Name, clusteReplaced) {
-			resourceTracker := &resources.Resource{
-				Name: port.Name,
-				ID:   port.ID,
-				Type: typePort,
-				Deleter: func(cloud fi.Cloud, r *resources.Resource) error {
-					return cloud.(openstack.OpenstackCloud).DeletePort(r.ID)
-				},
-			}
-			resourceTrackers = append(resourceTrackers, resourceTracker)
+		resourceTracker := &resources.Resource{
+			Name: port.Name,
+			ID:   port.ID,
+			Type: typePort,
+			Deleter: func(cloud fi.Cloud, r *resources.Resource) error {
+				return cloud.(openstack.OpenstackCloud).DeletePort(r.ID)
+			},
 		}
+		resourceTrackers = append(resourceTrackers, resourceTracker)
 	}
 	return resourceTrackers, nil
 }