Add stat collection to IPTB

.gitignore

@@ -1,2 +1,5 @@
 *.so
 iptb
+.vscode
+topologies/*
+deb.sh

README.md

@@ -7,7 +7,7 @@ libp2p networks easy!
 ### Example
 
 ```
-$ iptb auto -count 5 >/dev/null
+$ iptb auto -count 5 -type <plugin_name> 
 
 $ iptb start
 
@@ -26,7 +26,7 @@ $ iptb shell 4
 $ ipfs cat QmNqugRcYjwh9pEQUK7MLuxvLjxDNZL1DH8PJJgWtQXxuF
 hey!
 ```
-
+Available plugins now: Local IPFS node (plugin_name: localipfs), Docker IPFS node (plugin_name: dockeripfs)
 ### Usage
 ```
 NAME:

commands/auto.go

@@ -50,13 +50,13 @@ $ iptb auto           -count 5 -type <type>
 	Action: func(c *cli.Context) error {
 		flagRoot := c.GlobalString("IPTB_ROOT")
 		flagTestbed := c.GlobalString("testbed")
+		flagEncoding := c.GlobalString("encoding")
 		flagType := c.String("type")
 		flagStart := c.Bool("start")
 		flagCount := c.Int("count")
 		flagForce := c.Bool("force")
 
 		tb := testbed.NewTestbed(path.Join(flagRoot, "testbeds", flagTestbed))
-
 		if err := testbed.AlreadyInitCheck(tb.Dir(), flagForce); err != nil {
 			return err
 		}
@@ -89,7 +89,7 @@ $ iptb auto           -count 5 -type <type>
 			return err
 		}
 
-		if err := buildReport(results); err != nil {
+		if err := buildReport(results, flagEncoding); err != nil {
 			return err
 		}
 
@@ -103,7 +103,7 @@ $ iptb auto           -count 5 -type <type>
 				return err
 			}
 
-			if err := buildReport(results); err != nil {
+			if err := buildReport(results, flagEncoding); err != nil {
 				return err
 			}
 		}

commands/connect.go

@@ -24,9 +24,8 @@ Every node listed in the first set, will try to connect to every node
 listed in the second set.
 
 There are three variants of the command. It can accept no arugments,
-a single argument, or two arguments. The no argument and single argument
-expands out to the two argument usage.
-
+a single argument, two arguments. The no argument and single argument
+expands out to the two argument usage
 $ iptb connect             => iptb connect [0-C] [0-C]
 $ iptb connect [n-m]       => iptb connect [n-m] [n-m]
 $ iptb connect [n-m] [i-k]
@@ -51,16 +50,19 @@ INPUT         EXPANDED
 	Action: func(c *cli.Context) error {
 		flagRoot := c.GlobalString("IPTB_ROOT")
 		flagTestbed := c.GlobalString("testbed")
+		flagEncoding := c.GlobalString("encoding")
+
 		flagTimeout := c.String("timeout")
 
 		timeout, err := time.ParseDuration(flagTimeout)
 		if err != nil {
 			return err
 		}
-
 		tb := testbed.NewTestbed(path.Join(flagRoot, "testbeds", flagTestbed))
-		args := c.Args()
 
+		var results []Result
+		// Case range is specified
+		args := c.Args()
 		switch c.NArg() {
 		case 0:
 			nodes, err := tb.Nodes()
@@ -73,14 +75,19 @@ INPUT         EXPANDED
 				return err
 			}
 
-			return connectNodes(tb, fromto, fromto, timeout)
+			results, err = connectNodes(tb, fromto, fromto, timeout)
+			if err != nil {
+				return err
+			}
 		case 1:
 			fromto, err := parseRange(args[0])
 			if err != nil {
 				return err
 			}
-
-			return connectNodes(tb, fromto, fromto, timeout)
+			results, err = connectNodes(tb, fromto, fromto, timeout)
+			if err != nil {
+				return err
+			}
 		case 2:
 			from, err := parseRange(args[0])
 			if err != nil {
@@ -91,21 +98,23 @@ INPUT         EXPANDED
 			if err != nil {
 				return err
 			}
-
-			return connectNodes(tb, from, to, timeout)
+			results, err = connectNodes(tb, from, to, timeout)
+			if err != nil {
+				return err
+			}
 		default:
 			return NewUsageError("connet accepts between 0 and 2 arguments")
 		}
+		return buildReport(results, flagEncoding)
 	},
 }
 
-func connectNodes(tb testbed.BasicTestbed, from, to []int, timeout time.Duration) error {
+func connectNodes(tb testbed.BasicTestbed, from, to []int, timeout time.Duration) ([]Result, error) {
+	var results []Result
 	nodes, err := tb.Nodes()
 	if err != nil {
-		return err
+		return results, err
 	}
-
-	var results []Result
 	for _, f := range from {
 		for _, t := range to {
 			ctx, cancel := context.WithTimeout(context.Background(), timeout)
@@ -121,5 +130,5 @@ func connectNodes(tb testbed.BasicTestbed, from, to []int, timeout time.Duration
 		}
 	}
 
-	return buildReport(results)
+	return results, nil
 }

commands/init.go

@@ -32,6 +32,7 @@ var InitCmd = cli.Command{
 	Action: func(c *cli.Context) error {
 		flagRoot := c.GlobalString("IPTB_ROOT")
 		flagTestbed := c.GlobalString("testbed")
+		flagEncoding := c.GlobalString("encoding")
 
 		tb := testbed.NewTestbed(path.Join(flagRoot, "testbeds", flagTestbed))
 		nodes, err := tb.Nodes()
@@ -59,6 +60,6 @@ var InitCmd = cli.Command{
 			return err
 		}
 
-		return buildReport(results)
+		return buildReport(results, flagEncoding)
 	},
 }

commands/logs.go

@@ -31,6 +31,7 @@ var LogsCmd = cli.Command{
 	Action: func(c *cli.Context) error {
 		flagRoot := c.GlobalString("IPTB_ROOT")
 		flagTestbed := c.GlobalString("testbed")
+		flagEncoding := c.GlobalString("encoding")
 		flagErr := c.BoolT("err")
 		flagOut := c.BoolT("out")
 
@@ -84,7 +85,7 @@ var LogsCmd = cli.Command{
 			return err
 		}
 
-		return buildReport(results)
+		return buildReport(results, flagEncoding)
 	},
 }
 

commands/restart.go

@@ -36,6 +36,7 @@ var RestartCmd = cli.Command{
 	Action: func(c *cli.Context) error {
 		flagRoot := c.GlobalString("IPTB_ROOT")
 		flagTestbed := c.GlobalString("testbed")
+		flagEncoding := c.GlobalString("encoding")
 		flagWait := c.Bool("wait")
 
 		tb := testbed.NewTestbed(path.Join(flagRoot, "testbeds", flagTestbed))
@@ -68,6 +69,6 @@ var RestartCmd = cli.Command{
 			return err
 		}
 
-		return buildReport(results)
+		return buildReport(results, flagEncoding)
 	},
 }

commands/run.go

@@ -26,12 +26,12 @@ var RunCmd = cli.Command{
 		if present := isTerminatorPresent(c); present {
 			return c.Set("terminator", "true")
 		}
-
 		return nil
 	},
 	Action: func(c *cli.Context) error {
 		flagRoot := c.GlobalString("IPTB_ROOT")
 		flagTestbed := c.GlobalString("testbed")
+		flagEncoding := c.GlobalString("encoding")
 
 		tb := testbed.NewTestbed(path.Join(flagRoot, "testbeds", flagTestbed))
 		nodes, err := tb.Nodes()
@@ -59,6 +59,6 @@ var RunCmd = cli.Command{
 			return err
 		}
 
-		return buildReport(results)
+		return buildReport(results, flagEncoding)
 	},
 }

commands/start.go

@@ -36,6 +36,7 @@ var StartCmd = cli.Command{
 	Action: func(c *cli.Context) error {
 		flagRoot := c.GlobalString("IPTB_ROOT")
 		flagTestbed := c.GlobalString("testbed")
+		flagEncoding := c.GlobalString("encoding")
 		flagWait := c.Bool("wait")
 
 		tb := testbed.NewTestbed(path.Join(flagRoot, "testbeds", flagTestbed))
@@ -64,6 +65,6 @@ var StartCmd = cli.Command{
 			return err
 		}
 
-		return buildReport(results)
+		return buildReport(results, flagEncoding)
 	},
 }

commands/stop.go

@@ -19,6 +19,7 @@ var StopCmd = cli.Command{
 	Action: func(c *cli.Context) error {
 		flagRoot := c.GlobalString("IPTB_ROOT")
 		flagTestbed := c.GlobalString("testbed")
+		flagEncoding := c.GlobalString("encoding")
 
 		tb := testbed.NewTestbed(path.Join(flagRoot, "testbeds", flagTestbed))
 		nodes, err := tb.Nodes()
@@ -46,6 +47,6 @@ var StopCmd = cli.Command{
 			return err
 		}
 
-		return buildReport(results)
+		return buildReport(results, flagEncoding)
 	},
 }

commands/utils.go

@@ -1,12 +1,15 @@
 package commands
 
 import (
+	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/pkg/errors"
 	cli "github.com/urfave/cli"
@@ -121,9 +124,19 @@ func expandDashRange(s string) ([]int, error) {
 }
 
 type Result struct {
-	Node   int
-	Output testbedi.Output
-	Error  error
+	Node    int
+	Output  testbedi.Output
+	Error   error
+	Elapsed time.Duration
+}
+
+type output struct {
+	Node         int
+	ExitCode     int
+	Error        error
+	PluginStdout string
+	PluginStderr string
+	Elapsed      float64
 }
 
 type outputFunc func(testbedi.Core) (testbedi.Output, error)
@@ -141,15 +154,17 @@ func mapWithOutput(list []int, nodes []testbedi.Core, fn outputFunc) ([]Result,
 		wg.Add(1)
 		go func(i, n int, node testbedi.Core) {
 			defer wg.Done()
+			start := time.Now()
 			out, err := fn(node)
-
+			elapsed := time.Since(start)
 			lk.Lock()
 			defer lk.Unlock()
 
 			results[i] = Result{
-				Node:   n,
-				Output: out,
-				Error:  errors.Wrapf(err, "node[%d]", n),
+				Node:    n,
+				Output:  out,
+				Error:   errors.Wrapf(err, "node[%d]", n),
+				Elapsed: elapsed,
 			}
 		}(i, n, nodes[n])
 	}
@@ -175,7 +190,7 @@ func validRange(list []int, total int) error {
 	return nil
 }
 
-func buildReport(results []Result) error {
+func buildReport(results []Result, encoding string) error {
 	var errs []error
 
 	for _, rs := range results {
@@ -184,21 +199,49 @@ func buildReport(results []Result) error {
 		}
 
 		if rs.Output != nil {
-			fmt.Printf("node[%d] exit %d\n", rs.Node, rs.Output.ExitCode())
-			if rs.Output.Error() != nil {
-				fmt.Printf("%s", rs.Output.Error())
+			if encoding == "text" {
+				fmt.Printf("node[%d] exit %d elapsed %s\n", rs.Node, rs.Output.ExitCode(), rs.Elapsed)
+				if rs.Output.Error() != nil {
+					fmt.Printf("%s", rs.Output.Error())
+				}
+				fmt.Println()
+				io.Copy(os.Stdout, rs.Output.Stdout())
+				io.Copy(os.Stdout, rs.Output.Stderr())
+			} else {
+				// Transform plugin stdout to string
+				pluginOutB, err := ioutil.ReadAll(rs.Output.Stdout())
+				if err != nil {
+					errs = append(errs, err)
+				}
+				pluginOut := string(pluginOutB)
+				// Transform plugin stderr to string
+				pluginErrB, err := ioutil.ReadAll(rs.Output.Stderr())
+				if err != nil {
+					errs = append(errs, err)
+				}
+				pluginErr := string(pluginErrB)
+				// JSONify the plugin output
+				rsJSON, err := json.Marshal(output{
+					Node:         rs.Node,
+					ExitCode:     rs.Output.ExitCode(),
+					Error:        rs.Output.Error(),
+					PluginStdout: pluginOut,
+					PluginStderr: pluginErr,
+					Elapsed:      rs.Elapsed.Seconds(),
+				})
+
+				if err != nil {
+					errs = append(errs, err)
+				}
+				fmt.Printf("%s\n", rsJSON)
 			}
-
-			fmt.Println()
-
-			io.Copy(os.Stdout, rs.Output.Stdout())
-			io.Copy(os.Stdout, rs.Output.Stderr())
-
-			fmt.Println()
 		}
 
 	}
-
+	// Add an empty line between the commands if the encoding is not human readable
+	if encoding != "text" {
+		fmt.Println()
+	}
 	if len(errs) != 0 {
 		return cli.NewMultiError(errs...)
 	}