Fix location references

Some Location properties were defined as strings, but these should contain a Location structure. Closes stmcginnis#61 Signed-off-by: Sean McGinnis <[email protected]>
USAN · May 20, 2020 · 1e0f2db · 1e0f2db
1 parent 1b79138
commit 1e0f2db
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/redfish/drive_test.go b/redfish/drive_test.go
@@ -67,7 +67,12 @@ var driveBody = strings.NewReader(
 		"NegotiatedSpeedGbps": 10,
 		"Operations": [],
 		"PartNumber": "12345",
-		"PhysicalLocation": {},
+		"PhysicalLocation": {
+				"PartLocation": {
+				"LocationOrdinalValue": 0,
+				"LocationType": "Slot"
+			}
+		},
 		"PredictedMediaLifeLeftPercent": 100,
 		"Protocol": "FC",
 		"Revision": "2.0",

diff --git a/redfish/memory.go b/redfish/memory.go
@@ -236,7 +236,7 @@ type Memory struct {
 	// IsSpareDeviceEnabled shall be true if a spare device is enabled for this Memory.
 	IsSpareDeviceEnabled bool
 	// Location shall contain location information of the associated memory.
-	Location string
+	Location common.Location
 	// LogicalSizeMiB shall be the total size of the logical memory in MiB.
 	LogicalSizeMiB int
 	// Manufacturer shall contain a string which identifies the manufacturer of the Memory.

diff --git a/redfish/memory_test.go b/redfish/memory_test.go
@@ -40,6 +40,13 @@ var memoryBody = strings.NewReader(
 		"FirmwareRevision": "3",
 		"IsRankSpareEnabled": false,
 		"IsSpareDeviceEnabled": false,
+		"Location": {
+			"PartLocation": {
+				"LocationType": "Slot",
+				"ServiceLabel": "DIMM 5",
+				"LocationOrdinalValue": 4
+			}
+		},
 		"LogicalSizeMiB": 2097152,
 		"Manufacturer": "Generic",
 		"MemoryDeviceType": "DDR4",

diff --git a/redfish/networkadapter.go b/redfish/networkadapter.go
@@ -84,8 +84,8 @@ type Controllers struct {
 	// firmware package.
 	FirmwarePackageVersion string
 	// Location shall contain location information of the associated network
-	// adapter controller. TODO: Needs to be a Location struct.
-	//Location string
+	// adapter controller.
+	Location common.Location
 	// PCIeInterface is used to connect this PCIe-based controller to its host.
 	PCIeInterface PCIeInterface
 	// NetworkDeviceFunctions shall be an array of references of type

diff --git a/redfish/power.go b/redfish/power.go
@@ -302,8 +302,8 @@ type PowerSupply struct {
 	// line voltage supported by the associated power supply.
 	LineInputVoltageType LineInputVoltageType
 	// Location shall contain location information of the
-	// associated power supply. TODO: Make Location object.
-	//Location string
+	// associated power supply.
+	Location common.Location
 	// Manufacturer shall be the name of the
 	// organization responsible for producing the power supply. This
 	// organization might be the entity from whom the power supply is

diff --git a/redfish/processor.go b/redfish/processor.go
@@ -287,7 +287,7 @@ type Processor struct {
 	Links string
 	// Location shall contain location information of the
 	// associated processor.
-	Location string
+	Location common.Location
 	// Manufacturer shall contain a string which identifies
 	// the manufacturer of the processor.
 	Manufacturer string