POD-135: Fix ping command and change iso field type again

Author: Artem Stoianov

cmd/ping.go

@@ -42,8 +42,9 @@ var (
 )
 
 func initPingCmd(parentCmd *cobra.Command) {
-	parentCmd.AddCommand(pingCmd)
+	addCommonFlags(pingCmd)
 	pingCmd.Flags().IntVarP(&pingLimit, "limit", "L", 1, "The maximum number of nodes to use")
+	parentCmd.AddCommand(pingCmd)
 }
 
 func runPing(c *perfops.Client, target, from string, nodeIDs []int, limit int) error {

cmd/ping_test.go

@@ -25,6 +25,11 @@ func TestInitPingCmd(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 pingLimit, 23 }},
 	}
 	parent := &cobra.Command{}

perfops/geotypes.go

@@ -10,11 +10,11 @@ type (
 
 	// Country contains information about a country.
 	Country struct {
-		ID         int        `json:"id"`
-		Name       string     `json:"name"`
-		ISO        string     `json:"iso"`
-		ISONumeric string     `json:"isoNumeric"`
-		Continent  *Continent `json:"continent,omitempty"`
+		ID         int         `json:"id"`
+		Name       string      `json:"name"`
+		ISO        string      `json:"iso"`
+		ISONumeric interface{} `json:"isoNumeric"` // TODO: Must fix API to return same type for tests and for list endpoints
+		Continent  *Continent  `json:"continent,omitempty"`
 	}
 
 	// City contains information about a city.