github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 17:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

report.Metadata -> map[string]string

Browse Source
This commit is contained in:
Tom Wilkie
2015-07-16 12:06:05 +00:00
parent c2065836e2
commit f85195308c
26 changed files with 80 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
render/render_test.go
View File

@@ -110,8 +110,8 @@ func TestMapEdge(t *testing.T) {
selector := func(_ report.Report) report.Topology {
return report.Topology{
NodeMetadatas: report.NodeMetadatas{
"foo": report.NewNodeMetadata(report.Metadata{"id": "foo"}),
"bar": report.NewNodeMetadata(report.Metadata{"id": "bar"}),
"foo": report.NewNodeMetadata(map[string]string{"id": "foo"}),
"bar": report.NewNodeMetadata(map[string]string{"id": "bar"}),
},
Adjacency: report.Adjacency{
">foo": report.MakeIDList("bar"),

6
render/renderable_node.go
View File

@@ -82,7 +82,7 @@ func newDerivedNode(id string, node RenderableNode) RenderableNode {
Pseudo: node.Pseudo,
AggregateMetadata: node.AggregateMetadata,
Origins: node.Origins,
NodeMetadata: report.NewNodeMetadata(report.Metadata{}),
NodeMetadata: report.NewNodeMetadata(map[string]string{}),
}
}
@@ -94,7 +94,7 @@ func newPseudoNode(id, major, minor string) RenderableNode {
Rank: "",
Pseudo: true,
AggregateMetadata: AggregateMetadata{},
NodeMetadata: report.NewNodeMetadata(report.Metadata{}),
NodeMetadata: report.NewNodeMetadata(map[string]string{}),
}
}
@@ -107,6 +107,6 @@ func newDerivedPseudoNode(id, major string, node RenderableNode) RenderableNode
Pseudo: true,
AggregateMetadata: node.AggregateMetadata,
Origins: node.Origins,
NodeMetadata: report.NewNodeMetadata(report.Metadata{}),
NodeMetadata: report.NewNodeMetadata(map[string]string{}),
}
}

4
render/theinternet_test.go
View File

@@ -14,8 +14,8 @@ import (
func TestReportLocalNetworks(t *testing.T) {
r := report.MakeReport()
r.Merge(report.Report{Host: report.Topology{NodeMetadatas: report.NodeMetadatas{
"nonets": report.NewNodeMetadata(report.Metadata{}),
"foo": report.NewNodeMetadata(report.Metadata{host.LocalNetworks: "10.0.0.1/8 192.168.1.1/24 10.0.0.1/8 badnet/33"}),
"nonets": report.NewNodeMetadata(map[string]string{}),
"foo": report.NewNodeMetadata(map[string]string{host.LocalNetworks: "10.0.0.1/8 192.168.1.1/24 10.0.0.1/8 badnet/33"}),
}}})
want := report.Networks([]*net.IPNet{
mustParseCIDR("10.0.0.1/8"),