mirror of
https://github.com/weaveworks/scope.git
synced 2026-02-14 18:09:59 +00:00
refactor: rename report.NewNetworks to MakeNetworks
for consistency - all the other report set constructors are called 'Make...'
This commit is contained in:
@@ -45,7 +45,7 @@ type testcase struct {
|
||||
}
|
||||
|
||||
func testMap(t *testing.T, f render.MapFunc, input testcase) {
|
||||
localNetworks := report.NewNetworks()
|
||||
localNetworks := report.MakeNetworks()
|
||||
if err := localNetworks.AddCIDR("1.2.3.0/16"); err != nil {
|
||||
t.Fatalf(err.Error())
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ func isKnownService(hostname string) bool {
|
||||
// used to determine which nodes in the report are "remote", i.e. outside of
|
||||
// our infrastructure.
|
||||
func LocalNetworks(r report.Report) report.Networks {
|
||||
networks := report.NewNetworks()
|
||||
networks := report.MakeNetworks()
|
||||
|
||||
for _, topology := range []report.Topology{r.Host, r.Overlay} {
|
||||
for _, md := range topology.Nodes {
|
||||
|
||||
@@ -29,7 +29,7 @@ func TestReportLocalNetworks(t *testing.T) {
|
||||
},
|
||||
},
|
||||
})
|
||||
want := report.NewNetworks()
|
||||
want := report.MakeNetworks()
|
||||
for _, cidr := range []string{"10.0.0.1/8", "192.168.1.1/24", "10.32.0.1/12"} {
|
||||
if err := want.AddCIDR(cidr); err != nil {
|
||||
panic(err)
|
||||
|
||||
@@ -14,10 +14,10 @@ type Networks struct{ *critbitgo.Net }
|
||||
// as being host-scoped.
|
||||
//
|
||||
// TODO this design is broken, make it consistent with probe networks.
|
||||
var LocalNetworks = NewNetworks()
|
||||
var LocalNetworks = MakeNetworks()
|
||||
|
||||
// NewNetworks creates a datastructure representing a set of networks.
|
||||
func NewNetworks() Networks {
|
||||
// MakeNetworks creates a datastructure representing a set of networks.
|
||||
func MakeNetworks() Networks {
|
||||
return Networks{critbitgo.NewNet()}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
)
|
||||
|
||||
func TestContains(t *testing.T) {
|
||||
networks := report.NewNetworks()
|
||||
networks := report.MakeNetworks()
|
||||
for _, cidr := range []string{"10.0.0.1/8", "192.168.1.1/24"} {
|
||||
if err := networks.AddCIDR(cidr); err != nil {
|
||||
panic(err)
|
||||
|
||||
Reference in New Issue
Block a user