Merge lp:~pedronis/ubuntu-push/acceptcli-vnode into lp:ubuntu-push/automatic

[Samuele Pedroni]

-vnode support to build automatically a targeting device-id respecting consistent hashing when given -addr

have a way to still use -addr with consistent hashing: let specify a vnode postfix (-vnode) to build automatically a targeting device-id (addr|vnode) respecting consistent hashing

notice that there can be collisions if more than one client uses the same addr/vnode combo at the same time

add some help to configs

[lp:~pedronis/ubuntu-push/acceptcli-vnode]

410. By Samuele Pedroni on 2015-06-05

space

[Guillermo Gonzalez (verterok)]

+1

review: Approve

=== modified file 'server/acceptance/kit/cliloop.go'
--- server/acceptance/kit/cliloop.go	2015-06-04 16:08:20 +0000
+++ server/acceptance/kit/cliloop.go	2015-06-05 11:18:59 +0000
@@ -37,13 +37,14 @@
 	// session configuration
 	ExchangeTimeout config.ConfigTimeDuration `json:"exchange_timeout"`
 	// server connection config
-	Target      string                `json:"target"`
+	Target      string                `json:"target" help:"production|staging - picks defaults"`
 	Addr        config.ConfigHostPort `json:"addr"`
+	Vnode       string                `json:"vnode" help:"vnode postfix to make up a targeting device-id"`
 	CertPEMFile string                `json:"cert_pem_file"`
 	Insecure    bool                  `json:"insecure" help:"disable checking of server certificate and hostname"`
 	Domain      string                `json:"domain" help:"domain for tls connect"`
 	// api config
-	APIURL         string `json:"api"`
+	APIURL         string `json:"api" help:"api url"`
 	APICertPEMFile string `json:"api_cert_pem_file"`
 	// run timeout
 	RunTimeout config.ConfigTimeDuration `json:"run_timeout"`
@@ -74,6 +75,7 @@
 	Defaults = map[string]interface{}{
 		"target":            "",
 		"addr":              ":0",
+		"vnode":             "",
 		"exchange_timeout":  "5s",
 		"cert_pem_file":     "",
 		"insecure":          false,
@@ -103,10 +105,20 @@
 	if err != nil {
 		log.Fatalf("reading config: %v", err)
 	}
-	narg := flag.NArg()
-	switch {
-	case narg < 1:
-		missingArg("device-id")
+	deviceId := ""
+	if cfg.Vnode != "" {
+		if cfg.Addr == ":0" {
+			log.Fatalf("-vnode needs -addr specified")
+		}
+		deviceId = cfg.Addr.HostPort() + "|" + cfg.Vnode
+		log.Printf("using device-id: %q", deviceId)
+	} else {
+		narg := flag.NArg()
+		switch {
+		case narg < 1:
+			missingArg("device-id")
+		}
+		deviceId = flag.Arg(0)
 	}
 	cfgDir := filepath.Dir(flag.Lookup("cfg@").Value.String())
 	// setup api
@@ -128,7 +140,6 @@
 	} else {
 		apiCli.ServerAPIURL = cfg.APIURL
 	}
-	deviceId := flag.Arg(0)
 	addr := ""
 	domain := ""
 	if cfg.Addr == ":0" {