Better code for review

Author: Jing Zhang

pkg/openstack/instances.go

@@ -19,13 +19,13 @@ package openstack
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"net"
 	sysos "os"
 	"regexp"
 	"sort"
 	"strings"
-	"unsafe"
 
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
@@ -638,53 +638,50 @@ func nodeAddresses(srv *servers.Server, ports []neutronports.Port, client *gophe
 
 	// Add the addresses assigned on subports via trunk
 	// This exposes the vlan networks to which subports are attached
+	subportAddresses := make(map[string][]Address)
+
 	type portWithTrunkDetails struct {
 		neutronports.Port
 		trunk_details.TrunkDetailsExt
 	}
+	var portDetails []portWithTrunkDetails
 
-	var subports []neutronports.Port
-	for _, port := range ports {
-		portExt := *((*portWithTrunkDetails)(unsafe.Pointer(&port)))
-		continue
-		// under testing
-		klog.V(5).Infof("Node '%s' port '%s' trunk_details '%v'", srv.Name, portExt.Name, portExt.TrunkDetails)
-		for _, subport := range portExt.TrunkDetails.SubPorts {
-			p, err := neutronports.Get(client, subport.PortID).Extract()
-			if err != nil {
-				klog.Errorf("Failed to get subport %s details: %v", subport.PortID, err)
-				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)
-				continue
+	bodyBytes, err := json.Marshal(ports)
+	if err == nil {
+		if json.Unmarshal(bodyBytes, &portDetails) == nil {
+			for _, portExt := range portDetails {
+				klog.V(5).Infof("Node '%s' port '%s' trunk_details '%v'", srv.Name, portExt.Name, portExt.TrunkDetails)
+				for _, subport := range portExt.TrunkDetails.SubPorts {
+					p, err := neutronports.Get(client, subport.PortID).Extract()
+					if err != nil {
+						klog.Errorf("Failed to get subport %s details: %v", subport.PortID, err)
+						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)
+						continue
+					}
+					for _, fixedIP := range p.FixedIPs {
+						isIPv6 := net.ParseIP(fixedIP.IPAddress).To4() == nil
+						if !(isIPv6 && networkingOpts.IPv6SupportDisabled) {
+							addr := Address{IPType: "fixed", Addr: fixedIP.IPAddress}
+							subportAddresses[n.Name] = append(subportAddresses[n.Name], addr)
+						}
+					}
+				}
 			}
-			p.NetworkID = n.Name
-			subports = append(subports, *p)
 		}
 	}
 
-	if len(subports) > 0 {
-		subportAddresses := make(map[string][]Address)
-		for _, subport := range subports {
-			for _, fixedIP := range subport.FixedIPs {
-				isIPv6 := net.ParseIP(fixedIP.IPAddress).To4() == nil
-				if !(isIPv6 && networkingOpts.IPv6SupportDisabled) {
-					addr := Address{IPType: "fixed", Addr: fixedIP.IPAddress}
-					subportAddresses[subport.NetworkID] = append(subportAddresses[subport.NetworkID], addr)
-				}
-			}
-		}
-		for nw, ips := range subportAddresses {
-			srvAddresses, ok := addresses[nw]
-			if !ok {
-				addresses[nw] = ips
-			} else {
-				// this is to take care the corner case
-				// where the same network is attached to the node both directly and via trunk
-				addresses[nw] = append(srvAddresses, ips...)
-			}
+	for nw, ips := range subportAddresses {
+		srvAddresses, ok := addresses[nw]
+		if !ok {
+			addresses[nw] = ips
+		} else {
+			// this is to take care the corner case
+			// where the same network is attached to the node both directly and via trunk
+			addresses[nw] = append(srvAddresses, ips...)
 		}
 	}