Merge pull request #1691 from BrianSantivanez/issue1690

Update `slcli hardware sensor`

Author: allmightyspiff

SoftLayer/CLI/hardware/sensor.py

@@ -16,16 +16,16 @@ def cli(env, identifier, discrete):
     mgr = SoftLayer.HardwareManager(env.client)
     sensors = mgr.get_sensors(identifier)
 
-    temperature_table = formatting.Table(["Sensor", "Status", "Reading", "Min", "Max"],
+    temperature_table = formatting.Table(["Sensor", "Status", "Reading", "Critical Min", "Min", "Max", "Critical Max"],
                                          title='Temperature (c)')
 
-    volts_table = formatting.Table(["Sensor", "Status", "Reading", "Min", "Max"],
+    volts_table = formatting.Table(["Sensor", "Status", "Reading", "Critical Min", "Min", "Max", "Critical Max"],
                                    title='Volts')
 
-    watts_table = formatting.Table(["Sensor", "Status", "Reading"],
+    watts_table = formatting.Table(["Sensor", "Status", "Reading", "Critical Min", "Min", "Max", "Critical Max"],
                                    title='Watts')
 
-    rpm_table = formatting.Table(["Sensor", "Status", "Reading", "Min"],
+    rpm_table = formatting.Table(["Sensor", "Status", "Reading", "Critical Min", "Min", "Max", "Critical Max"],
                                  title='RPM')
 
     discrete_table = formatting.Table(["Sensor", "Status", "Reading"],
@@ -36,26 +36,37 @@ def cli(env, identifier, discrete):
             temperature_table.add_row([sensor.get('sensorId'),
                                        sensor.get('status'),
                                        sensor.get('sensorReading'),
+                                       sensor.get('lowerCritical'),
+                                       sensor.get('lowerNonCritical'),
                                        sensor.get('upperNonCritical'),
                                        sensor.get('upperCritical')])
 
-        if sensor.get('sensorUnits') == 'volts':
+        if sensor.get('sensorUnits') == 'Volts':
             volts_table.add_row([sensor.get('sensorId'),
                                  sensor.get('status'),
                                  sensor.get('sensorReading'),
+                                 sensor.get('lowerCritical'),
                                  sensor.get('lowerNonCritical'),
-                                 sensor.get('lowerCritical')])
+                                 sensor.get('upperNonCritical'),
+                                 sensor.get('upperCritical')])
 
         if sensor.get('sensorUnits') == 'Watts':
             watts_table.add_row([sensor.get('sensorId'),
                                  sensor.get('status'),
-                                 sensor.get('sensorReading')])
+                                 sensor.get('sensorReading'),
+                                 sensor.get('lowerCritical'),
+                                 sensor.get('lowerNonCritical'),
+                                 sensor.get('upperNonCritical'),
+                                 sensor.get('upperCritical')])
 
         if sensor.get('sensorUnits') == 'RPM':
             rpm_table.add_row([sensor.get('sensorId'),
                                sensor.get('status'),
                                sensor.get('sensorReading'),
-                               sensor.get('lowerCritical')])
+                               sensor.get('lowerCritical'),
+                               sensor.get('lowerNonCritical'),
+                               sensor.get('upperNonCritical'),
+                               sensor.get('upperCritical')])
 
         if sensor.get('sensorUnits') == 'discrete':
             discrete_table.add_row([sensor.get('sensorId'),

SoftLayer/fixtures/SoftLayer_Hardware.py

@@ -62,6 +62,8 @@
 
 getSensorData = [
     {
+        "lowerCritical": "5.000",
+        "lowerNonCritical": "10.000",
         "sensorId": "Ambient 1 Temperature",
         "sensorReading": "25.000",
         "sensorUnits": "degrees C",
@@ -72,10 +74,13 @@
     },
     {
         "lowerCritical": "3500.000",
+        "lowerNonCritical": "3700.000",
         "sensorId": "Fan 1 Tach",
         "sensorReading": "6580.000",
         "sensorUnits": "RPM",
-        "status": "ok"
+        "status": "ok",
+        "upperCritical": "25400.000",
+        "upperNonCritical": "25300.000",
     }, {
         "sensorId": "IPMI Watchdog",
         "sensorReading": "0x0",
@@ -86,4 +91,16 @@
         "sensorReading": "70.000",
         "sensorUnits": "Watts",
         "status": "ok"
+    },
+    {
+        "lowerCritical": "10.536",
+        "lowerNonCritical": "10.780",
+        "lowerNonRecoverable": "10.170",
+        "sensorId": "12V",
+        "sensorReading": "12.305",
+        "sensorUnits": "Volts",
+        "status": "ok",
+        "upperCritical": "13.281",
+        "upperNonCritical": "12.915",
+        "upperNonRecoverable": "13.403"
     }]