Merge lp:~dave-cheney/pyjuju/go-command-jujut into lp:pyjuju/go

[Dave Cheney]

cmd: add jujut (juju testing)

jujut is a small tool I wrote to push values into the state
to test the provisioning agent. It doesn't replace unit tests
and is not intended to be shipped to customers.

It has value for me, and if accepted, I expect to be replaced at
some point when we have jujuc working.

https://codereview.appspot.com/6243070/

[William Reade (fwereade)]

I'm -1 on this at the moment... it seems to have a fair amount of code
duplicated from elsewhere, and I really don't see what it gives us (that
couldn't/shouldn't be exercised by actual unit tests). A bit more
context might help me see the point...

http://codereview.appspot.com/6243070/

[lp:~dave-cheney/pyjuju/go-command-jujut]

191. By Dave Cheney on 2012-06-01

merge from tip and fix

[Gustavo Niemeyer (niemeyer)]

I agree with William. Even without seeing his comments, we had already
debated about the low level of automated testing in the provisioning
agent. The use of this tool is a side effect of doing one-off tests
manually rather than introducing proper logic onto the tests that
continue to be run after it is integrated.

 From another perspective, some of these commands should be actual
commands of juju. add-machine and remove-machine are two great
candidates for living on the real command line suite.

https://codereview.appspot.com/6243070/

Unmerged revisions

191. By Dave Cheney on 2012-06-01

merge from tip and fix

190. By Dave Cheney on 2012-05-30

cmd: add jujut (juju testing)

=== added directory 'cmd/jujut'
=== added file 'cmd/jujut/add_machine.go'
--- cmd/jujut/add_machine.go	1970-01-01 00:00:00 +0000
+++ cmd/jujut/add_machine.go	2012-06-01 06:46:20 +0000
@@ -0,0 +1,41 @@
+package main
+
+import (
+	"launchpad.net/gnuflag"
+	"launchpad.net/juju/go/cmd"
+	"launchpad.net/juju/go/log"
+	"launchpad.net/juju/go/state"
+)
+
+func init() {
+	jujut.Register(&AddMachineCommand{})
+}
+
+type AddMachineCommand struct {
+	Conf AgentConf
+}
+
+// Info returns usage information for the command.
+func (a *AddMachineCommand) Info() *cmd.Info {
+	return &cmd.Info{"add-machine", "", "add a machine", ""}
+}
+
+// Init initializes the command for running.
+func (a *AddMachineCommand) Init(f *gnuflag.FlagSet, args []string) error {
+	a.Conf.addFlags(f)
+	if err := f.Parse(true, args); err != nil {
+		return err
+	}
+	return a.Conf.checkArgs(f.Args())
+}
+
+func (a *AddMachineCommand) Run(_ *cmd.Context) error {
+	st, err := state.Open(&a.Conf.StateInfo)
+	if err != nil {
+		return err
+	}
+
+	m, err := st.AddMachine()
+	log.Printf("added machine: %v", m)
+	return err
+}

=== added file 'cmd/jujut/agent.go'
--- cmd/jujut/agent.go	1970-01-01 00:00:00 +0000
+++ cmd/jujut/agent.go	2012-06-01 06:46:20 +0000
@@ -0,0 +1,70 @@
+package main
+
+import (
+	"fmt"
+	"launchpad.net/gnuflag"
+	"launchpad.net/juju/go/cmd"
+	"launchpad.net/juju/go/state"
+	"regexp"
+	"strings"
+)
+
+// requiredError is useful when complaining about missing command-line options.
+func requiredError(name string) error {
+	return fmt.Errorf("--%s option must be set", name)
+}
+
+// stateInfoValue implements gnuflag.Value on a state.Info.
+type stateInfoValue state.Info
+
+var validAddr = regexp.MustCompile("^.+:[0-9]+$")
+
+// Set splits the comma-separated list of ZooKeeper addresses and stores
+// onto v's Addrs. Addresses must include port numbers.
+func (v *stateInfoValue) Set(value string) error {
+	addrs := strings.Split(value, ",")
+	for _, addr := range addrs {
+		if !validAddr.MatchString(addr) {
+			return fmt.Errorf("%q is not a valid zookeeper address", addr)
+		}
+	}
+	v.Addrs = addrs
+	return nil
+}
+
+// String returns the list of ZooKeeper addresses joined by commas.
+func (v *stateInfoValue) String() string {
+	if v.Addrs != nil {
+		return strings.Join(v.Addrs, ",")
+	}
+	return ""
+}
+
+// stateInfoVar sets up a gnuflag flag analagously to FlagSet.*Var methods.
+func stateInfoVar(fs *gnuflag.FlagSet, target *state.Info, name string, value []string, usage string) {
+	target.Addrs = value
+	fs.Var((*stateInfoValue)(target), name, usage)
+}
+
+// AgentConf handles command-line flags shared by all agents.
+type AgentConf struct {
+	JujuDir   string // Defaults to "/var/lib/juju".
+	StateInfo state.Info
+}
+
+// addFlags injects common agent flags into f.
+func (c *AgentConf) addFlags(f *gnuflag.FlagSet) {
+	f.StringVar(&c.JujuDir, "juju-directory", "/var/lib/juju", "juju working directory")
+	stateInfoVar(f, &c.StateInfo, "zookeeper-servers", nil, "zookeeper servers to connect to")
+}
+
+// checkArgs checks that required flags have been set and that args is empty.
+func (c *AgentConf) checkArgs(args []string) error {
+	if c.JujuDir == "" {
+		return requiredError("juju-directory")
+	}
+	if c.StateInfo.Addrs == nil {
+		return requiredError("zookeeper-servers")
+	}
+	return cmd.CheckEmpty(args)
+}

=== added file 'cmd/jujut/main.go'
--- cmd/jujut/main.go	1970-01-01 00:00:00 +0000
+++ cmd/jujut/main.go	2012-06-01 06:46:20 +0000
@@ -0,0 +1,16 @@
+package main
+
+import (
+	"launchpad.net/juju/go/cmd"
+	"os"
+)
+
+var jujut = &cmd.SuperCommand{Name: "jujut", Doc: "", Log: &cmd.Log{}}
+
+func Main(args []string) {
+	os.Exit(cmd.Main(jujut, cmd.DefaultContext(), args[1:]))
+}
+
+func main() {
+	Main(os.Args)
+}

=== added file 'cmd/jujut/remove_machine.go'
--- cmd/jujut/remove_machine.go	1970-01-01 00:00:00 +0000
+++ cmd/jujut/remove_machine.go	2012-06-01 06:46:20 +0000
@@ -0,0 +1,45 @@
+package main
+
+import (
+	"fmt"
+
+	"launchpad.net/gnuflag"
+	"launchpad.net/juju/go/cmd"
+	"launchpad.net/juju/go/state"
+)
+
+func init() {
+	jujut.Register(&RemoveMachineCommand{})
+}
+
+type RemoveMachineCommand struct {
+	Conf      AgentConf
+	MachineId int
+}
+
+// Info returns usage information for the command.
+func (a *RemoveMachineCommand) Info() *cmd.Info {
+	return &cmd.Info{"remove-machine", "", "remove a machine", ""}
+}
+
+// Init initializes the command for running.
+func (a *RemoveMachineCommand) Init(f *gnuflag.FlagSet, args []string) error {
+	a.Conf.addFlags(f)
+	f.IntVar(&a.MachineId, "machine-id", -1, "id of the machine to run")
+	if err := f.Parse(true, args); err != nil {
+		return err
+	}
+	if a.MachineId < 0 {
+		return fmt.Errorf("--machine-id option must be set, and expects a non-negative integer")
+	}
+	return a.Conf.checkArgs(f.Args())
+}
+
+func (a *RemoveMachineCommand) Run(_ *cmd.Context) error {
+	st, err := state.Open(&a.Conf.StateInfo)
+	if err != nil {
+		return err
+	}
+	err = st.RemoveMachine(a.MachineId)
+	return err
+}

=== added file 'cmd/jujut/setup_dummy.go'
--- cmd/jujut/setup_dummy.go	1970-01-01 00:00:00 +0000
+++ cmd/jujut/setup_dummy.go	2012-06-01 06:46:20 +0000
@@ -0,0 +1,46 @@
+package main
+
+import (
+	"launchpad.net/gnuflag"
+	"launchpad.net/juju/go/cmd"
+	"launchpad.net/juju/go/state"
+)
+
+func init() {
+	jujut.Register(&SetupDummyCommand{})
+}
+
+type SetupDummyCommand struct {
+	Conf AgentConf
+}
+
+// Info returns usage information for the command.
+func (a *SetupDummyCommand) Info() *cmd.Info {
+	return &cmd.Info{"setup-dummy", "", "setup dummy environment in the local zk", ""}
+}
+
+// Init initializes the command for running.
+func (a *SetupDummyCommand) Init(f *gnuflag.FlagSet, args []string) error {
+	a.Conf.addFlags(f)
+	if err := f.Parse(true, args); err != nil {
+		return err
+	}
+	return a.Conf.checkArgs(f.Args())
+}
+
+func (a *SetupDummyCommand) Run(_ *cmd.Context) error {
+	st, err := state.Open(&a.Conf.StateInfo)
+	if err != nil {
+		return err
+	}
+
+	env, err := st.Environment()
+	if err != nil {
+		return err
+	}
+	env.Set("type", "dummy")
+	env.Set("zookeeper", false)
+	env.Set("name", "testing")
+	_, err = env.Write()
+	return err
+}

=== modified file 'state/state.go'
--- state/state.go	2012-05-29 23:11:41 +0000
+++ state/state.go	2012-06-01 06:46:20 +0000
@@ -74,6 +74,11 @@
 	return newConfigWatcher(s, zkEnvironmentPath)
 }
 
+// Environment returns the current environment configuration.
+func (s *State) Environment() (*ConfigNode, error) {
+	return readConfigNode(s.zk, zkEnvironmentPath)
+}
+
 // Machine returns the machine with the given id.
 func (s *State) Machine(id int) (*Machine, error) {
 	key := machineKey(id)