Add comments in nodeAddresses()

Signed-off-by: Jing Zhang <[email protected]>

Author: Jing Zhang

pkg/openstack/instances.go

@@ -640,11 +640,32 @@ func nodeAddresses(srv *servers.Server, interfaces []attachinterfaces.Interface,
 		return nil, err
 	}
 
-	// Add subports as if they are directly attached
-	klog.V(5).Infof("Node '%s' is directly attached to %d networks '%s'", srv.Name, len(addresses), addresses)
-	klog.V(5).Infof("Node '%s' is attached to %d networks '%s'", srv.Name, len(allPrivates), allPrivates)
+	// Get the private networks that are not directly connected
 	if len(addresses) < len(allPrivates) {
+		extraPrivates := make(map[string][]Address)
+		// For each private network
 		for k, v := range allPrivates {
+			ok := false
+			// For each address in the private network
+			for _, a := range v {
+				// Check if the address is directly connected
+				for _, v1 := range addresses {
+					for _, a1 := range v1 {
+						if a.Addr == a1.Addr {
+							ok = true
+							break
+						}
+					}
+				}
+			}
+			// All the addresses in the private network are not directly connected
+			// Save the private network
+			if !ok {
+				extraPrivates[k] = v
+			}
+		}
+		klog.V(5).Infof("Node '%s' extraPrivates '%s'", srv.Name, extraPrivates)
+		for k, v := range extraPrivates {
 			v1, ok := addresses[k]
 			if !ok {
 				addresses[k] = v
@@ -777,7 +798,7 @@ func getSubInterfaces(interfaces []attachinterfaces.Interface, network *gophercl
 			}
 		}
 	}
-	klog.V(5).Infof("Node has %d subports '%v'", len(subports), subports)
+	klog.V(5).Infof("Node has %d sub-interfaces '%v'", len(subports), subports)
 	return subports, nil
 }
 

pkg/openstack/openstack_test.go

@@ -1003,22 +1003,6 @@ func TestNodeAddressesWithSubports(t *testing.T) {
 			NetID:   "59c2e3cc-26a2-44c8-b8dc-d10f3995bcd9",
 			MACAddr: "fa:16:3e:36:b7:8c",
 		},
-		{
-			PortState: "ACTIVE",
-			FixedIPs: []attachinterfaces.FixedIP{
-				{
-					SubnetID:  "b1c1f54e-f7cc-474f-be4c-f559ffb7fc94",
-					IPAddress: "14.14.14.98",
-				},
-				{
-					SubnetID:  "3d3ab7f7-e235-4476-81a2-62982f9f9673",
-					IPAddress: "3000:0:0:1::39d",
-				},
-			},
-			PortID:  "a9145a03-1c58-442e-8ca5-cf85a65fdae4",
-			NetID:   "59c2e3cc-26a2-44c8-b8dc-d10f3995bcd9",
-			MACAddr: "fa:16:3e:36:b7:8c",
-		},
 		{
 			PortState: "ACTIVE",
 			FixedIPs: []attachinterfaces.FixedIP{