From 4a77e9bfac460bb36a524c1f079795475e44fe6a Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 13 Jul 2017 16:35:52 +0100 Subject: [PATCH] don't bother tracking the orignal node topology We always join with the original renderer and hence all the nodes produced by ipToNode will get their other data, including topology, via that route. --- render/container.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/render/container.go b/render/container.go index b7e5c367a..d621ed3e0 100644 --- a/render/container.go +++ b/render/container.go @@ -43,7 +43,6 @@ var ContainerRenderer = MakeFilter( var mapEndpoint2IP = MakeMap(endpoint2IP, SelectEndpoint) const originalNodeID = "original_node_id" -const originalNodeTopology = "original_node_topology" // ConnectionJoin joins the given renderer with connections from the // endpoints topology, using the toIPs function to extract IPs from @@ -55,8 +54,7 @@ func ConnectionJoin(toIPs func(report.Node) []string, r Renderer) Renderer { result[ip] = NewDerivedNode(ip, n). WithTopology(IP). WithLatests(map[string]string{ - originalNodeID: n.ID, - originalNodeTopology: n.Topology, + originalNodeID: n.ID, }). WithCounters(map[string]int{IP: 1}) } @@ -94,15 +92,8 @@ func ipToNode(n report.Node, _ report.Networks) report.Nodes { if !ok { return report.Nodes{} } - topology, ok := n.Latest.Lookup(originalNodeTopology) - if !ok { - return report.Nodes{} - } - return report.Nodes{ - id: NewDerivedNode(id, n). - WithTopology(topology), - } + return report.Nodes{id: NewDerivedNode(id, n)} } // endpoint2IP maps endpoint nodes to their IP address, for joining