Merge pull request #1248 from weaveworks/1247-no-blank-connection-ports

better detection of endpoint children, to avoid including MapX2IP results
weaveworks · Apr 7, 2016 · 27800ff · 27800ff
2 parents 201c290 + ba83927
commit 27800ff
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/render/detailed/connections.go b/render/detailed/connections.go
@@ -137,7 +137,7 @@ func outgoingConnectionsTable(topologyID string, n report.Node, ns report.Nodes)
 func endpointChildrenOf(n report.Node) []report.Node {
 	result := []report.Node{}
 	n.Children.ForEach(func(child report.Node) {
-		if _, _, _, ok := report.ParseEndpointNodeID(child.ID); ok {
+		if child.Topology == report.Endpoint {
 			result = append(result, child)
 		}
 	})
@@ -147,7 +147,7 @@ func endpointChildrenOf(n report.Node) []report.Node {
 func endpointChildIDsOf(n report.Node) report.IDList {
 	result := report.MakeIDList()
 	n.Children.ForEach(func(child report.Node) {
-		if _, _, _, ok := report.ParseEndpointNodeID(child.ID); ok {
+		if child.Topology == report.Endpoint {
 			result = result.Add(child.ID)
 		}
 	})