Merge pull request #698 from Edson-Rios/issue697

Updated command - ibmcloud sl account bandwidth-pools

Author: allmightyspiff

plugin/commands/account/bandwidth_pools.go

@@ -42,21 +42,19 @@ func (cmd *BandwidthPoolsCommand) Run(args []string) error {
 
 	outputFormat := cmd.GetOutputFlag()
 
-	if outputFormat == "JSON" {
-		return utils.PrintPrettyJSON(cmd.UI, pools)
-	}
-
 	table := cmd.UI.Table([]string{
 		T("ID"),
-		T("Pool Name"),
+		T("Name"),
 		T("Region"),
-		T("Servers"),
+		T("Devices"),
 		T("Allocation"),
 		T("Current Usage"),
 		T("Projected Usage"),
+		T("Cost"),
 	})
+
 	for _, pool := range pools {
-		curr_usage, proj_usage, allocation := "-", "-", "-"
+		curr_usage, proj_usage, allocation, cost := "-", "-", "-", "-"
 		if pool.BillingCyclePublicBandwidthUsage != nil {
 			curr_usage = fmt.Sprintf("%.2f GB", float64(*pool.BillingCyclePublicBandwidthUsage.AmountOut))
 		}
@@ -66,6 +64,9 @@ func (cmd *BandwidthPoolsCommand) Run(args []string) error {
 		if pool.TotalBandwidthAllocated != nil {
 			allocation = fmt.Sprintf("%d GB", uint(*pool.TotalBandwidthAllocated))
 		}
+		if pool.BillingItem != nil {
+			cost = fmt.Sprintf("$%d", uint(*pool.BillingItem.NextInvoiceTotalRecurringAmount))
+		}
 		serverCount, _ := cmd.AccountManager.GetBandwidthPoolServers(*pool.Id)
 		table.Add(
 			utils.FormatIntPointer(pool.Id),
@@ -75,10 +76,11 @@ func (cmd *BandwidthPoolsCommand) Run(args []string) error {
 			allocation,
 			curr_usage,
 			proj_usage,
+			cost,
 		)
 	}
 
-	table.Print()
+	utils.PrintTable(cmd.UI, table, outputFormat)
 
 	return nil
 }

plugin/commands/account/bandwidth_pools_test.go

@@ -32,15 +32,29 @@ var _ = Describe("Account Bandwidth-Pools", func() {
 			It("Runs without issue", func() {
 				err := testhelpers.RunCobraCommand(cliCommand.Command)
 				Expect(err).NotTo(HaveOccurred())
-				outputs := fakeUI.Outputs()
-				Expect(outputs).To(ContainSubstring("3361 GB      7.13 GB         7.70 GB"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("Name"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("MexRegion"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("Region"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("MEX"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("Allocation"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("3361 GB"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("Current Usage"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("7.70 GB"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("Cost"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("$25"))
 			})
+
 			It("Outputs JSON", func() {
 				err := testhelpers.RunCobraCommand(cliCommand.Command, "--output=JSON")
 				Expect(err).NotTo(HaveOccurred())
-				outputs := fakeUI.Outputs()
-				Expect(outputs).To(ContainSubstring("\"amountIn\": 7.54252,"))
-
+				Expect(fakeUI.Outputs()).To(ContainSubstring(`"ID": "265721",`))
+				Expect(fakeUI.Outputs()).To(ContainSubstring(`"Name": "TestPool",`))
+				Expect(fakeUI.Outputs()).To(ContainSubstring(`"Projected Usage": "-",`))
+				Expect(fakeUI.Outputs()).To(ContainSubstring(`"Cost": "$55"`))
+				Expect(fakeUI.Outputs()).To(ContainSubstring(`[`))
+				Expect(fakeUI.Outputs()).To(ContainSubstring(`{`))
+				Expect(fakeUI.Outputs()).To(ContainSubstring(`}`))
+				Expect(fakeUI.Outputs()).To(ContainSubstring(`]`))
 			})
 		})
 	})

plugin/managers/account.go

@@ -81,8 +81,7 @@ func (a accountManager) SummaryByDatacenter() (map[string]map[string]int, error)
 
 // https://sldn.softlayer.com/reference/services/SoftLayer_Account/getBandwidthAllotments/
 func (a accountManager) GetBandwidthPools() ([]datatypes.Network_Bandwidth_Version1_Allotment, error) {
-	mask := "mask[totalBandwidthAllocated,locationGroup, id, name, projectedPublicBandwidthUsage, " +
-		"billingCyclePublicBandwidthUsage[amountOut,amountIn]]"
+	mask := "mask[totalBandwidthAllocated,locationGroup, id, name, projectedPublicBandwidthUsage,billingCyclePublicBandwidthUsage[amountOut,amountIn],billingItem[id,nextInvoiceTotalRecurringAmount],outboundPublicBandwidthUsage,serviceProviderId,bandwidthAllotmentTypeId,activeDetailCount]"
 	pools, err := a.AccountService.Mask(mask).GetBandwidthAllotments()
 	return pools, err
 }

plugin/testfixtures/SoftLayer_Account/getBandwidthAllotments.json

@@ -11,6 +11,10 @@
             "locationGroupTypeId": 1,
             "name": "MEX"
         },
+        "billingItem": {
+			"id": 123456,
+			"nextInvoiceTotalRecurringAmount": 25
+		},
         "name": "MexRegion",
         "projectedPublicBandwidthUsage": 7.7,
         "totalBandwidthAllocated": 3361
@@ -27,6 +31,10 @@
             "locationGroupTypeId": 1,
             "name": "US/Canada"
         },
+        "billingItem": {
+			"id": 1234567,
+			"nextInvoiceTotalRecurringAmount": 55
+		},
         "name": "TestPool",
         "totalBandwidthAllocated": 0
     }