Refactor usage vs information.

Author: Fernando Ojeda

SoftLayer/CLI/virt/usage.py

@@ -5,6 +5,7 @@
 
 import SoftLayer
 from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
 from SoftLayer.CLI import helpers
 from SoftLayer.utils import clean_time
@@ -31,23 +32,28 @@ def cli(env, identifier, start_date, end_date, valid_type, summary_period):
     result = vsi.get_summary_data_usage(vs_id, start_date=start_date, end_date=end_date,
                                         valid_type=valid_type, summary_period=summary_period)
 
+    if len(result) == 0:
+        raise exceptions.CLIAbort('No metric data for this range of dates provided')
+
     count = 0
-    counter = 0.0
+    counter = 0.00
     for data in result:
+        if valid_type == "MEMORY_USAGE":
+            usage_counter = data['counter'] / 2 ** 30
+        else:
+            usage_counter = data['counter']
+
         table.add_row([
-            data['counter'],
+            round(usage_counter, 2),
             clean_time(data['dateTime']),
             data['type'],
         ])
-        counter = counter + float(data['counter'])
+        counter = counter + usage_counter
         count = count + 1
 
-    if valid_type == "MEMORY_USAGE":
-        average = (counter / count) / 2 ** 30
-    else:
-        average = counter / count
+    average = counter / count
 
-    env.fout(table_average.add_row([average]))
+    env.fout(table_average.add_row([round(average, 2)]))
 
     env.fout(table_average)
     env.fout(table)

tests/CLI/modules/vs/vs_tests.py

@@ -681,9 +681,18 @@ def test_usage_vs_cpu(self):
         self.assert_no_fail(result)
 
     def test_usage_vs_memory(self):
-
         result = self.run_command(
             ['vs', 'usage', '100', '--start_date=2019-3-4', '--end_date=2019-4-2', '--valid_type=MEMORY_USAGE',
              '--summary_period=300'])
 
         self.assert_no_fail(result)
+
+    def test_usage_metric_data_empty(self):
+        usage_vs = self.set_mock('SoftLayer_Metric_Tracking_Object', 'getSummaryData')
+        test_usage = []
+        usage_vs.return_value = test_usage
+        result = self.run_command(
+            ['vs', 'usage', '100', '--start_date=2019-3-4', '--end_date=2019-4-2', '--valid_type=CPU0',
+             '--summary_period=300'])
+        self.assertEqual(result.exit_code, 2)
+        self.assertIsInstance(result.exception, exceptions.CLIAbort)