Merge pull request #42 from zarianec/POD-135

POD-135: Added cities and countries

Author: jimaek

Gopkg.lock

@@ -22,13 +22,9 @@
 
 
 [[constraint]]
-  branch = "master"
+  version = "~0.0.5"
   name = "github.com/spf13/cobra"
 
 [[constraint]]
-  branch = "master"
-  name = "github.com/nsf/termbox-go"
-
-[[constraint]]
-  branch = "master"
+  version = "~0.0.3"
   name = "github.com/gosuri/uilive"

Gopkg.toml

@@ -46,11 +46,14 @@ var (
 )
 
 func initCurlCmd(parentCmd *cobra.Command) {
-	parentCmd.AddCommand(curlCmd)
+	addCommonFlags(curlCmd)
+
 	curlCmd.Flags().BoolVarP(&curlHead, "head", "I", false, "Fetch the headers only")
 	curlCmd.Flags().BoolVarP(&curlInsecure, "insecure", "k", false, "Allow curl to proceed for server connections considered insecure")
 	curlCmd.Flags().BoolVarP(&curlHTTP2, "http2", "", false, "Use HTTP version 2")
 	curlCmd.Flags().IntVarP(&curlLimit, "limit", "L", 1, "The maximum number of nodes to use")
+
+	parentCmd.AddCommand(curlCmd)
 }
 
 func runCurl(c *perfops.Client, target string, head, insecure, http2 bool, from string, nodeIDs []int, limit int) error {

cmd/curl.go

@@ -14,6 +14,7 @@
 package cmd
 
 import (
+	"reflect"
 	"testing"
 
 	"github.com/spf13/cobra"
@@ -24,6 +25,11 @@ func TestInitCurlCmd(t *testing.T) {
 		args   []string
 		gotexp func() (interface{}, interface{})
 	}{
+		// Common flags
+		"from":   {[]string{"--from", "Europe"}, func() (interface{}, interface{}) { return from, "Europe" }},
+		"nodeid": {[]string{"--nodeid", "1,2,3"}, func() (interface{}, interface{}) { return nodeIDs, []int{1, 2, 3} }},
+		"json":   {[]string{"--json"}, func() (interface{}, interface{}) { return outputJSON, true }},
+
 		"head":     {[]string{"--head"}, func() (interface{}, interface{}) { return curlHead, true }},
 		"insecure": {[]string{"--insecure"}, func() (interface{}, interface{}) { return curlInsecure, true }},
 		"http2":    {[]string{"--http2"}, func() (interface{}, interface{}) { return curlHTTP2, true }},
@@ -42,7 +48,9 @@ func TestInitCurlCmd(t *testing.T) {
 			if f == nil {
 				t.Fatal("expected flag; got nil")
 			}
-			if got, exp := tc.gotexp(); got != exp {
+
+			got, exp := tc.gotexp();
+			if reflect.DeepEqual(got, exp) == false {
 				t.Fatalf("expected %v; got %v", exp, got)
 			}
 		})

cmd/curl_test.go

@@ -45,9 +45,12 @@ var (
 )
 
 func initDNSPerfCmd(parentCmd *cobra.Command) {
-	parentCmd.AddCommand(dnsPerfCmd)
+	addCommonFlags(dnsPerfCmd)
+
 	dnsPerfCmd.Flags().StringVarP(&dnsPerfDNSServer, "dns-server", "S", "", "The DNS server to use to query for the test. You can use 127.0.0.1 to use the local resolver for location based benchmarking.")
 	dnsPerfCmd.Flags().IntVarP(&dnsPerfLimit, "limit", "L", 1, "The maximum number of nodes to use")
+
+	parentCmd.AddCommand(dnsPerfCmd)
 }
 
 func runDNSPerf(c *perfops.Client, target, dnsServer, from string, nodeIDs []int, limit int) error {

cmd/dnsperf.go

@@ -14,6 +14,7 @@
 package cmd
 
 import (
+	"reflect"
 	"testing"
 
 	"github.com/spf13/cobra"
@@ -24,6 +25,11 @@ func TestInitDNSPerfCmd(t *testing.T) {
 		args   []string
 		gotexp func() (interface{}, interface{})
 	}{
+		// Common flags
+		"from":   {[]string{"--from", "Europe"}, func() (interface{}, interface{}) { return from, "Europe" }},
+		"nodeid": {[]string{"--nodeid", "1,2,3"}, func() (interface{}, interface{}) { return nodeIDs, []int{1, 2, 3} }},
+		"json":   {[]string{"--json"}, func() (interface{}, interface{}) { return outputJSON, true }},
+
 		"dns-server": {[]string{"--dns-server", "123.234.0.1"}, func() (interface{}, interface{}) { return dnsPerfDNSServer, "123.234.0.1" }},
 		"limit":      {[]string{"--limit", "23"}, func() (interface{}, interface{}) { return dnsPerfLimit, 23 }},
 	}
@@ -40,7 +46,9 @@ func TestInitDNSPerfCmd(t *testing.T) {
 			if f == nil {
 				t.Fatal("expected flag; got nil")
 			}
-			if got, exp := tc.gotexp(); got != exp {
+
+			got, exp := tc.gotexp();
+			if reflect.DeepEqual(got, exp) == false {
 				t.Fatalf("expected %v; got %v", exp, got)
 			}
 		})

cmd/dnsperf_test.go

@@ -47,12 +47,16 @@ var (
 )
 
 func initDNSResolveCmd(parentCmd *cobra.Command) {
-	parentCmd.AddCommand(dnsResolveCmd)
+	addCommonFlags(dnsResolveCmd)
+
 	dnsResolveCmd.Flags().StringVarP(&dnsResolveType, "type", "T", "", "The DNS query type. On of: A, AAAA, CNAME, MX, NAPTR, NS, PTR, SOA, SPF, SRV, TXT.")
 	dnsResolveCmd.Flags().StringVarP(&dnsResolveDNSServer, "dns-server", "S", "", "The DNS server to use to query for the test. You can use 127.0.0.1 to use the local resolver for location based benchmarking.")
 	dnsResolveCmd.Flags().IntVarP(&dnsResolveLimit, "limit", "L", 1, "The maximum number of nodes to use")
+
 	dnsResolveCmd.MarkFlagRequired("type")
 	dnsResolveCmd.MarkFlagRequired("dns-server")
+
+	parentCmd.AddCommand(dnsResolveCmd)
 }
 
 func runDNSResolve(c *perfops.Client, target, queryType, dnsServer, from string, nodeIDs []int, limit int) error {

cmd/dnsresolve.go

@@ -14,6 +14,7 @@
 package cmd
 
 import (
+	"reflect"
 	"testing"
 
 	"github.com/spf13/cobra"
@@ -24,6 +25,11 @@ func TestInitDNSResolveCmd(t *testing.T) {
 		args   []string
 		gotexp func() (interface{}, interface{})
 	}{
+		// Common flags
+		"from":   {[]string{"--from", "Europe"}, func() (interface{}, interface{}) { return from, "Europe" }},
+		"nodeid": {[]string{"--nodeid", "1,2,3"}, func() (interface{}, interface{}) { return nodeIDs, []int{1, 2, 3} }},
+		"json":   {[]string{"--json"}, func() (interface{}, interface{}) { return outputJSON, true }},
+
 		"type":       {[]string{"--type", "TXT"}, func() (interface{}, interface{}) { return dnsResolveType, "TXT" }},
 		"dns-server": {[]string{"--dns-server", "123.234.0.1"}, func() (interface{}, interface{}) { return dnsResolveDNSServer, "123.234.0.1" }},
 		"limit":      {[]string{"--limit", "23"}, func() (interface{}, interface{}) { return dnsResolveLimit, 23 }},
@@ -41,7 +47,9 @@ func TestInitDNSResolveCmd(t *testing.T) {
 			if f == nil {
 				t.Fatal("expected flag; got nil")
 			}
-			if got, exp := tc.gotexp(); got != exp {
+
+			got, exp := tc.gotexp();
+			if reflect.DeepEqual(got, exp) == false {
 				t.Fatalf("expected %v; got %v", exp, got)
 			}
 		})

cmd/dnsresolve_test.go

@@ -42,6 +42,7 @@ var (
 )
 
 func initLatencyCmd(parentCmd *cobra.Command) {
+	addCommonFlags(latencyCmd)
 	parentCmd.AddCommand(latencyCmd)
 	latencyCmd.Flags().IntVarP(&latencyLimit, "limit", "L", 1, "The maximum number of nodes to use")
 }

cmd/latency.go

@@ -14,6 +14,7 @@
 package cmd
 
 import (
+	"reflect"
 	"testing"
 
 	"github.com/spf13/cobra"
@@ -24,6 +25,11 @@ func TestInitLatencyCmd(t *testing.T) {
 		args   []string
 		gotexp func() (interface{}, interface{})
 	}{
+		// Common flags
+		"from":   {[]string{"--from", "Europe"}, func() (interface{}, interface{}) { return from, "Europe" }},
+		"nodeid": {[]string{"--nodeid", "1,2,3"}, func() (interface{}, interface{}) { return nodeIDs, []int{1, 2, 3} }},
+		"json":   {[]string{"--json"}, func() (interface{}, interface{}) { return outputJSON, true }},
+
 		"limit": {[]string{"--limit", "23"}, func() (interface{}, interface{}) { return latencyLimit, 23 }},
 	}
 	parent := &cobra.Command{}
@@ -39,7 +45,9 @@ func TestInitLatencyCmd(t *testing.T) {
 			if f == nil {
 				t.Fatal("expected flag; got nil")
 			}
-			if got, exp := tc.gotexp(); got != exp {
+
+			got, exp := tc.gotexp();
+			if reflect.DeepEqual(got, exp) == false {
 				t.Fatalf("expected %v; got %v", exp, got)
 			}
 		})