Merge pull request #1559 from caberos/1558

return error internal in vs usage feature when sent the valid-type in…

Author: allmightyspiff

SoftLayer/CLI/virt/usage.py

@@ -30,15 +30,15 @@ def cli(env, identifier, start_date, end_date, valid_type, summary_period):
     vs_id = helpers.resolve_id(vsi.resolve_ids, identifier, 'VS')
 
     result = vsi.get_summary_data_usage(vs_id, start_date=start_date, end_date=end_date,
-                                        valid_type=valid_type, summary_period=summary_period)
+                                        valid_type=valid_type.upper(), summary_period=summary_period)
 
     if len(result) == 0:
         raise exceptions.CLIAbort('No metric data for this range of dates provided')
 
     count = 0
     counter = 0.00
     for data in result:
-        if valid_type == "MEMORY_USAGE":
+        if valid_type.upper() == "MEMORY_USAGE":
             usage_counter = data['counter'] / 2 ** 30
         else:
             usage_counter = data['counter']

tests/CLI/modules/vs/vs_tests.py

@@ -736,6 +736,13 @@ def test_usage_vs_cpu(self):
 
         self.assert_no_fail(result)
 
+    def test_usage_vs_cpu_lower_case(self):
+        result = self.run_command(
+            ['vs', 'usage', '100', '--start_date=2019-3-4', '--end_date=2019-4-2', '--valid_type=cpu0',
+             '--summary_period=300'])
+
+        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',