cd837b0b18
command/agent/* -> agent/* command/consul/* -> agent/consul/* command/agent/command{,_test}.go -> command/agent{,_test}.go command/base/command.go -> command/base.go command/base/* -> command/* commands.go -> command/commands.go The script which did the refactor is: ( cd $GOPATH/src/github.com/hashicorp/consul git mv command/agent/command.go command/agent.go git mv command/agent/command_test.go command/agent_test.go git mv command/agent/flag_slice_value{,_test}.go command/ git mv command/agent . git mv command/base/command.go command/base.go git mv command/base/config_util{,_test}.go command/ git mv commands.go command/ git mv consul agent rmdir command/base/ gsed -i -e 's|package agent|package command|' command/agent{,_test}.go gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go gsed -i -e 's|package main|package command|' command/commands.go gsed -i -e 's|base.Command|BaseCommand|' command/commands.go gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go gsed -i -e 's|base\.||' command/commands.go gsed -i -e 's|command\.||' command/commands.go gsed -i -e 's|command|c|' main.go gsed -i -e 's|range Commands|range command.Commands|' main.go gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go gsed -i -e 's|base.Command|BaseCommand|' command/*.go gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go gsed -i -e 's|base\.||' command/*_test.go gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go # fix imports f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f goimports -w $f f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f goimports -w $f goimports -w command/*.go main.go )
220 lines
5 KiB
Go
220 lines
5 KiB
Go
package command
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/hashicorp/consul/agent"
|
|
"github.com/hashicorp/consul/agent/consul/structs"
|
|
"github.com/hashicorp/consul/testutil/retry"
|
|
"github.com/hashicorp/serf/coordinate"
|
|
"github.com/mitchellh/cli"
|
|
)
|
|
|
|
func testRTTCommand(t *testing.T) (*cli.MockUi, *RTTCommand) {
|
|
ui := cli.NewMockUi()
|
|
return ui, &RTTCommand{
|
|
BaseCommand: BaseCommand{
|
|
UI: ui,
|
|
Flags: FlagSetClientHTTP,
|
|
},
|
|
}
|
|
}
|
|
|
|
func TestRTTCommand_Implements(t *testing.T) {
|
|
t.Parallel()
|
|
var _ cli.Command = &RTTCommand{}
|
|
}
|
|
|
|
func TestRTTCommand_Run_BadArgs(t *testing.T) {
|
|
t.Parallel()
|
|
_, c := testRTTCommand(t)
|
|
|
|
if code := c.Run([]string{}); code != 1 {
|
|
t.Fatalf("expected return code 1, got %d", code)
|
|
}
|
|
|
|
if code := c.Run([]string{"node1", "node2", "node3"}); code != 1 {
|
|
t.Fatalf("expected return code 1, got %d", code)
|
|
}
|
|
|
|
if code := c.Run([]string{"-wan", "node1", "node2"}); code != 1 {
|
|
t.Fatalf("expected return code 1, got %d", code)
|
|
}
|
|
|
|
if code := c.Run([]string{"-wan", "node1.dc1", "node2"}); code != 1 {
|
|
t.Fatalf("expected return code 1, got %d", code)
|
|
}
|
|
|
|
if code := c.Run([]string{"-wan", "node1", "node2.dc1"}); code != 1 {
|
|
t.Fatalf("expected return code 1, got %d", code)
|
|
}
|
|
}
|
|
|
|
func TestRTTCommand_Run_LAN(t *testing.T) {
|
|
t.Parallel()
|
|
updatePeriod := 10 * time.Millisecond
|
|
cfg := agent.TestConfig()
|
|
cfg.ConsulConfig.CoordinateUpdatePeriod = updatePeriod
|
|
a := agent.NewTestAgent(t.Name(), cfg)
|
|
defer a.Shutdown()
|
|
|
|
// Inject some known coordinates.
|
|
c1 := coordinate.NewCoordinate(coordinate.DefaultConfig())
|
|
c2 := c1.Clone()
|
|
c2.Vec[0] = 0.123
|
|
dist_str := fmt.Sprintf("%.3f ms", c1.DistanceTo(c2).Seconds()*1000.0)
|
|
{
|
|
req := structs.CoordinateUpdateRequest{
|
|
Datacenter: a.Config.Datacenter,
|
|
Node: a.Config.NodeName,
|
|
Coord: c1,
|
|
}
|
|
var reply struct{}
|
|
if err := a.RPC("Coordinate.Update", &req, &reply); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
}
|
|
{
|
|
req := structs.RegisterRequest{
|
|
Datacenter: a.Config.Datacenter,
|
|
Node: "dogs",
|
|
Address: "127.0.0.2",
|
|
}
|
|
var reply struct{}
|
|
if err := a.RPC("Catalog.Register", &req, &reply); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
}
|
|
{
|
|
var reply struct{}
|
|
req := structs.CoordinateUpdateRequest{
|
|
Datacenter: a.Config.Datacenter,
|
|
Node: "dogs",
|
|
Coord: c2,
|
|
}
|
|
if err := a.RPC("Coordinate.Update", &req, &reply); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
}
|
|
|
|
// Ask for the RTT of two known nodes
|
|
ui, c := testRTTCommand(t)
|
|
args := []string{
|
|
"-http-addr=" + a.HTTPAddr(),
|
|
a.Config.NodeName,
|
|
"dogs",
|
|
}
|
|
// Wait for the updates to get flushed to the data store.
|
|
retry.Run(t, func(r *retry.R) {
|
|
code := c.Run(args)
|
|
if code != 0 {
|
|
r.Fatalf("bad: %d: %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
|
|
// Make sure the proper RTT was reported in the output.
|
|
expected := fmt.Sprintf("rtt: %s", dist_str)
|
|
if !strings.Contains(ui.OutputWriter.String(), expected) {
|
|
r.Fatalf("bad: %#v", ui.OutputWriter.String())
|
|
}
|
|
})
|
|
|
|
// Default to the agent's node.
|
|
{
|
|
ui, c := testRTTCommand(t)
|
|
args := []string{
|
|
"-http-addr=" + a.HTTPAddr(),
|
|
"dogs",
|
|
}
|
|
code := c.Run(args)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d: %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
|
|
// Make sure the proper RTT was reported in the output.
|
|
expected := fmt.Sprintf("rtt: %s", dist_str)
|
|
if !strings.Contains(ui.OutputWriter.String(), expected) {
|
|
t.Fatalf("bad: %#v", ui.OutputWriter.String())
|
|
}
|
|
}
|
|
|
|
// Try an unknown node.
|
|
{
|
|
ui, c := testRTTCommand(t)
|
|
args := []string{
|
|
"-http-addr=" + a.HTTPAddr(),
|
|
a.Config.NodeName,
|
|
"nope",
|
|
}
|
|
code := c.Run(args)
|
|
if code != 1 {
|
|
t.Fatalf("bad: %d: %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestRTTCommand_Run_WAN(t *testing.T) {
|
|
t.Parallel()
|
|
a := agent.NewTestAgent(t.Name(), nil)
|
|
defer a.Shutdown()
|
|
|
|
node := fmt.Sprintf("%s.%s", a.Config.NodeName, a.Config.Datacenter)
|
|
|
|
// We can't easily inject WAN coordinates, so we will just query the
|
|
// node with itself.
|
|
{
|
|
ui, c := testRTTCommand(t)
|
|
args := []string{
|
|
"-wan",
|
|
"-http-addr=" + a.HTTPAddr(),
|
|
node,
|
|
node,
|
|
}
|
|
code := c.Run(args)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d: %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
|
|
// Make sure there was some kind of RTT reported in the output.
|
|
if !strings.Contains(ui.OutputWriter.String(), "rtt: ") {
|
|
t.Fatalf("bad: %#v", ui.OutputWriter.String())
|
|
}
|
|
}
|
|
|
|
// Default to the agent's node.
|
|
{
|
|
ui, c := testRTTCommand(t)
|
|
args := []string{
|
|
"-wan",
|
|
"-http-addr=" + a.HTTPAddr(),
|
|
node,
|
|
}
|
|
code := c.Run(args)
|
|
if code != 0 {
|
|
t.Fatalf("bad: %d: %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
|
|
// Make sure there was some kind of RTT reported in the output.
|
|
if !strings.Contains(ui.OutputWriter.String(), "rtt: ") {
|
|
t.Fatalf("bad: %#v", ui.OutputWriter.String())
|
|
}
|
|
}
|
|
|
|
// Try an unknown node.
|
|
{
|
|
ui, c := testRTTCommand(t)
|
|
args := []string{
|
|
"-wan",
|
|
"-http-addr=" + a.HTTPAddr(),
|
|
node,
|
|
"dc1.nope",
|
|
}
|
|
code := c.Run(args)
|
|
if code != 1 {
|
|
t.Fatalf("bad: %d: %#v", code, ui.ErrorWriter.String())
|
|
}
|
|
}
|
|
}
|