Merge pull request #786 from Ramkishor-Chaladi/issue_748

added sortby feature and unit test cases for sl file volume count

Author: allmightyspiff

plugin/commands/file/volume_count.go

@@ -9,13 +9,15 @@ import (
 	. "github.ibm.com/SoftLayer/softlayer-cli/plugin/i18n"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/managers"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/utils"
 )
 
 type VolumeCountCommand struct {
 	*metadata.SoftlayerStorageCommand
 	Command        *cobra.Command
 	StorageManager managers.StorageManager
 	Datacenter     string
+	SortBy         string
 }
 
 func NewVolumeCountCommand(sl *metadata.SoftlayerStorageCommand) (cmd *VolumeCountCommand) {
@@ -32,11 +34,14 @@ func NewVolumeCountCommand(sl *metadata.SoftlayerStorageCommand) (cmd *VolumeCou
 		},
 	}
 	cobraCmd.Flags().StringVarP(&thisCmd.Datacenter, "datacenter", "d", "", T("Filter by datacenter shortname"))
+	cobraCmd.Flags().StringVarP(&thisCmd.SortBy, "sortby", "s", "", T("Column to sort by"))
 	thisCmd.Command = cobraCmd
 	return thisCmd
 }
 
 func (cmd *VolumeCountCommand) Run(args []string) error {
+	sortby := cmd.SortBy
+	flag := false
 	mask := "mask[id,serviceResource.datacenter.name]"
 	volumes, err := cmd.StorageManager.ListVolumes(managers.VOLUME_TYPE_FILE, cmd.Datacenter, "", "", "", 0, mask)
 	if err != nil {
@@ -56,11 +61,36 @@ func (cmd *VolumeCountCommand) Run(args []string) error {
 	var datacenters []string
 	for key, _ := range result {
 		datacenters = append(datacenters, key)
+		flag = true
 	}
 	sort.Strings(datacenters)
+
+	sortColumns := []string{"Datacenter", "Count"}
+
+	keys := make([]string, 0, len(result))
+	_, err = utils.ValidateColumns2(sortby, nil, nil, nil, sortColumns)
+	if err != nil {
+		return err
+	}
+
 	table := cmd.UI.Table([]string{T("Data center"), T("Count")})
-	for _, dc := range datacenters {
-		table.Add(dc, strconv.Itoa(result[dc]))
+
+	if sortby == "Count" || sortby == "count" {
+		for key := range result {
+			keys = append(keys, key)
+		}
+		sort.SliceStable(keys, func(i, j int) bool {
+			return result[keys[i]] < result[keys[j]]
+		})
+		for _, k := range keys {
+			table.Add(k, strconv.Itoa(result[k]))
+		}
+		flag = false
+	}
+	if flag == true {
+		for _, dc := range datacenters {
+			table.Add(dc, strconv.Itoa(result[dc]))
+		}
 	}
 	table.Print()
 	return nil

plugin/commands/file/volume_count_test.go

@@ -19,7 +19,7 @@ import (
 var listVolumeReturns = []datatypes.Network_Storage{
 	datatypes.Network_Storage{
 		ServiceResource: &datatypes.Network_Service_Resource{
-			Datacenter: &datatypes.Location{Name: sl.String("dal10")},
+			Datacenter: &datatypes.Location{Name: sl.String("dal10"), RegionCount: sl.Uint(4)},
 		},
 	},
 }
@@ -80,5 +80,30 @@ var _ = Describe("Volume cancel", func() {
 				Expect(err.Error()).To(ContainSubstring("Failed to list volumes on your account."))
 			})
 		})
+		Context("sortby count", func() {
+			BeforeEach(func() {
+				FakeStorageManager.ListVolumesReturns(listVolumeReturns, nil)
+			})
+			It("Sorting the Count Column", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "--sortby", "Count")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(fakeUI.Outputs()).To(ContainSubstring("Data center   Count"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("dal10         1"))
+			})
+		})
+		Context("sortby blank value passed Error", func() {
+			It("return error", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "--sortby")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("flag needs an argument: --sortby"))
+			})
+		})
+		Context("sortby wrong value passed Error", func() {
+			It("return error", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "--sortby", "zc,.//")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("Incorrect Usage: --sortby zc,.// is not supported."))
+			})
+		})
 	})
 })