Flight

kola/cluster/cluster.go

@@ -55,7 +55,7 @@ func (t *TestCluster) Run(name string, f func(c TestCluster)) bool {
 
 // RunNative runs a registered NativeFunc on a remote machine
 func (t *TestCluster) RunNative(funcName string, m platform.Machine) bool {
-	command := fmt.Sprintf("./kolet run %q %q", t.Name(), funcName)
+	command := fmt.Sprintf("./kolet run %q %q", t.H.Name(), funcName)
 	return t.Run(funcName, func(c TestCluster) {
 		client, err := m.SSHClient()
 		if err != nil {

kola/tests/ignition/resource.go

@@ -152,7 +152,7 @@ func init() {
 func resourceLocal(c cluster.TestCluster) {
 	server := c.Machines()[0]
 
-	c.MustSSH(server, fmt.Sprintf("sudo systemd-run --quiet ./kolet run %s Serve", c.Name()))
+	c.MustSSH(server, fmt.Sprintf("sudo systemd-run --quiet ./kolet run %s Serve", c.H.Name()))
 
 	ip := server.PrivateIP()
 	if c.Platform() == packet.Platform {

kola/tests/ignition/security.go

@@ -92,7 +92,7 @@ EOF
 ) -extensions SAN'`, "$IP", ip, -1))
 	publicKey := c.MustSSH(server, "sudo cat /var/tls/server.crt")
 
-	c.MustSSH(server, fmt.Sprintf("sudo systemd-run --quiet ./kolet run %s TLSServe", c.Name()))
+	c.MustSSH(server, fmt.Sprintf("sudo systemd-run --quiet ./kolet run %s TLSServe", c.H.Name()))
 
 	client, err := c.NewMachine(localSecurityClient.Subst("$IP", ip).Subst("$KEY", dataurl.EncodeBytes(publicKey)))
 	if err != nil {

kola/tests/kubernetes/setup.go

@@ -37,6 +37,15 @@ type kCluster struct {
 	workers []platform.Machine
 }
 
+// resolve ambiguity with TestCluster.Name()
+type clusterWrapper struct {
+	*cluster.TestCluster
+}
+
+func (cw clusterWrapper) Name() string {
+	return cw.Cluster.Name()
+}
+
 // Setup a multi-node cluster based on generic scrips from coreos-kubernetes repo.
 // https://github.com/coreos/coreos-kubernetes/tree/master/multi-node/generic
 func setupCluster(c cluster.TestCluster, nodes int, version, runtime string) *kCluster {
@@ -73,7 +82,7 @@ func setupCluster(c cluster.TestCluster, nodes int, version, runtime string) *kC
 	}
 
 	// create worker nodes
-	workers, err := platform.NewMachines(c, conf.CloudConfig(""), nodes)
+	workers, err := platform.NewMachines(clusterWrapper{&c}, conf.CloudConfig(""), nodes)
 	if err != nil {
 		c.Fatalf("error creating workers: %v", err)
 	}

kola/tests/update/update.go

@@ -102,7 +102,7 @@ func configureOmahaServer(c cluster.TestCluster, srv platform.Machine) string {
 		c.Fatalf("copying update payload to omaha server: %v", err)
 	}
 
-	c.MustSSH(srv, fmt.Sprintf("sudo systemd-run --quiet ./kolet run %s Omaha", c.Name()))
+	c.MustSSH(srv, fmt.Sprintf("sudo systemd-run --quiet ./kolet run %s Omaha", c.H.Name()))
 
 	err = util.WaitUntilReady(60*time.Second, 5*time.Second, func() (bool, error) {
 		_, _, err := srv.SSH(fmt.Sprintf("curl %s:34567", srv.PrivateIP()))

platform/base.go → platform/cluster.go

@@ -22,7 +22,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/pkg/capnslog"
 	"github.com/satori/go.uuid"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
@@ -32,10 +31,6 @@ import (
 	"github.com/coreos/mantle/util"
 )
 
-var (
-	plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform")
-)
-
 type BaseCluster struct {
 	agent *network.SSHAgent
 

platform/platform.go

@@ -22,6 +22,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/coreos/pkg/capnslog"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/net/context"
 
@@ -34,6 +35,10 @@ const (
 	sshTimeout = 10 * time.Second
 )
 
+var (
+	plog = capnslog.NewPackageLogger("github.com/coreos/mantle", "platform")
+)
+
 // Name is a unique identifier for a platform.
 type Name string
 
@@ -81,6 +86,9 @@ type Cluster interface {
 	// Platform returns the name of the platform.
 	Platform() Name
 
+	// Name returns a unique name for the Cluster.
+	Name() string
+
 	// NewMachine creates a new Container Linux machine.
 	NewMachine(userdata *conf.UserData) (Machine, error)