Add USBController test coverage

Signed-off-by: Sean McGinnis <[email protected]>

redfish/usbcontroller.go

@@ -32,7 +32,7 @@ type USBController struct {
 	// PartNumber shall contain the manufacturer-provided part number for the USB controller.
 	PartNumber string
 	// Ports shall contain a link to a resource collection of type PortCollection.
-	ports []string
+	ports string
 	// SKU shall contain the SKU number for this USB controller.
 	SKU string
 	// SerialNumber shall contain a manufacturer-allocated number that identifies the USB controller.
@@ -59,7 +59,7 @@ func (usbcontroller *USBController) UnmarshalJSON(b []byte) error {
 	var t struct {
 		temp
 		Links Links
-		Ports common.LinksCollection
+		Ports common.Link
 	}
 
 	err := json.Unmarshal(b, &t)
@@ -72,7 +72,7 @@ func (usbcontroller *USBController) UnmarshalJSON(b []byte) error {
 	usbcontroller.pcieDevice = t.Links.PCIeDevice.String()
 	usbcontroller.processors = t.Links.Processors.ToStrings()
 
-	usbcontroller.ports = t.Ports.ToStrings()
+	usbcontroller.ports = t.Ports.String()
 
 	return nil
 }
@@ -108,23 +108,7 @@ func (usbcontroller *USBController) Processors() ([]*Processor, error) {
 
 // Ports gets the ports of the USB controller.
 func (usbcontroller *USBController) Ports() ([]*Port, error) {
-	var result []*Port
-
-	collectionError := common.NewCollectionError()
-	for _, uri := range usbcontroller.ports {
-		item, err := GetPort(usbcontroller.GetClient(), uri)
-		if err != nil {
-			collectionError.Failures[uri] = err
-		} else {
-			result = append(result, item)
-		}
-	}
-
-	if collectionError.Empty() {
-		return result, nil
-	}
-
-	return result, collectionError
+	return ListReferencedPorts(usbcontroller.GetClient(), usbcontroller.ports)
 }
 
 // GetUSBController will get a USBController instance from the service.

redfish/usbcontroller_test.go

@@ -0,0 +1,55 @@
+//
+// SPDX-License-Identifier: BSD-3-Clause
+//
+
+package redfish
+
+import (
+	"encoding/json"
+	"strings"
+	"testing"
+)
+
+var usbControllerBody = `{
+	"@odata.type": "#USBController.v1_0_0.USBController",
+	"Id": "USB1",
+	"Name": "Contoso USB Controller 1",
+	"Manufacturer": "Contoso",
+	"Model": "USBv3",
+	"SKU": "80937",
+	"SerialNumber": "2M220100SL",
+	"PartNumber": "G37891",
+	"SparePartNumber": "G37890",
+	"Status": {
+	  "State": "Enabled",
+	  "Health": "OK"
+	},
+	"Ports": {
+	  "@odata.id": "/redfish/v1/Systems/1/USBControllers/USB1/Ports"
+	},
+	"Links": {
+	  "Processors": [
+		{
+		  "@odata.id": "/redfish/v1/Systems/1/Processors/1"
+		},
+		{
+		  "@odata.id": "/redfish/v1/Systems/1/Processors/2"
+		}
+	  ]
+	},
+	"@odata.id": "/redfish/v1/Systems/1/USBControllers/USB1"
+  }`
+
+// TestUSBController tests the parsing of USBController objects.
+func TestUSBController(t *testing.T) {
+	var result USBController
+	err := json.NewDecoder(strings.NewReader(usbControllerBody)).Decode(&result)
+
+	if err != nil {
+		t.Errorf("Error decoding JSON: %s", err)
+	}
+
+	assertEquals(t, "USB1", result.ID)
+	assertEquals(t, "/redfish/v1/Systems/1/USBControllers/USB1/Ports", result.ports)
+	assertEquals(t, "/redfish/v1/Systems/1/Processors/2", result.processors[1])
+}