@@ -583,7 +583,7 @@ func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts Netwo
583583 addrs := []v1.NodeAddress {}
584584
585585 // parse private IP addresses first in an ordered manner
586- allPrivates := make (map [string ][]Address )
586+ addressesByNetworkID := make (map [string ][]Address )
587587 for _ , port := range ports {
588588 for _ , fixedIP := range port .FixedIPs {
589589 if port .Status == "ACTIVE" {
@@ -595,10 +595,8 @@ func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts Netwo
595595 Address : fixedIP .IPAddress ,
596596 },
597597 )
598- if port .NetworkID != "" {
599- addr := Address {IPType : "fixed" , Addr : fixedIP .IPAddress }
600- allPrivates [port .NetworkID ] = append (allPrivates [port .NetworkID ], addr )
601- }
598+ addr := Address {IPType : "fixed" , Addr : fixedIP .IPAddress }
599+ addressesByNetworkID [port .NetworkID ] = append (addressesByNetworkID [port .NetworkID ], addr )
602600 }
603601 }
604602 }
@@ -639,10 +637,11 @@ func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts Netwo
639637 return nil , err
640638 }
641639
642- // Add the private addresses that are not directly connected
643- if len (addresses ) < len (allPrivates ) {
644- numExtraPrivates := addExtraNodeAddresses (addresses , allPrivates )
645- klog .V (5 ).Infof ("Node '%s' is added %d extra private interfaces" , srv .Name , numExtraPrivates )
640+ // Add the addresses assigned on subports via trunk
641+ // This adds the vlan networks to which subports are attached
642+ if len (addresses ) < len (addressesByNetworkID ) {
643+ nrSubportAddresses := addSubportNodeAddresses (addresses , addressesByNetworkID )
644+ klog .V (5 ).Infof ("Node '%s' is added %d subport addresses" , srv .Name , nrSubportAddresses )
646645 }
647646
648647 var networks []string
@@ -698,38 +697,40 @@ func nodeAddresses(srv *servers.Server, ports []ports.Port, networkingOpts Netwo
698697 return addrs , nil
699698}
700699
701- // addExtraNodeAddresses addes addresses attached via trunk
702- func addExtraNodeAddresses (addresses , allPrivates map [string ][]Address ) int {
703- extraPrivates := make (map [string ][]Address )
704- for network , interfaceAddresses := range allPrivates {
700+ // addSubportNodeAddresses adds addresses assigned on subports
701+ func addSubportNodeAddresses (addresses , addressesByNetworkID map [string ][]Address ) int {
702+ subportAddresses := make (map [string ][]Address )
703+ for network , portAddresses := range addressesByNetworkID {
705704 found := false
706- // For each address in the private network
707- for _ , interfaceAddress := range interfaceAddresses {
708- // Check if the address is directly assigned
705+ for _ , portAddress := range portAddresses {
706+ // Check if the address is directly attached to the node
709707 for _ , nodeAddresses := range addresses {
710708 for _ , nodeAddress := range nodeAddresses {
711- if interfaceAddress .Addr == nodeAddress .Addr {
709+ if portAddress .Addr == nodeAddress .Addr {
712710 found = true
713711 break
714712 }
715713 }
716714 }
717715 }
718- // All the addresses in the private network are not directly assigned
719- // Save the private network
716+ // All the addresses in the vlan network are not directly attached to the node
717+ // Save the vlan network
720718 if ! found {
721- extraPrivates [network ] = interfaceAddresses
719+ subportAddresses [network ] = portAddresses
722720 }
723721 }
724- for network , interfaceAddresses := range extraPrivates {
722+ // add subport addresses to the node addresses
723+ for network , portAddresses := range subportAddresses {
725724 srvAddresses , ok := addresses [network ]
726725 if ! ok {
727- addresses [network ] = interfaceAddresses
726+ addresses [network ] = portAddresses
728727 } else {
729- addresses [network ] = append (srvAddresses , interfaceAddresses ... )
728+ // this is to take care the corner case
729+ // where the same network is attached to the node both directly and via trunk
730+ addresses [network ] = append (srvAddresses , portAddresses ... )
730731 }
731732 }
732- return len (extraPrivates )
733+ return len (subportAddresses )
733734}
734735
735736func getAddressesByName (client * gophercloud.ServiceClient , name types.NodeName , networkingOpts NetworkingOpts ) ([]v1.NodeAddress , error ) {
@@ -758,24 +759,20 @@ func getAttachedPorts(client *gophercloud.ServiceClient, serverID string) ([]por
758759 trunk_details.TrunkDetailsExt
759760 }
760761
761- var interfaces []ports.Port
762- var allPorts []portWithTrunkDetails
762+ var allPorts []ports.Port
763+ var allPortDetails []portWithTrunkDetails
763764
764765 allPages , err := ports .List (client , listOpts ).AllPages ()
765766 if err != nil {
766- return interfaces , err
767+ return allPorts , err
767768 }
768- err = ports .ExtractPortsInto (allPages , & allPorts )
769+ err = ports .ExtractPortsInto (allPages , & allPortDetails )
769770 if err != nil {
770- return interfaces , err
771+ return allPorts , err
771772 }
772773
773- for _ , portExt := range allPorts {
774- interfaces = append (interfaces , portExt .Port )
775- // Check if trunk is attached to the port
776- if portExt .TrunkDetails .TrunkID == "" {
777- continue
778- }
774+ for _ , portExt := range allPortDetails {
775+ allPorts = append (allPorts , portExt .Port )
779776 // Get subport addresses
780777 for _ , subport := range portExt .TrunkDetails .SubPorts {
781778 p , err := ports .Get (client , subport .PortID ).Extract ()
@@ -790,10 +787,10 @@ func getAttachedPorts(client *gophercloud.ServiceClient, serverID string) ([]por
790787 }
791788 p .Status = "ACTIVE"
792789 p .NetworkID = n .Name
793- interfaces = append (interfaces , * p )
790+ allPorts = append (allPorts , * p )
794791 }
795792 }
796793
797- klog .V (5 ).Infof ("Node %s has %d interfaces '%v'" , serverID , len (interfaces ), interfaces )
798- return interfaces , nil
794+ klog .V (5 ).Infof ("Node %s has %d ports '%v'" , serverID , len (allPorts ), allPorts )
795+ return allPorts , nil
799796}
0 commit comments