Inventory: Cores, Power Supplies, motherboard serial.

Add count of CPU cores and power supply count.
Verify motherboard serial number field is populated.

Resolves openbmc/openbmc-test-automation#1590

Signed-off-by: Steven Sombar <ssombar@us.ibm.com>
Change-Id: I5cbf6ec2e4f6bc31b0dcb08b3636a6f95b10c734
diff --git a/data/variables.py b/data/variables.py
index 5da776e..95a5056 100755
--- a/data/variables.py
+++ b/data/variables.py
@@ -157,9 +157,10 @@
 REDFISH_LDAP_CERTIFICATE_URI = REDFISH_BASE_URI + REDFISH_LDAP_CERTIFICATE
 REDFISH_CA_CERTIFICATE = 'Managers/bmc/Truststore/Certificates'
 REDFISH_CA_CERTIFICATE_URI = REDFISH_BASE_URI + REDFISH_CA_CERTIFICATE
-REDFISH_CHASSIS_THERMAL = 'Chassis/chassis/Thermal/'
+REDFISH_CHASSIS_URI = REDFISH_BASE_URI + 'Chassis/'
+REDFISH_CHASSIS_THERMAL = REDFISH_CHASSIS_URI + 'chassis/Thermal/'
 REDFISH_CHASSIS_THERMAL_URI = REDFISH_BASE_URI + REDFISH_CHASSIS_THERMAL
-REDFISH_CHASSIS_POWER = 'Chassis/chassis/Power/'
+REDFISH_CHASSIS_POWER = REDFISH_CHASSIS_URI + 'chassis/Power/'
 REDFISH_CHASSIS_POWER_URI = REDFISH_BASE_URI + REDFISH_CHASSIS_POWER
 
 # Boot options and URI variables.