remove generate-swarm-token command; fix tests; update docs

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

README.md

@@ -50,8 +50,26 @@ Machine is still in its early stages. If you'd like to try out a preview build,
 
 Machine can create [Docker Swarm](https://github.com/docker/swarm) clusters.
 
-First, create a Swarm token using `docker-machine generate-swarm-token`.  Optionally, you can use another discovery service.  See the Swarm docs for details.
+First, create a Swarm token.  Optionally, you can use another discovery service.
+See the Swarm docs for details.
 
+To create the token, first create a Machine.  This example will use VirtualBox.
+
+```
+$ docker-machine create -d virtualbox local
+```
+
+Load the Machine configuration into your shell:
+
+```
+$ $(docker-machine env local)
+```
+Then run generate the token using the Swarm Docker image:
+
+```
+$ docker run swarm create
+1257e0f0bbb499b5cd04b4c9bdb2dab3
+```
 Once you have the token, you can create the cluster.
 
 ### Swarm Master

commands.go

@@ -30,7 +30,6 @@ import (
 	_ "github.com/docker/machine/drivers/vmwarevsphere"
 	"github.com/docker/machine/state"
 	"github.com/docker/machine/utils"
-	"github.com/docker/swarm/discovery/token"
 )
 
 type machineConfig struct {
@@ -171,11 +170,6 @@ var Commands = []cli.Command{
 		Usage:  "Create a machine",
 		Action: cmdCreate,
 	},
-	{
-		Name:   "generate-swarm-token",
-		Usage:  "Generate a Swarm Cluster Token",
-		Action: cmdGenerateSwarmToken,
-	},
 	{
 		Name:   "config",
 		Usage:  "Print the connection config for machine",
@@ -323,17 +317,6 @@ func cmdCreate(c *cli.Context) {
 	log.Infof("To point your Docker client at it, run this in your shell: $(%s env %s)", c.App.Name, name)
 }
 
-func cmdGenerateSwarmToken(c *cli.Context) {
-	discovery := &token.TokenDiscoveryService{}
-	discovery.Initialize("", 0)
-	token, err := discovery.CreateCluster()
-	if err != nil {
-		log.Fatal(err)
-
-	}
-	fmt.Println(token)
-}
-
 func cmdConfig(c *cli.Context) {
 	cfg, err := getMachineConfig(c)
 	if err != nil {

docs/dockermachine.md

@@ -269,9 +269,28 @@ clusters. This can be used with any driver and will be secured with TLS.
 Note: please note that this is an experimental feature and the subcommands and
 options will very likely change.
 
-First, create a Swarm token using `docker-machine generate-swarm-token`.
-Optionally, you can use another discovery service.  See the Swarm docs for
-details.
+First, create a Swarm token.  Optionally, you can use another discovery service.
+See the Swarm docs for details.
+
+To create the token, first create a Machine.  This example will use VirtualBox.
+
+```
+$ docker-machine create -d virtualbox local
+```
+
+Load the Machine configuration into your shell:
+
+```
+$ $(docker-machine env local)
+```
+Then run generate the token using the Swarm Docker image:
+
+```
+$ docker run swarm create
+1257e0f0bbb499b5cd04b4c9bdb2dab3
+```
+Once you have the token, you can create the cluster.
+
 
 Once you have the token, you can create the cluster.
 

host_test.go

@@ -36,18 +36,19 @@ func getTestDriverFlags() *DriverOptionsMock {
 	name := hostTestName
 	flags := &DriverOptionsMock{
 		Data: map[string]interface{}{
-			"name":         name,
-			"url":          "unix:///var/run/docker.sock",
-			"swarm":        false,
-			"swarm-host":   "",
-			"swarm-master": false,
+			"name":            name,
+			"url":             "unix:///var/run/docker.sock",
+			"swarm":           false,
+			"swarm-host":      "",
+			"swarm-master":    false,
+			"swarm-discovery": "",
 		},
 	}
 	return flags
 }
 
 func getDefaultTestHost() (*Host, error) {
-	host, err := NewHost(hostTestName, hostTestDriverName, hostTestStorePath, hostTestCaCert, hostTestPrivateKey, false, "")
+	host, err := NewHost(hostTestName, hostTestDriverName, hostTestStorePath, hostTestCaCert, hostTestPrivateKey, false, "", "")
 	if err != nil {
 		return nil, err
 	}
@@ -150,7 +151,7 @@ func TestGenerateClientCertificate(t *testing.T) {
 }
 
 func TestGenerateDockerConfigNonLocal(t *testing.T) {
-	host, err := NewHost(hostTestName, hostTestDriverName, hostTestStorePath, hostTestCaCert, hostTestPrivateKey, false, "")
+	host, err := getDefaultTestHost()
 	if err != nil {
 		t.Fatal(err)
 	}

store_test.go

@@ -29,20 +29,25 @@ func clearHosts() error {
 	return os.RemoveAll(utils.GetMachineDir())
 }
 
-func TestStoreCreate(t *testing.T) {
-	if err := clearHosts(); err != nil {
-		t.Fatal(err)
-	}
-
-	flags := &DriverOptionsMock{
+func getDefaultTestDriverFlags() *DriverOptionsMock {
+	return &DriverOptionsMock{
 		Data: map[string]interface{}{
+			"name":            "test",
 			"url":             "unix:///var/run/docker.sock",
 			"swarm":           false,
 			"swarm-host":      "",
 			"swarm-master":    false,
-			"swarm-master-ip": "",
+			"swarm-discovery": "",
 		},
 	}
+}
+
+func TestStoreCreate(t *testing.T) {
+	if err := clearHosts(); err != nil {
+		t.Fatal(err)
+	}
+
+	flags := getDefaultTestDriverFlags()
 
 	store := NewStore("", "", "")
 
@@ -64,15 +69,7 @@ func TestStoreRemove(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	flags := &DriverOptionsMock{
-		Data: map[string]interface{}{
-			"url":             "unix:///var/run/docker.sock",
-			"swarm":           false,
-			"swarm-host":      "",
-			"swarm-master":    false,
-			"swarm-master-ip": "",
-		},
-	}
+	flags := getDefaultTestDriverFlags()
 
 	store := NewStore("", "", "")
 	_, err := store.Create("test", "none", flags)
@@ -97,15 +94,7 @@ func TestStoreList(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	flags := &DriverOptionsMock{
-		Data: map[string]interface{}{
-			"url":             "unix:///var/run/docker.sock",
-			"swarm":           false,
-			"swarm-host":      "",
-			"swarm-master":    false,
-			"swarm-master-ip": "",
-		},
-	}
+	flags := getDefaultTestDriverFlags()
 
 	store := NewStore("", "", "")
 	_, err := store.Create("test", "none", flags)
@@ -126,15 +115,7 @@ func TestStoreExists(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	flags := &DriverOptionsMock{
-		Data: map[string]interface{}{
-			"url":             "unix:///var/run/docker.sock",
-			"swarm":           false,
-			"swarm-host":      "",
-			"swarm-master":    false,
-			"swarm-master-ip": "",
-		},
-	}
+	flags := getDefaultTestDriverFlags()
 
 	store := NewStore("", "", "")
 	exists, err := store.Exists("test")
@@ -160,15 +141,8 @@ func TestStoreLoad(t *testing.T) {
 	}
 
 	expectedURL := "unix:///foo/baz"
-	flags := &DriverOptionsMock{
-		Data: map[string]interface{}{
-			"url":             expectedURL,
-			"swarm":           false,
-			"swarm-host":      "",
-			"swarm-master":    false,
-			"swarm-master-ip": "",
-		},
-	}
+	flags := getDefaultTestDriverFlags()
+	flags.Data["url"] = expectedURL
 
 	store := NewStore("", "", "")
 	_, err := store.Create("test", "none", flags)
@@ -195,15 +169,7 @@ func TestStoreGetSetActive(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	flags := &DriverOptionsMock{
-		Data: map[string]interface{}{
-			"url":             "unix:///var/run/docker.sock",
-			"swarm":           false,
-			"swarm-host":      "",
-			"swarm-master":    false,
-			"swarm-master-ip": "",
-		},
-	}
+	flags := getDefaultTestDriverFlags()
 
 	store := NewStore("", "", "")