Merge pull request #190 from lpabon/ft_pr

Functional Tests

.gitignore

@@ -21,3 +21,7 @@ _testmain.go
 
 *.exe
 *.test
+
+*.vdi
+.vagrant
+heketi.db

client/api/go-client/client.go

@@ -48,6 +48,33 @@ func NewClientNoAuth(host string) *Client {
 	return NewClient(host, "", "")
 }
 
+// Simple Hello test to check if the server is up
+func (c *Client) Hello() error {
+	// Create request
+	req, err := http.NewRequest("GET", c.host+"/hello", nil)
+	if err != nil {
+		return err
+	}
+
+	// Set token
+	err = c.setToken(req)
+	if err != nil {
+		return err
+	}
+
+	// Get info
+	httpClient := &http.Client{}
+	r, err := httpClient.Do(req)
+	if err != nil {
+		return err
+	}
+	if r.StatusCode != http.StatusOK {
+		return utils.GetErrorFromResponse(r)
+	}
+
+	return nil
+}
+
 // This function is called by the http package if it detects that it needs to
 // be redirected.  This happens when the server returns a 303 HTTP Status.
 // Here we create a new token before it makes the next request.

client/api/go-client/client_test.go

@@ -138,12 +138,12 @@ func TestClientNode(t *testing.T) {
 	nodeReq.Hostnames.Manage = []string{"manage"}
 	nodeReq.Hostnames.Storage = []string{"storage"}
 	nodeReq.Zone = 10
-	_, err = c.NodeCreate(nodeReq)
+	_, err = c.NodeAdd(nodeReq)
 	tests.Assert(t, err != nil)
 
 	// Create node request packet
 	nodeReq.ClusterId = cluster.Id
-	node, err := c.NodeCreate(nodeReq)
+	node, err := c.NodeAdd(nodeReq)
 	tests.Assert(t, err == nil)
 	tests.Assert(t, node.Zone == nodeReq.Zone)
 	tests.Assert(t, node.Id != "")
@@ -204,7 +204,7 @@ func TestClientDevice(t *testing.T) {
 	nodeReq.Zone = 10
 
 	// Create node
-	node, err := c.NodeCreate(nodeReq)
+	node, err := c.NodeAdd(nodeReq)
 	tests.Assert(t, err == nil)
 
 	// Create a device request
@@ -283,7 +283,7 @@ func TestClientVolume(t *testing.T) {
 	nodeReq.Zone = 10
 
 	// Create node
-	node, err := c.NodeCreate(nodeReq)
+	node, err := c.NodeAdd(nodeReq)
 	tests.Assert(t, err == nil)
 
 	// Create a device request

client/api/go-client/node.go

@@ -25,7 +25,7 @@ import (
 	"time"
 )
 
-func (c *Client) NodeCreate(request *glusterfs.NodeAddRequest) (*glusterfs.NodeInfoResponse, error) {
+func (c *Client) NodeAdd(request *glusterfs.NodeAddRequest) (*glusterfs.NodeInfoResponse, error) {
 
 	// Marshal request to JSON
 	buffer, err := json.Marshal(request)

executors/sshexec/brick.go

@@ -32,7 +32,6 @@ func (s *SshExecutor) BrickCreate(host string,
 	godbc.Require(brick.TpSize >= brick.Size)
 	godbc.Require(brick.VgId != "")
 
-	logger.Info("Creating brick on host %v", host)
 	commands := []string{
 
 		// Create a directory

executors/sshexec/peer.go

@@ -31,7 +31,7 @@ func (s *SshExecutor) PeerProbe(host, newnode string) error {
 	commands := []string{
 		fmt.Sprintf("sudo gluster peer probe %v", newnode),
 	}
-	_, err := s.sshExec(host, commands, 5)
+	_, err := s.sshExec(host, commands, 10)
 	if err != nil {
 		return err
 	}
@@ -48,7 +48,7 @@ func (s *SshExecutor) PeerDetach(host, detachnode string) error {
 	commands := []string{
 		fmt.Sprintf("sudo gluster peer detach %v", detachnode),
 	}
-	_, err := s.sshExec(host, commands, 5)
+	_, err := s.sshExec(host, commands, 10)
 	if err != nil {
 		logger.Err(err)
 	}