added the descriptions and sub features like --sortby and INTERVAL

Author: Ramkishor Chaladi

plugin/commands/block/replica_order.go

@@ -34,7 +34,9 @@ func NewReplicaOrderCommand(sl *metadata.SoftlayerStorageCommand) *ReplicaOrderC
 		Use:   "replica-order " + T("IDENTIFIER"),
 		Short: T("Order a block storage replica volume"),
 		Long: T(`${COMMAND_NAME} sl {{.storageType}} replica-order VOLUME_ID [OPTIONS]
-		
+
+Order a block storage replica volume.
+
 EXAMPLE:
    ${COMMAND_NAME} sl {{.storageType}} replica-order 12345678 -s DAILY -d dal09 --tier 4 --os-type LINUX
    This command orders a replica for volume with ID 12345678, which performs DAILY replication, is located at dal09, tier level is 4, OS type is Linux.`, sl.StorageI18n),

plugin/commands/block/replica_partners.go

@@ -1,6 +1,7 @@
 package block
 
 import (
+	"sort"
 	"strconv"
 
 	"github.com/spf13/cobra"
@@ -16,6 +17,7 @@ type ReplicaPartnersCommand struct {
 	*metadata.SoftlayerStorageCommand
 	Command        *cobra.Command
 	StorageManager managers.StorageManager
+	Sortby         string
 }
 
 func NewReplicaPartnersCommand(sl *metadata.SoftlayerStorageCommand) *ReplicaPartnersCommand {
@@ -37,6 +39,7 @@ EXAMPLE:
 		},
 	}
 
+	cobraCmd.Flags().StringVar(&thisCmd.Sortby, "sortby", "username", T("Column to sort by. Options are: id, username, accountId, capacityGb, hardwareId, guestId, hostId"))
 	thisCmd.Command = cobraCmd
 	return thisCmd
 }
@@ -47,6 +50,8 @@ func (cmd *ReplicaPartnersCommand) Run(args []string) error {
 	if err != nil {
 		return slErr.NewInvalidSoftlayerIdInputError("Volume ID")
 	}
+	sortby := cmd.Sortby
+
 	outputFormat := cmd.GetOutputFlag()
 
 	partners, err := cmd.StorageManager.GetReplicationPartners(volumeID)
@@ -55,14 +60,32 @@ func (cmd *ReplicaPartnersCommand) Run(args []string) error {
 		return slErr.NewAPIError(T("Failed to get replication partners for volume {{.VolumeID}}.\n", subs), err.Error(), 2)
 	}
 
+	if sortby == "id" {
+		sort.Sort(utils.VolumeById(partners))
+	} else if sortby == "username" {
+		sort.Sort(utils.VolumeByUsername(partners))
+	} else if sortby == "accountId" {
+		sort.Sort(utils.VolumeByAccountId(partners))
+	} else if sortby == "capacityGb" {
+		sort.Sort(utils.VolumeByCapacity(partners))
+	} else if sortby == "hardwareId" {
+		sort.Sort(utils.VolumeByHardwareById(partners))
+	} else if sortby == "guestId" {
+		sort.Sort(utils.VolumeByGuestId(partners))
+	} else if sortby == "hostId" {
+		sort.Sort(utils.VolumeByHostId(partners))
+	} else {
+		return slErr.NewInvalidUsageError(T("--sortby '{{.Column}}' is not supported.", map[string]interface{}{"Column": sortby}))
+	}
+
 	if outputFormat == "JSON" {
 		return utils.PrintPrettyJSON(cmd.UI, partners)
 	}
 
 	if len(partners) == 0 {
 		cmd.UI.Print(T("There are no replication partners for volume {{.VolumeID}}.\n", subs))
 	} else {
-		table := cmd.UI.Table([]string{T("ID"), T("User name"), T("Account ID"), T("Capacity (GB)"), T("Hardware ID"), T("Guest ID"), T("Host ID")})
+		table := cmd.UI.Table([]string{T("id"), T("username"), T("accountId"), T("capacityGb"), T("hardwareId"), T("guestId"), T("hostId")})
 		for _, p := range partners {
 			table.Add(
 				utils.FormatIntPointer(p.Id),

plugin/commands/block/snapshot_cancel.go

@@ -29,7 +29,9 @@ func NewSnapshotCancelCommand(sl *metadata.SoftlayerStorageCommand) *SnapshotCan
 		Use:   "snapshot-cancel " + T("IDENTIFIER"),
 		Short: T("Cancel existing snapshot space for a given volume"),
 		Long: T(`${COMMAND_NAME} sl {{.storageType}} snapshot-cancel SNAPSHOT_ID [OPTIONS]
-		
+
+Cancel existing snapshot space for a given volume.
+
 EXAMPLE:
    ${COMMAND_NAME} sl {{.storageType}} snapshot-cancel 12345678 --immediate -f 
    This command cancels snapshot with ID 12345678 immediately without asking for confirmation.`, sl.StorageI18n),

plugin/commands/block/snapshot_create.go

@@ -29,6 +29,8 @@ func NewSnapshotCreateCommand(sl *metadata.SoftlayerStorageCommand) *SnapshotCre
 		Short: T("Create a snapshot on a given volume"),
 		Long: T(`${COMMAND_NAME} sl {{.storageType}} snapshot-create VOLUME_ID [OPTIONS]
 
+Creates a snapshot on a given volume.
+
 EXAMPLE:
    ${COMMAND_NAME} sl {{.storageType}} snapshot-create 12345678 --note snapshotforibmcloud
    This command creates a snapshot for volume with ID 12345678 and with addition note as snapshotforibmcloud.`, sl.StorageI18n),

plugin/commands/block/snapshot_disable.go

@@ -28,6 +28,8 @@ func NewSnapshotDisableCommand(sl *metadata.SoftlayerStorageCommand) *SnapshotDi
 		Short: T("Disable snapshots on the specified schedule for a given volume"),
 		Long: T(`${COMMAND_NAME} sl {{.storageType}} snapshot-disable VOLUME_ID [OPTIONS]
 
+Disables snapshots on the specified schedule for a given volume.
+
 EXAMPLE:
    ${COMMAND_NAME} sl {{.storageType}} snapshot-disable 12345678 -s DAILY
    This command disables daily snapshot for volume with ID 12345678.`, sl.StorageI18n),
@@ -36,7 +38,7 @@ EXAMPLE:
 			return thisCmd.Run(args)
 		},
 	}
-	cobraCmd.Flags().StringVarP(&thisCmd.Schedule_type, "schedule-type", "s", "", T("Snapshot schedule [required], options are: HOURLY,DAILY,WEEKLY"))
+	cobraCmd.Flags().StringVarP(&thisCmd.Schedule_type, "schedule-type", "s", "", T("Snapshot schedule [required], options are: INTERVAL,HOURLY,DAILY,WEEKLY"))
 	thisCmd.Command = cobraCmd
 	return thisCmd
 }
@@ -48,11 +50,11 @@ func (cmd *SnapshotDisableCommand) Run(args []string) error {
 		return slErr.NewInvalidSoftlayerIdInputError("Volume ID")
 	}
 	if cmd.Schedule_type == "" {
-		return slErr.NewInvalidUsageError(T("[--schedule-type] is required, options are: HOURLY, DAILY, WEEKLY."))
+		return slErr.NewInvalidUsageError(T("[--schedule-type] is required, options are: INTERVAL, HOURLY, DAILY, WEEKLY."))
 	}
 	scheduleType := cmd.Schedule_type
-	if scheduleType != "HOURLY" && scheduleType != "DAILY" && scheduleType != "WEEKLY" {
-		return slErr.NewInvalidUsageError(T("[--schedule-type] must be HOURLY, DAILY, or WEEKLY."))
+	if scheduleType != "HOURLY" && scheduleType != "DAILY" && scheduleType != "WEEKLY" && scheduleType != "INTERVAL" {
+		return slErr.NewInvalidUsageError(T("[--schedule-type] must be INTERVAL, HOURLY, DAILY, or WEEKLY."))
 	}
 	err = cmd.StorageManager.DisableSnapshots(volumeID, scheduleType)
 	subs := map[string]interface{}{"ScheduleType": scheduleType, "VolumeID": volumeID}

plugin/managers/storage.go

@@ -693,7 +693,7 @@ func (s storageManager) EnableSnapshot(volumeId int, scheduleType string, retent
 
 // Disables snapshots for a specific block volume at a given schedule.
 // volumeId: The id of the volume
-// scheduleType: 'HOURLY'|'DAILY'|'WEEKLY'
+// scheduleType: 'INTERVAL'|'HOURLY'|'DAILY'|'WEEKLY'
 func (s storageManager) DisableSnapshots(volumeId int, scheduleType string) error {
 	_, err := s.StorageService.Id(volumeId).DisableSnapshots(sl.String(scheduleType))
 	return err

plugin/utils/blocksort.go

@@ -36,6 +36,66 @@ func (a VolumeByUsername) Less(i, j int) bool {
 	return false
 }
 
+type VolumeByAccountId []datatypes.Network_Storage
+
+func (a VolumeByAccountId) Len() int {
+	return len(a)
+}
+func (a VolumeByAccountId) Swap(i, j int) {
+	a[i], a[j] = a[j], a[i]
+}
+func (a VolumeByAccountId) Less(i, j int) bool {
+	if a[i].AccountId != nil && a[j].AccountId != nil {
+		return *a[i].AccountId < *a[j].AccountId
+	}
+	return false
+}
+
+type VolumeByHardwareById []datatypes.Network_Storage
+
+func (a VolumeByHardwareById) Len() int {
+	return len(a)
+}
+func (a VolumeByHardwareById) Swap(i, j int) {
+	a[i], a[j] = a[j], a[i]
+}
+func (a VolumeByHardwareById) Less(i, j int) bool {
+	if a[i].HardwareId != nil && a[j].HardwareId != nil {
+		return *a[i].HardwareId < *a[j].HardwareId
+	}
+	return false
+}
+
+type VolumeByGuestId []datatypes.Network_Storage
+
+func (a VolumeByGuestId) Len() int {
+	return len(a)
+}
+func (a VolumeByGuestId) Swap(i, j int) {
+	a[i], a[j] = a[j], a[i]
+}
+func (a VolumeByGuestId) Less(i, j int) bool {
+	if a[i].GuestId != nil && a[j].GuestId != nil {
+		return *a[i].GuestId < *a[j].GuestId
+	}
+	return false
+}
+
+type VolumeByHostId []datatypes.Network_Storage
+
+func (a VolumeByHostId) Len() int {
+	return len(a)
+}
+func (a VolumeByHostId) Swap(i, j int) {
+	a[i], a[j] = a[j], a[i]
+}
+func (a VolumeByHostId) Less(i, j int) bool {
+	if a[i].HostId != nil && a[j].HostId != nil {
+		return *a[i].HostId < *a[j].HostId
+	}
+	return false
+}
+
 type VolumeByDatacenter []datatypes.Network_Storage
 
 func (a VolumeByDatacenter) Len() int {