Merge pull request #717 from Brian-Flores/issue716

Add `--biling` option in `ibmcloud sl block volume-duplicate`

Author: allmightyspiff

plugin/commands/block/volume_duplicate.go

@@ -23,6 +23,7 @@ type VolumeDuplicateCommand struct {
 	DuplicateSnapshotSize int
 	DependentDuplicate    bool
 	Force                 bool
+	Billing               string
 }
 
 func NewVolumeDuplicateCommand(sl *metadata.SoftlayerStorageCommand) *VolumeDuplicateCommand {
@@ -50,6 +51,7 @@ EXAMPLE:
 	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().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
 	return thisCmd
 }
@@ -61,6 +63,14 @@ func (cmd *VolumeDuplicateCommand) Run(args []string) error {
 		return slErr.NewInvalidSoftlayerIdInputError("Volume ID")
 	}
 
+	billing := cmd.Billing
+	hourlyBillingFlag := false
+	if billing != "monthly" && billing != "hourly" {
+		return slErr.NewInvalidUsageError("--billing")
+	} else if billing == "hourly" {
+		hourlyBillingFlag = true
+	}
+
 	outputFormat := cmd.GetOutputFlag()
 
 	if !cmd.Force && outputFormat != "JSON" {
@@ -82,6 +92,7 @@ func (cmd *VolumeDuplicateCommand) Run(args []string) error {
 		DuplicateTier:         cmd.DuplicateTier,
 		DuplicateSnapshotSize: cmd.DuplicateSnapshotSize,
 		DependentDuplicate:    cmd.DependentDuplicate,
+		HourlyBillingFlag:     hourlyBillingFlag,
 	}
 	orderReceipt, err := cmd.StorageManager.OrderDuplicateVolume(config)
 	if err != nil {

plugin/commands/block/volume_duplicate_test.go

@@ -85,6 +85,24 @@ var _ = Describe("Volume duplicate", func() {
 				Expect(results).To(ContainSubstring("Order 555 was placed"))
 			})
 		})
+		Context("Volume duplicate witho hourly billing", func() {
+			BeforeEach(func() {
+				FakeStorageManager.OrderDuplicateVolumeReturns(FakeOrderReceipt, nil)
+			})
+			It("No return error", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "12345", "--billing=hourly", "-f")
+				Expect(err).NotTo(HaveOccurred())
+				results := fakeUI.Outputs()
+				calledWith := FakeStorageManager.OrderDuplicateVolumeArgsForCall(0)
+				Expect(calledWith.DuplicateSnapshotSize).To(Equal(-1))
+				Expect(results).To(ContainSubstring("Order 555 was placed"))
+			})
+			It("Set invalid billing value", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "12345", "--billing=hour", "-f")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("Incorrect Usage: --billing"))
+			})
+		})
 		Context("Ordering Error", func() {
 			BeforeEach(func() {
 				FakeStorageManager.OrderDuplicateVolumeReturns(FakeOrderReceipt, errors.New("SoftLayer_Exception_ApiError"))

plugin/managers/storage.go

@@ -142,6 +142,8 @@ type DuplicateOrderConfig struct {
 	DuplicateSnapshotSize int
 	//Create a dependent duplicate volume.
 	DependentDuplicate bool
+	//Set hourly or monthly billing.
+	HourlyBillingFlag bool
 }
 
 func NewStorageManager(session *session.Session) *storageManager {
@@ -615,6 +617,7 @@ func (s storageManager) OrderDuplicateVolume(config DuplicateOrderConfig) (datat
 	if err != nil {
 		return datatypes.Container_Product_Order_Receipt{}, err
 	}
+	order.UseHourlyPricing = &config.HourlyBillingFlag
 	if config.VolumeType == VOLUME_TYPE_BLOCK {
 		order.OsFormatType = &datatypes.Network_Storage_Iscsi_OS_Type{KeyName: sl.String(osType)}
 	}