TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-05 04:11:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

tstest/natlab/vnet: standardize on 1-based naming of nodes, networks, MACs

Browse Source 
We had a mix of 0-based and 1-based nodes and MACs in logs.

Updates #13038

Change-Id: I36d1b00f7f94b37b4ae2cd439bcdc5dbee6eda4d
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2024-08-13 08:20:43 -07:00
committed by Brad Fitzpatrick
parent 10d0ce8dde
commit 84adfa1ba3
4 changed files with 57 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tstest/integration/nat/nat_test.go
View File

@@ -283,35 +283,35 @@ func (nt *natTest) runTest(node1, node2 addNodeFunc) pingRoute {
for i, c := range clients {
i, c := i, c
eg.Go(func() error {
node := nodes[i]
st, err := c.Status(ctx)
if err != nil {
return fmt.Errorf("node%d status: %w", i, err)
return fmt.Errorf("%v status: %w", node, err)
}
t.Logf("node%d status: %v", i, st)
t.Logf("%v status: %v", node, st)
node := nodes[i]
if node.HostFirewall() {
if err := c.EnableHostFirewall(ctx); err != nil {
return fmt.Errorf("node%d firewall: %w", i, err)
return fmt.Errorf("%v firewall: %w", node, err)
}
t.Logf("node%d firewalled", i)
t.Logf("%v firewalled", node)
}
if err := up(ctx, c); err != nil {
return fmt.Errorf("node%d up: %w", i, err)
return fmt.Errorf("%v up: %w", node, err)
}
t.Logf("node%d up!", i)
t.Logf("%v up!", node)
st, err = c.Status(ctx)
if err != nil {
return fmt.Errorf("node%d status: %w", i, err)
return fmt.Errorf("%v status: %w", node, err)
}
sts[i] = st
if st.BackendState != "Running" {
return fmt.Errorf("node%d state = %q", i, st.BackendState)
return fmt.Errorf("%v state = %q", node, st.BackendState)
}
t.Logf("node%d up with %v", i, sts[i].Self.TailscaleIPs)
t.Logf("%v up with %v", node, sts[i].Self.TailscaleIPs)
return nil
})
}