functional: run etcdctl inside nspawn containers

WIP

Author: Dongsu Park

functional/platform/cluster.go

@@ -35,6 +35,8 @@ type Cluster interface {
 	// client operations
 	Fleetctl(m Member, args ...string) (string, string, error)
 	FleetctlWithInput(m Member, input string, args ...string) (string, string, error)
+	Etcdctl(m Member, args ...string) (string, string, error)
+	EtcdctlWithInput(m Member, input string, args ...string) (string, string, error)
 	WaitForNActiveUnits(Member, int) (map[string][]util.UnitState, error)
 	WaitForNMachines(Member, int) ([]string, error)
 }

functional/platform/nspawn.go

@@ -104,6 +104,16 @@ func (nc *nspawnCluster) FleetctlWithInput(m Member, input string, args ...strin
 	return util.RunFleetctlWithInput(input, args...)
 }
 
+func (nc *nspawnCluster) Etcdctl(m Member, args ...string) (string, string, error) {
+	args = append([]string{"--no-sync"}, args...)
+	return util.RunEtcdctl(args...)
+}
+
+func (nc *nspawnCluster) EtcdctlWithInput(m Member, input string, args ...string) (string, string, error) {
+	args = append([]string{"--no-sync"}, args...)
+	return util.RunEtcdctlWithInput(input, args...)
+}
+
 func (nc *nspawnCluster) WaitForNActiveUnits(m Member, count int) (map[string][]util.UnitState, error) {
 	var nactive int
 	states := make(map[string][]util.UnitState)

functional/unit_action_test.go

@@ -22,7 +22,6 @@ import (
 	"testing"
 
 	"github.com/coreos/fleet/functional/platform"
-	"github.com/coreos/fleet/functional/util"
 	"github.com/coreos/fleet/unit"
 )
 
@@ -270,12 +269,12 @@ func TestUnitDestroyFromRegistry(t *testing.T) {
 	unitBody := stdout
 
 	var hashUnit string
-	if hashUnit, err = retrieveJobObjectHash("hello.service"); err != nil {
+	if hashUnit, err = retrieveJobObjectHash(cluster, m, "hello.service"); err != nil {
 		t.Fatalf("Failed to retrieve hash of job object hello.service: %v", err)
 	}
 
 	var regBody string
-	if regBody, err = retrieveUnitBody(hashUnit); err != nil {
+	if regBody, err = retrieveUnitBody(cluster, m, hashUnit); err != nil {
 		t.Fatalf("Failed to retrieve unit body for hello.service: %v", err)
 	}
 
@@ -302,7 +301,7 @@ func TestUnitDestroyFromRegistry(t *testing.T) {
 	// check for the unit being destroyed from the etcd registry
 	etcdUnitPrefix := "/_coreos.com/fleet/unit/"
 	etcdUnitPath := path.Join(etcdUnitPrefix, hashUnit)
-	if stdout, _, err = util.RunEtcdctl("ls", etcdUnitPath); err != nil {
+	if stdout, _, err = cluster.Etcdctl(m, "ls", etcdUnitPath); err != nil {
 		t.Fatalf("Failed to list a unit from the registry: %v", err)
 	}
 	units = strings.Split(strings.TrimSpace(stdout), "\n")
@@ -313,20 +312,20 @@ func TestUnitDestroyFromRegistry(t *testing.T) {
 
 // retrieveJobObjectHash fetches the job hash value from
 // /_coreos.com/fleet/job/<jobName>/object in the etcd registry.
-func retrieveJobObjectHash(jobName string) (hash string, err error) {
+func retrieveJobObjectHash(cluster platform.Cluster, m platform.Member, jobName string) (hash string, err error) {
 	etcdJobPrefix := "/_coreos.com/fleet/job/"
 	etcdJobPath := path.Join(etcdJobPrefix, jobName, "object")
 
 	var stdout string
-	if stdout, _, err = util.RunEtcdctl("ls", etcdJobPath); err != nil {
+	if stdout, _, err = cluster.Etcdctl(m, "ls", etcdJobPath); err != nil {
 		return "", fmt.Errorf("Failed to list a unit from the registry: %v", err)
 	}
 	units := strings.Split(strings.TrimSpace(stdout), "\n")
 	if len(stdout) == 0 || len(units) == 0 {
 		return "", fmt.Errorf("No such unit in the registry: %v", err)
 	}
 
-	stdout, _, err = util.RunEtcdctl("get", etcdJobPath)
+	stdout, _, err = cluster.Etcdctl(m, "get", etcdJobPath)
 	stdout = strings.TrimSpace(stdout)
 	objectBody := strings.Split(stdout, "\n")
 	if err != nil || len(stdout) == 0 || len(objectBody) == 0 {
@@ -347,20 +346,20 @@ func retrieveJobObjectHash(jobName string) (hash string, err error) {
 
 // retrieveUnitBody fetches unit body from /_coreos.com/fleet/unit/<hash>
 // in the etcd registry.
-func retrieveUnitBody(hashUnit string) (regBody string, err error) {
+func retrieveUnitBody(cluster platform.Cluster, m platform.Member, hashUnit string) (regBody string, err error) {
 	etcdUnitPrefix := "/_coreos.com/fleet/unit/"
 	etcdUnitPath := path.Join(etcdUnitPrefix, hashUnit)
 
 	var stdout string
-	if stdout, _, err = util.RunEtcdctl("ls", etcdUnitPath); err != nil {
+	if stdout, _, err = cluster.Etcdctl(m, "ls", etcdUnitPath); err != nil {
 		return "", fmt.Errorf("Failed to list a unit from the registry: %v", err)
 	}
 
 	units := strings.Split(strings.TrimSpace(stdout), "\n")
 	if len(stdout) == 0 || len(units) == 0 {
 		return "", fmt.Errorf("No such unit in the registry: %v", err)
 	}
-	stdout, _, err = util.RunEtcdctl("get", etcdUnitPath)
+	stdout, _, err = cluster.Etcdctl(m, "get", etcdUnitPath)
 	stdout = strings.TrimSpace(stdout)
 	unitBody := strings.Split(stdout, "\n")
 	if err != nil || len(stdout) == 0 || len(unitBody) == 0 {