Take care of two code comments:

(1) Port list to get trunk details
(2) Back out feature action flag trunk-support-enabled

Author: Jing Zhang

pkg/openstack/instances.go

@@ -45,7 +45,6 @@ import (
 	"k8s.io/cloud-provider-openstack/pkg/util"
 	"k8s.io/cloud-provider-openstack/pkg/util/errors"
 	"k8s.io/cloud-provider-openstack/pkg/util/metadata"
-	"k8s.io/cloud-provider-openstack/pkg/util/openstack"
 )
 
 // Instances encapsulates an implementation of Instances for OpenStack.
@@ -641,9 +640,9 @@ func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts Netwo
 	}
 
 	// Add the private addresses that are not directly connected
-	if len(addresses) < len(allPrivates) && networkingOpts.TrunkSupportEnabled {
+	if len(addresses) < len(allPrivates) {
 		numExtraPrivates := addExtraNodeAddresses(addresses, allPrivates)
-		klog.V(5).Infof("Node '%s' is added %d extra private interfaces '%s'", srv.Name, numExtraPrivates, addresses)
+		klog.V(5).Infof("Node '%s' is added %d extra private interfaces", srv.Name, numExtraPrivates)
 	}
 
 	var networks []string
@@ -754,56 +753,47 @@ func getAttachedPorts(client *gophercloud.ServiceClient, networkingOpts Networki
 		DeviceOwner: "compute:nova",
 	}
 
-	interfaces, err := openstack.GetPorts(client, listOpts)
+	type portWithTrunkDetails struct {
+		ports.Port
+		trunk_details.TrunkDetailsExt
+	}
+
+	var interfaces []ports.Port
+	var allPorts []portWithTrunkDetails
+
+	allPages, err := ports.List(client, listOpts).AllPages()
 	if err != nil {
 		return interfaces, err
 	}
-	if networkingOpts.TrunkSupportEnabled {
-		subInterfaces, err := getSubInterfaces(client, interfaces)
-		if err != nil {
-			return interfaces, err
-		}
-		interfaces = append(interfaces, subInterfaces...)
+	err = ports.ExtractPortsInto(allPages, &allPorts)
+	if err != nil {
+		return interfaces, err
 	}
 
-	return interfaces, nil
-}
-
-// getSubInterfaces returns the sub-interfaces attached via trunks to the specified interfaces
-func getSubInterfaces(client *gophercloud.ServiceClient, interfaces []ports.Port) ([]ports.Port, error) {
-	var subports []ports.Port
-	var portExt struct {
-		ports.Port
-		trunk_details.TrunkDetailsExt
-	}
-	for _, iface := range interfaces {
-		// Check if trunk is attached to the interface
-		err := ports.Get(client, iface.ID).ExtractInto(&portExt)
-		if err != nil {
-			klog.Errorf("Failed to get port %s trunk_details: %v", iface.ID, err)
-			return subports, nil
-		}
+	for _, portExt := range allPorts {
+		interfaces = append(interfaces, portExt.Port)
+		// Check if trunk is attached to the port
 		if portExt.TrunkDetails.TrunkID == "" {
 			continue
 		}
-		// Get subports attached to the trunk
+		// Get subport addresses
 		for _, subport := range portExt.TrunkDetails.SubPorts {
 			p, err := ports.Get(client, subport.PortID).Extract()
 			if err != nil {
 				klog.Errorf("Failed to get subport %s details: %v", subport.PortID, err)
-				return subports, nil
+				continue
 			}
 			n, err := networks.Get(client, p.NetworkID).Extract()
 			if err != nil {
 				klog.Errorf("Failed to get subport %s network details: %v", subport.PortID, err)
-				return subports, nil
+				continue
 			}
 			p.Status = "ACTIVE"
 			p.NetworkID = n.Name
-			subports = append(subports, *p)
+			interfaces = append(interfaces, *p)
 		}
-		klog.V(5).Infof("Node interface %s has %d sub-interfaces '%v'", iface.Name, len(subports), subports)
-
 	}
-	return subports, nil
+
+	klog.V(5).Infof("Node %s has %d interfaces '%v'", serverID, len(interfaces), interfaces)
+	return interfaces, nil
 }