mirror of
https://github.com/weaveworks/scope.git
synced 2026-03-04 10:41:14 +00:00
3dd59c8b9b
NewNodeMetadata -> MakeNodeMetadata. It doesn't return a pointer, so Make is more idiomatic. Invoke MakeNodeMetadata when necessary. The zero value for a NodeMetadata is no longer valid. Split MakeNodeMetadata to two constructors. MakeNodeMetadata when you don't have anything to prepopulate; MakeNodeMetadataWith when you do. Also, a fix to the tests in app. We unmarshal a RenderableNode struct, which has a JSON-ignored NodeMetadata field. The zero value is invalid, so we need to fix that before performing comparisons.
37 lines
896 B
Go
37 lines
896 B
Go
package render_test
|
|
|
|
import (
|
|
"net"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/weaveworks/scope/probe/host"
|
|
"github.com/weaveworks/scope/render"
|
|
"github.com/weaveworks/scope/report"
|
|
"github.com/weaveworks/scope/test"
|
|
)
|
|
|
|
func TestReportLocalNetworks(t *testing.T) {
|
|
r := report.MakeReport()
|
|
r.Merge(report.Report{Host: report.Topology{NodeMetadatas: report.NodeMetadatas{
|
|
"nonets": report.MakeNodeMetadata(),
|
|
"foo": report.MakeNodeMetadataWith(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"),
|
|
mustParseCIDR("192.168.1.1/24"),
|
|
})
|
|
have := render.LocalNetworks(r)
|
|
if !reflect.DeepEqual(want, have) {
|
|
t.Errorf("%s", test.Diff(want, have))
|
|
}
|
|
}
|
|
|
|
func mustParseCIDR(s string) *net.IPNet {
|
|
_, ipNet, err := net.ParseCIDR(s)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
return ipNet
|
|
}
|