types/netmap,*: remove some redundant fields from NetMap
Updates #12639 Change-Id: Ia50b15529bd1c002cdd2c937cdfbe69c06fa2dc8 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
2a6cbb70d9
commit
bd29b189fe
@@ -70,8 +70,8 @@ func TestDNSConfigForNetmap(t *testing.T) {
|
||||
{
|
||||
name: "self_name_and_peers",
|
||||
nm: &netmap.NetworkMap{
|
||||
Name: "myname.net",
|
||||
SelfNode: (&tailcfg.Node{
|
||||
Name: "myname.net.",
|
||||
Addresses: ipps("100.101.101.101"),
|
||||
}).View(),
|
||||
},
|
||||
@@ -109,15 +109,15 @@ func TestDNSConfigForNetmap(t *testing.T) {
|
||||
// even if they have IPv4.
|
||||
name: "v6_only_self",
|
||||
nm: &netmap.NetworkMap{
|
||||
Name: "myname.net",
|
||||
SelfNode: (&tailcfg.Node{
|
||||
Name: "myname.net.",
|
||||
Addresses: ipps("fe75::1"),
|
||||
}).View(),
|
||||
},
|
||||
peers: nodeViews([]*tailcfg.Node{
|
||||
{
|
||||
ID: 1,
|
||||
Name: "peera.net",
|
||||
Name: "peera.net.",
|
||||
Addresses: ipps("100.102.0.1", "100.102.0.2", "fe75::1001"),
|
||||
},
|
||||
{
|
||||
@@ -146,8 +146,8 @@ func TestDNSConfigForNetmap(t *testing.T) {
|
||||
{
|
||||
name: "extra_records",
|
||||
nm: &netmap.NetworkMap{
|
||||
Name: "myname.net",
|
||||
SelfNode: (&tailcfg.Node{
|
||||
Name: "myname.net.",
|
||||
Addresses: ipps("100.101.101.101"),
|
||||
}).View(),
|
||||
DNS: tailcfg.DNSConfig{
|
||||
@@ -171,7 +171,9 @@ func TestDNSConfigForNetmap(t *testing.T) {
|
||||
{
|
||||
name: "corp_dns_misc",
|
||||
nm: &netmap.NetworkMap{
|
||||
Name: "host.some.domain.net.",
|
||||
SelfNode: (&tailcfg.Node{
|
||||
Name: "host.some.domain.net.",
|
||||
}).View(),
|
||||
DNS: tailcfg.DNSConfig{
|
||||
Proxied: true,
|
||||
Domains: []string{"foo.com", "bar.com"},
|
||||
@@ -331,8 +333,8 @@ func TestDNSConfigForNetmap(t *testing.T) {
|
||||
{
|
||||
name: "self_expired",
|
||||
nm: &netmap.NetworkMap{
|
||||
Name: "myname.net",
|
||||
SelfNode: (&tailcfg.Node{
|
||||
Name: "myname.net.",
|
||||
Addresses: ipps("100.101.101.101"),
|
||||
}).View(),
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user