finishing up vlan tag features

Author: allmightyspiff

plugin/commands/hardware/detail.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/bluemix/terminal"
 	"github.com/spf13/cobra"
-
+	"github.ibm.com/SoftLayer/softlayer-cli/plugin/errors"
 	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"
@@ -55,9 +55,24 @@ func (cmd *DetailCommand) Run(args []string) error {
 
 	outputFormat := cmd.GetOutputFlag()
 
-	hardware, err := cmd.HardwareManager.GetHardwareFast(hardwareId)
+	hardware, err := cmd.HardwareManager.GetHardware(hardwareId, "")
+	if err != nil {
+		return errors.NewAPIError(T("Failed to get hardware server: {{.ID}}.\n", map[string]interface{}{"ID": hardwareId}), err.Error(), 2)
+	}
+
+	hardDrives, err := cmd.HardwareManager.GetHardDrives(hardwareId)
 	if err != nil {
-		return slErr.NewAPIError(T("Failed to get hardware server: {{.ID}}.\n", map[string]interface{}{"ID": hardwareId}), err.Error(), 2)
+		return err
+	}
+
+	bandwidthAllotmentDetail, err := cmd.HardwareManager.GetBandwidthAllotmentDetail(hardwareId, "")
+	if err != nil {
+		return err
+	}
+
+	billingCycleBandwidthUsage, err := cmd.HardwareManager.GetBillingCycleBandwidthUsage(hardwareId, "")
+	if err != nil {
+		return err
 	}
 
 	if outputFormat == "JSON" {
@@ -79,10 +94,10 @@ func (cmd *DetailCommand) Run(args []string) error {
 	table.Add(T("CPU cores"), utils.FormatUIntPointer(hardware.ProcessorPhysicalCoreAmount))
 	table.Add(T("Memory"), utils.FormatUIntPointer(hardware.MemoryCapacity)+"G")
 
-	if len(hardware.HardDrives) > 0 {
+	if len(hardDrives) > 0 {
 		buf := new(bytes.Buffer)
 		hardDriveTable := terminal.NewTable(buf, []string{T("Name"), T("Capacity"), T("Serial #")})
-		for _, hardDrive := range hardware.HardDrives {
+		for _, hardDrive := range hardDrives {
 			name := *hardDrive.HardwareComponentModel.Manufacturer + " " + *hardDrive.HardwareComponentModel.Name
 			capacity := fmt.Sprintf(
 				"%.2f %s",
@@ -155,6 +170,9 @@ func (cmd *DetailCommand) Run(args []string) error {
 		for _, component := range hardware.NetworkComponents {
 			if component.PrimaryIpAddress != nil {
 				uplink := component.UplinkComponent
+				if uplink == nil {
+					continue
+				}
 				for _, trunk := range uplink.NetworkVlanTrunks {
 					t_vlan := trunk.NetworkVlan
 					vlanTable.Add(
@@ -171,18 +189,18 @@ func (cmd *DetailCommand) Run(args []string) error {
 		table.Add("Vlans", buf.String())
 	}
 
-	if len(hardware.BillingCycleBandwidthUsage) > 0 {
+	if len(billingCycleBandwidthUsage) > 0 {
 		buf := new(bytes.Buffer)
 		bandwithTable := terminal.NewTable(buf, []string{T("Type"), T("In GB"), T("Out GB"), T("Allotment")})
-		for _, billingCycle := range hardware.BillingCycleBandwidthUsage {
+		for _, billingCycle := range billingCycleBandwidthUsage {
 			bw_type := "Private"
 			allotment := "N/A"
 			if *billingCycle.Type.Alias == "PUBLIC_SERVER_BW" {
 				bw_type = "Public"
-				if hardware.BandwidthAllotmentDetail.Allocation == nil {
+				if bandwidthAllotmentDetail.Allocation == nil {
 					allotment = "-"
 				} else {
-					allotment = utils.FormatSLFloatPointerToInt(hardware.BandwidthAllotmentDetail.Allocation.Amount)
+					allotment = utils.FormatSLFloatPointerToInt(bandwidthAllotmentDetail.Allocation.Amount)
 				}
 			}
 			bandwithTable.Add(
@@ -248,13 +266,11 @@ func (cmd *DetailCommand) Run(args []string) error {
 		}
 	}
 
-	// For some reason, the API response here has a hardwareComponent for EACH firmware, each with the whole list of firmwares
-	// There should be a better way to get this from the API.
 	if cmd.Components {
 		components, err := cmd.HardwareManager.GetHardwareComponents(hardwareId)
 		componentIds := []int{}
 		if err != nil {
-			return slErr.NewAPIError(T("Failed to get components\n"), err.Error(), 2)
+			return errors.NewAPIError(T("Failed to get components\n"), err.Error(), 2)
 		}
 		buf := new(bytes.Buffer)
 		componentTable := terminal.NewTable(buf, []string{T("Name"), T("Firmware version"), T("Firmware build date"), T("Type")})

plugin/commands/hardware/detail_test.go

@@ -101,12 +101,11 @@ var _ = Describe("hardware detail", func() {
 				Expect(fakeUI.Outputs()).To(ContainSubstring("Owner              SL123456"))
 				Expect(fakeUI.Outputs()).To(ContainSubstring("Note               My golang note"))
 				Expect(fakeUI.Outputs()).To(ContainSubstring("Public    0.232080   0.101300   20000"))
-				Expect(fakeUI.Outputs()).To(ContainSubstring("RAM                Micron / 8GB DDR4 1Rx8 / 2400 ECC NON Reg"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("RAM                Hynix / 16GB DDR4 "))
 			})
 			It("Price, Passwords, and Components", func() {
 				err := testhelpers.RunCobraCommand(cliCommand.Command, "1234", "--passwords", "--price", "--components")
 				Expect(err).NotTo(HaveOccurred())
-				Expect(fakeUI.Outputs()).To(ContainSubstring("Administrator   ThisPasswordISFake"))
 				Expect(fakeUI.Outputs()).To(ContainSubstring("root            FakePassword"))
 				Expect(fakeUI.Outputs()).To(ContainSubstring("SN06               2023-02-19T06:00:07Z   HARD_DRIVE"))
 				Expect(fakeUI.Outputs()).To(ContainSubstring("Lenovo / 3943PAJ / Systemx3250-M6 / Intel Xeon SingleProc SATA / 1"))
@@ -115,6 +114,12 @@ var _ = Describe("hardware detail", func() {
 				Expect(fakeUI.Outputs()).To(ContainSubstring("Datacenter         dal10"))
 				Expect(fakeUI.Outputs()).To(ContainSubstring("ID                 218027"))
 			})
+			It("Trunkable Vlans", func() {
+				err := testhelpers.RunCobraCommand(cliCommand.Command, "1001")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(fakeUI.Outputs()).To(ContainSubstring("PUBLIC    974      3249384   dal10.fcr01.974    Trunked"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("PRIVATE   886      2848186   -                  Primary"))
+			})
 		})
 
 		Context("Issue #649", func() {

plugin/commands/hardware/vlan_trunkable_test.go

@@ -12,7 +12,7 @@ import (
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/testhelpers"
 )
 
-var _ = Describe("VLAN-REMOVE Tests", func() {
+var _ = Describe("VLAN-TRUNKABLE Tests", func() {
 	var (
 		fakeUI      *terminal.FakeUI
 		cliCommand  *hardware.VlanTrunkableCommand

plugin/managers/hardware.go

@@ -20,12 +20,12 @@ const (
 	DEFAULT_SERVER_MASK   = "mask[" + DEFAULT_HARDWARE_MASK + ",mask(SoftLayer_Hardware_Server)[activeTransaction[id,transactionStatus[name,friendlyName]]]]"
 	DETAIL_HARDWARE_MASK  = "id,globalIdentifier,fullyQualifiedDomainName,hostname,domain,provisionDate,hardwareStatus,processorPhysicalCoreAmount," +
 		"memoryCapacity,notes,privateNetworkOnlyFlag,primaryBackendIpAddress,primaryIpAddress,networkManagementIpAddress,userData,datacenter," +
-		"networkComponents[id,status,speed,maxSpeed,name,ipmiMacAddress,ipmiIpAddress,macAddress,primaryIpAddress,port," +
+		"networkComponents[id,status,speed,maxSpeed,name,ipmiMacAddress,ipmiIpAddress,macAddress,primaryIpAddress,port,uplinkComponent[id,networkVlanTrunks[networkVlan]]," +
 		"primarySubnet[id,netmask,broadcastAddress,networkIdentifier,gateway],uplinkComponent[networkVlanTrunks[networkVlan[networkSpace,vlanNumber,id,fullyQualifiedName]]]]" +
 		",hardwareChassis[id,name],activeTransaction[id,transactionStatus[friendlyName,name]]," +
 		"operatingSystem[softwareLicense[softwareDescription[manufacturer,name,version,referenceCode]],passwords[username,password]]," +
 		"billingItem[id,nextInvoiceTotalRecurringAmount,children[nextInvoiceTotalRecurringAmount],nextInvoiceChildren[description,categoryCode,nextInvoiceTotalRecurringAmount],orderItem.order.userRecord[username]]," +
-		"hourlyBillingFlag,tagReferences[id,tag[name,id]],networkVlans[id,vlanNumber,networkSpace],remoteManagementAccounts[username,password],lastTransaction[transactionGroup],activeComponents"
+		"hourlyBillingFlag,tagReferences[id,tag[name,id]],networkVlans[id,vlanNumber,networkSpace,fullyQualifiedName],remoteManagementAccounts[username,password],lastTransaction[transactionGroup],activeComponents"
 
 	KEY_SIZES                  = "sizes"
 	KEY_OS                     = "operating_systems"
@@ -304,7 +304,7 @@ func (hw hardwareServerManager) GetHardwareFast(hardwareId int) (datatypes.Hardw
 	}()
 	go func() {
 		defer wg.Done()
-		mask := "id,nextInvoiceTotalRecurringAmount,nextInvoiceChildren[id,nextInvoiceTotalRecurringAmount]," +
+		mask := "id,nextInvoiceTotalRecurringAmount,nextInvoiceChildren[id,description,categoryCode,nextInvoiceTotalRecurringAmount]," +
                 "orderItem[id,order[id,userRecord[id,username]]]"
 		billingItem, err := hw.HardwareService.Id(hardwareId).Mask(mask).GetBillingItem()
 		all_err = errors.Join(all_err, err)