refactor: rename report.NewNetworks to MakeNetworks

for consistency - all the other report set constructors are called
'Make...'
This commit is contained in:
Matthias Radestock
2017-07-03 01:01:16 +01:00
parent fd3fc6656d
commit 7119fb9de8
5 changed files with 7 additions and 7 deletions

View File

@@ -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())
}

View File

@@ -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 {

View File

@@ -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)

View File

@@ -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()}
}

View File

@@ -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)