Merge pull request #1452 from caberos/issue1448

add the Hardware components on "slcli hardware detail"

Author: allmightyspiff

SoftLayer/CLI/hardware/detail.py

@@ -71,6 +71,8 @@ def cli(env, identifier, passwords, price):
     bandwidth = hardware.get_bandwidth_allocation(hardware_id)
     bw_table = _bw_table(bandwidth)
     table.add_row(['Bandwidth', bw_table])
+    system_table = _system_table(result['activeComponents'])
+    table.add_row(['System_data', system_table])
 
     if result.get('notes'):
         table.add_row(['notes', result['notes']])
@@ -119,3 +121,13 @@ def _bw_table(bw_data):
 
         table.add_row([bw_type, bw_point['amountIn'], bw_point['amountOut'], allotment])
     return table
+
+
+def _system_table(system_data):
+    table = formatting.Table(['Type', 'name'])
+    for system in system_data:
+        table.add_row([utils.lookup(system, 'hardwareComponentModel',
+                                    'hardwareGenericComponentModel',
+                                    'hardwareComponentType', 'keyName'),
+                       utils.lookup(system, 'hardwareComponentModel', 'longDescription')])
+    return table

SoftLayer/managers/hardware.py

@@ -239,6 +239,8 @@ def get_hardware(self, hardware_id, **kwargs):
                 'primaryIpAddress,'
                 'networkManagementIpAddress,'
                 'userData,'
+                'activeComponents[id,hardwareComponentModel['
+                'hardwareGenericComponentModel[id,hardwareComponentType[keyName]]]],'
                 'datacenter,'
                 '''networkComponents[id, status, speed, maxSpeed, name,
                    ipmiMacAddress, ipmiIpAddress, macAddress, primaryIpAddress,