Merge pull request #791 from Ramkishor-Chaladi/issue_732

Added sortby feature in block volume_count and updated existing text in block volume duplicate

Author: allmightyspiff

plugin/commands/block/volume_count.go

@@ -3,19 +3,22 @@ package block
 import (
 	"sort"
 	"strconv"
+	"strings"
 
 	"github.com/spf13/cobra"
 	slErr "github.ibm.com/SoftLayer/softlayer-cli/plugin/errors"
 	. "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 +35,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_BLOCK, cmd.Datacenter, "", "", "", 0, mask)
 	if err != nil {
@@ -56,11 +62,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 strings.ToLower(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/block/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."))
+			})
+		})
 	})
 })

plugin/commands/block/volume_duplicate.go

@@ -45,11 +45,16 @@ EXAMPLE:
 		},
 	}
 	cobraCmd.Flags().IntVarP(&thisCmd.OriginSnapshotId, "origin-snapshot-id", "o", 0, T("ID of an origin volume snapshot to use for duplication"))
-	cobraCmd.Flags().IntVarP(&thisCmd.DuplicateSize, "duplicate-size", "s", 0, T("Size of duplicate block volume in GB, if no size is specified, the size of the original volume will be used"))
-	cobraCmd.Flags().IntVarP(&thisCmd.DuplicateIops, "duplicate-iops", "i", 0, T("Performance Storage IOPS, between 100 and 6000 in multiples of 100, if no IOPS value is specified, the IOPS value of the original volume will be used"))
-	cobraCmd.Flags().Float64VarP(&thisCmd.DuplicateTier, "duplicate-tier", "t", 0, T("Endurance Storage Tier, if no tier is specified, the tier of the original volume will be used"))
-	cobraCmd.Flags().IntVarP(&thisCmd.DuplicateSnapshotSize, "duplicate-snapshot-size", "n", -1, T("The size of snapshot space to order for the duplicate, if no snapshot space size is specified, the snapshot space size of the origin volume will be used"))
-	cobraCmd.Flags().BoolVarP(&thisCmd.DependentDuplicate, "dependent-duplicate", "d", false, T("Whether or not this duplicate will be a dependent duplicate of the origin volume."))
+	cobraCmd.Flags().IntVarP(&thisCmd.DuplicateSize, "duplicate-size", "s", 0, T("Size of duplicate block volume in GB, if no size is specified, the size of the original volume will be used")+" "+
+		T("Potential Sizes: [20, 40, 80, 100, 250, 500, 1000, 2000, 4000, 8000, 12000] Minimum: [the size of the origin volume]"))
+	cobraCmd.Flags().IntVarP(&thisCmd.DuplicateIops, "duplicate-iops", "i", 0, T("Performance Storage IOPS, between 100 and 6000 in multiples of 100, if no IOPS value is specified, the IOPS value of the original volume will be used")+" "+
+		T("Requirements: [If IOPS/GB for the origin volume is less than 0.3, IOPS/GB for the duplicate must also be less than 0.3. If IOPS/GB for the origin volume is greater than or equal to 0.3, IOPS/GB for the duplicate must also be greater than or equal to 0.3.]"))
+	cobraCmd.Flags().Float64VarP(&thisCmd.DuplicateTier, "duplicate-tier", "t", 0, T("Endurance Storage Tier, if no tier is specified, the tier of the original volume will be used")+" "+
+		T("Requirements: [If IOPS/GB for the origin volume is 0.25, IOPS/GB for the duplicate must also be 0.25. If IOPS/GB for the origin volume is greater than 0.25, IOPS/GB for the duplicate must also be greater than 0.25.] Choices: 0.25, 2, 4, 10"))
+	cobraCmd.Flags().IntVarP(&thisCmd.DuplicateSnapshotSize, "duplicate-snapshot-size", "n", -1, T("The size of snapshot space to order for the duplicate, if no snapshot space size is specified, the snapshot space size of the origin volume will be used")+" "+
+		T("Input `0` for this parameter to order a duplicate volume with no snapshot space."))
+	cobraCmd.Flags().BoolVarP(&thisCmd.DependentDuplicate, "dependent-duplicate", "d", false, T("Whether or not this duplicate will be a dependent duplicate of the origin volume.")+" "+
+		T("   [default: False]"))
 	cobraCmd.Flags().BoolVarP(&thisCmd.Force, "force", "f", false, T("Force operation without confirmation"))
 	cobraCmd.Flags().StringVar(&thisCmd.Billing, "billing", "monthly", T("Optional parameter for Billing rate (default to monthly) Choices: hourly or monthly"))
 	thisCmd.Command = cobraCmd