Merge lp:~pedronis/ubuntu-push/acceptanceclient-send-build-num into lp:ubuntu-push/automatic

[Samuele Pedroni]

let send a build number with acceptanceclient

let send a build number with acceptanceclient

[lp:~pedronis/ubuntu-push/acceptanceclient-send-build-num]

395. By Samuele Pedroni on 2015-04-15

let send build num 0

[Bret Barker (noise)]

+1

review: Approve

=== modified file 'server/acceptance/acceptanceclient.go'
--- server/acceptance/acceptanceclient.go	2014-12-08 16:31:10 +0000
+++ server/acceptance/acceptanceclient.go	2015-04-15 15:35:45 +0000
@@ -37,6 +37,7 @@
 	DeviceId        string
 	Model           string
 	ImageChannel    string
+	BuildNumber     int32
 	ServerAddr      string
 	ExchangeTimeout time.Duration
 	ReportPings     bool
@@ -106,14 +107,18 @@
 		return err
 	}
 	proto := protocol.NewProtocol0(conn)
+	info := map[string]interface{}{
+		"device":  sess.Model,
+		"channel": sess.ImageChannel,
+	}
+	if sess.BuildNumber != -1 {
+		info["build_number"] = sess.BuildNumber
+	}
 	err = proto.WriteMessage(protocol.ConnectMsg{
-		Type:     "connect",
-		DeviceId: sess.DeviceId,
-		Levels:   sess.Levels,
-		Info: map[string]interface{}{
-			"device":  sess.Model,
-			"channel": sess.ImageChannel,
-		},
+		Type:          "connect",
+		DeviceId:      sess.DeviceId,
+		Levels:        sess.Levels,
+		Info:          info,
 		Authorization: sess.Auth,
 		Cookie:        sess.GetCookie(),
 	})
 
=== modified file 'server/acceptance/kit/cliloop.go'
--- server/acceptance/kit/cliloop.go	2014-08-20 19:48:59 +0000
+++ server/acceptance/kit/cliloop.go	2015-04-15 15:35:45 +0000
@@ -45,6 +45,7 @@
 	ReportPings  bool   `json:"reportPings" help:"report each Ping from the server"`
 	DeviceModel  string `json:"model" help:"device image model"`
 	ImageChannel string `json:"imageChannel" help:"image channel"`
+	BuildNumber  int32  `json:"buildNumber" help:"build number"`
 }
 
 func (cfg *Configuration) PickByTarget(what, productionValue, stagingValue string) (value string) {
@@ -75,6 +76,7 @@
 		"reportPings":      true,
 		"model":            "?",
 		"imageChannel":     "?",
+		"buildNumber":      -1,
 	}
 )
 
@@ -112,6 +114,7 @@
 		// flags
 		Model:        cfg.DeviceModel,
 		ImageChannel: cfg.ImageChannel,
+		BuildNumber:  cfg.BuildNumber,
 		ReportPings:  cfg.ReportPings,
 	}
 	cfgDir := filepath.Dir(flag.Lookup("cfg@").Value.String())