Merge pull request #1359 from allmightyspiff/master

remove the zeros(0) in the list.

Author: allmightyspiff

SoftLayer/CLI/hardware/create_options.py

@@ -30,128 +30,110 @@ def cli(env, prices, location=None):
         dc_table.add_row([location_info['name'], location_info['key']])
     tables.append(dc_table)
 
-    if prices:
-        _preset_prices_table(options['sizes'], tables)
-        _os_prices_table(options['operating_systems'], tables)
-        _port_speed_prices_table(options['port_speeds'], tables)
-        _extras_prices_table(options['extras'], tables)
-    else:
-        # Presets
-        preset_table = formatting.Table(['Size', 'Value'], title="Sizes")
-        preset_table.sortby = 'Value'
-        preset_table.align = 'l'
-        for size in options['sizes']:
-            preset_table.add_row([size['name'], size['key']])
-        tables.append(preset_table)
-
-        # Operating systems
-        os_table = formatting.Table(['OS', 'Key', 'Reference Code'], title="Operating Systems")
-        os_table.sortby = 'Key'
-        os_table.align = 'l'
-        for operating_system in options['operating_systems']:
-            os_table.add_row([operating_system['name'], operating_system['key'], operating_system['referenceCode']])
-        tables.append(os_table)
-
-        # Port speed
-        port_speed_table = formatting.Table(['Network', 'Speed', 'Key'], title="Network Options")
-        port_speed_table.sortby = 'Speed'
-        port_speed_table.align = 'l'
-        for speed in options['port_speeds']:
-            port_speed_table.add_row([speed['name'], speed['speed'], speed['key']])
-        tables.append(port_speed_table)
-
-        # Extras
-        extras_table = formatting.Table(['Extra Option', 'Value'], title="Extras")
-        extras_table.sortby = 'Value'
-        extras_table.align = 'l'
-        for extra in options['extras']:
-            extras_table.add_row([extra['name'], extra['key']])
-        tables.append(extras_table)
+    tables.append(_preset_prices_table(options['sizes'], prices))
+    tables.append(_os_prices_table(options['operating_systems'], prices))
+    tables.append(_port_speed_prices_table(options['port_speeds'], prices))
+    tables.append(_extras_prices_table(options['extras'], prices))
 
+    # since this is multiple tables, this is required for a valid JSON object to be rendered.
     env.fout(formatting.listing(tables, separator='\n'))
 
 
-def _preset_prices_table(sizes, tables):
+def _preset_prices_table(sizes, prices=False):
     """Shows Server Preset options prices.
 
     :param [] sizes: List of Hardware Server sizes.
-    :param tables: Table formatting.
+    :param prices: Create a price table or not
     """
-    preset_prices_table = formatting.Table(['Size', 'Value', 'Hourly', 'Monthly'], title="Sizes Prices")
-    preset_prices_table.sortby = 'Value'
-    preset_prices_table.align = 'l'
-    for size in sizes:
-        preset_prices_table.add_row([size['name'], size['key'], "%.4f" % size['hourlyRecurringFee'],
-                                     "%.4f" % size['recurringFee']])
-    tables.append(preset_prices_table)
+    if prices:
+        table = formatting.Table(['Size', 'Value', 'Hourly', 'Monthly'], title="Sizes")
+        for size in sizes:
+            if size.get('hourlyRecurringFee', 0) + size.get('recurringFee', 0) + 1 > 0:
+                table.add_row([size['name'], size['key'], "%.4f" % size['hourlyRecurringFee'],
+                              "%.4f" % size['recurringFee']])
+    else:
+        table = formatting.Table(['Size', 'Value'], title="Sizes")
+        for size in sizes:
+            table.add_row([size['name'], size['key']])
+    table.sortby = 'Value'
+    table.align = 'l'
+    return table
 
 
-def _os_prices_table(operating_systems, tables):
+def _os_prices_table(operating_systems, prices=False):
     """Shows Server Operating Systems prices cost and capacity restriction.
 
     :param [] operating_systems: List of Hardware Server operating systems.
-    :param tables: Table formatting.
+    :param prices: Create a price table or not
     """
-    os_prices_table = formatting.Table(['OS Key', 'Hourly', 'Monthly', 'Restriction'],
-                                       title="Operating Systems Prices")
-    os_prices_table.sortby = 'OS Key'
-    os_prices_table.align = 'l'
-    for operating_system in operating_systems:
-        for price in operating_system['prices']:
-            cr_max = _get_price_data(price, 'capacityRestrictionMaximum')
-            cr_min = _get_price_data(price, 'capacityRestrictionMinimum')
-            cr_type = _get_price_data(price, 'capacityRestrictionType')
-            os_prices_table.add_row(
-                [operating_system['key'],
-                 _get_price_data(price, 'hourlyRecurringFee'),
-                 _get_price_data(price, 'recurringFee'),
-                 "%s - %s %s" % (cr_min, cr_max, cr_type)])
-    tables.append(os_prices_table)
-
-
-def _port_speed_prices_table(port_speeds, tables):
+    if prices:
+        table = formatting.Table(['Key', 'Hourly', 'Monthly', 'Restriction'],
+                                 title="Operating Systems")
+        for operating_system in operating_systems:
+            for price in operating_system['prices']:
+                cr_max = _get_price_data(price, 'capacityRestrictionMaximum')
+                cr_min = _get_price_data(price, 'capacityRestrictionMinimum')
+                cr_type = _get_price_data(price, 'capacityRestrictionType')
+                table.add_row(
+                    [operating_system['key'],
+                     _get_price_data(price, 'hourlyRecurringFee'),
+                     _get_price_data(price, 'recurringFee'),
+                     "%s - %s %s" % (cr_min, cr_max, cr_type)])
+    else:
+        table = formatting.Table(['OS', 'Key', 'Reference Code'], title="Operating Systems")
+        for operating_system in operating_systems:
+            table.add_row([operating_system['name'], operating_system['key'], operating_system['referenceCode']])
+
+    table.sortby = 'Key'
+    table.align = 'l'
+    return table
+
+
+def _port_speed_prices_table(port_speeds, prices=False):
     """Shows Server Port Speeds prices cost and capacity restriction.
 
     :param [] port_speeds: List of Hardware Server Port Speeds.
-    :param tables: Table formatting.
+    :param prices: Create a price table or not
     """
-    port_speed_prices_table = formatting.Table(['Key', 'Speed', 'Hourly', 'Monthly', 'Restriction'],
-                                               title="Network Options Prices")
-    port_speed_prices_table.sortby = 'Speed'
-    port_speed_prices_table.align = 'l'
-    for speed in port_speeds:
-        for price in speed['prices']:
-            cr_max = _get_price_data(price, 'capacityRestrictionMaximum')
-            cr_min = _get_price_data(price, 'capacityRestrictionMinimum')
-            cr_type = _get_price_data(price, 'capacityRestrictionType')
-            port_speed_prices_table.add_row(
-                [speed['key'], speed['speed'],
-                 _get_price_data(price, 'hourlyRecurringFee'),
-                 _get_price_data(price, 'recurringFee'),
-                 "%s - %s %s" % (cr_min, cr_max, cr_type)])
-    tables.append(port_speed_prices_table)
-
-
-def _extras_prices_table(extras, tables):
+    if prices:
+        table = formatting.Table(['Key', 'Speed', 'Hourly', 'Monthly'], title="Network Options")
+        for speed in port_speeds:
+            for price in speed['prices']:
+                table.add_row(
+                    [speed['key'], speed['speed'],
+                     _get_price_data(price, 'hourlyRecurringFee'),
+                     _get_price_data(price, 'recurringFee')])
+    else:
+        table = formatting.Table(['Network', 'Speed', 'Key'], title="Network Options")
+        for speed in port_speeds:
+            table.add_row([speed['name'], speed['speed'], speed['key']])
+    table.sortby = 'Speed'
+    table.align = 'l'
+    return table
+
+
+def _extras_prices_table(extras, prices=False):
     """Shows Server extras prices cost and capacity restriction.
 
     :param [] extras: List of Hardware Server Extras.
-    :param tables: Table formatting.
+    :param prices: Create a price table or not
     """
-    extras_prices_table = formatting.Table(['Extra Option Key', 'Hourly', 'Monthly', 'Restriction'],
-                                           title="Extras Prices")
-    extras_prices_table.align = 'l'
-    for extra in extras:
-        for price in extra['prices']:
-            cr_max = _get_price_data(price, 'capacityRestrictionMaximum')
-            cr_min = _get_price_data(price, 'capacityRestrictionMinimum')
-            cr_type = _get_price_data(price, 'capacityRestrictionType')
-            extras_prices_table.add_row(
-                [extra['key'],
-                 _get_price_data(price, 'hourlyRecurringFee'),
-                 _get_price_data(price, 'recurringFee'),
-                 "%s - %s %s" % (cr_min, cr_max, cr_type)])
-    tables.append(extras_prices_table)
+    if prices:
+        table = formatting.Table(['Key', 'Hourly', 'Monthly'], title="Extras")
+
+        for extra in extras:
+            for price in extra['prices']:
+                table.add_row(
+                    [extra['key'],
+                     _get_price_data(price, 'hourlyRecurringFee'),
+                     _get_price_data(price, 'recurringFee')])
+    else:
+        table = formatting.Table(['Extra Option', 'Key'], title="Extras")
+        for extra in extras:
+            table.add_row([extra['name'], extra['key']])
+    table.sortby = 'Key'
+    table.align = 'l'
+    return table
 
 
 def _get_price_data(price, item):
@@ -164,24 +146,3 @@ def _get_price_data(price, item):
     if item in price:
         result = price[item]
     return result
-
-
-def _location_item_prices(location_prices, tables):
-    """Get a specific data from HS price.
-
-    :param price: Hardware Server price.
-    :param string item: Hardware Server price data.
-    """
-    location_prices_table = formatting.Table(['keyName', 'priceId', 'Hourly', 'Monthly', 'Restriction'])
-    location_prices_table.sortby = 'keyName'
-    location_prices_table.align = 'l'
-    for price in location_prices:
-        cr_max = _get_price_data(price, 'capacityRestrictionMaximum')
-        cr_min = _get_price_data(price, 'capacityRestrictionMinimum')
-        cr_type = _get_price_data(price, 'capacityRestrictionType')
-        location_prices_table.add_row(
-            [price['item']['keyName'], price['id'],
-             _get_price_data(price, 'hourlyRecurringFee'),
-             _get_price_data(price, 'recurringFee'),
-             "%s - %s %s" % (cr_min, cr_max, cr_type)])
-    tables.append(location_prices_table)

SoftLayer/fixtures/SoftLayer_Product_Package.py

@@ -866,8 +866,8 @@
             'referenceCode': 'REDHAT_5_64'
         },
         'prices': [{'id': 1122,
-                    'hourlyRecurringFee': 0.0,
-                    'recurringFee': 0.0,
+                    'hourlyRecurringFee': 0.10,
+                    'recurringFee': 0.10,
                     'categories': [{'id': 26,
                                     'name': 'Uplink Port Speeds',
                                     'categoryCode': 'port_speed'}]}],
@@ -879,8 +879,8 @@
         'description': 'Public & Private Networks',
         'itemCategory': {'categoryCode': 'Uplink Port Speeds'},
         'prices': [{'id': 4477,
-                    'hourlyRecurringFee': 0.0,
-                    'recurringFee': 0.0,
+                    'hourlyRecurringFee': 0.10,
+                    'recurringFee': 0.10,
                     'categories': [{'id': 26,
                                     'name': 'Uplink Port Speeds',
                                     'categoryCode': 'port_speed'}]}],
@@ -921,8 +921,8 @@
         'itemCategory': {'categoryCode': 'Computing Instance'},
         'prices': [{'id': 1144,
                     'locationGroupId': None,
-                    'hourlyRecurringFee': 0.0,
-                    'recurringFee': 0.0,
+                    'hourlyRecurringFee': 0.10,
+                    'recurringFee': 0.10,
                     'categories': [{'id': 80,
                                     'name': 'Computing Instance',
                                     'categoryCode': 'guest_core'}]}],
@@ -948,39 +948,39 @@
         'capacity': '1',
         'description': '1 GB iSCSI Storage',
         'itemCategory': {'categoryCode': 'iscsi'},
-        'prices': [{'id': 2222, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 2222, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {
         'id': 1121,
         'keyName': 'KeyName081',
         'capacity': '20',
         'description': '20 GB iSCSI snapshot',
         'itemCategory': {'categoryCode': 'iscsi_snapshot_space'},
-        'prices': [{'id': 2014, 'hourlyRecurringFee': 0.0}],
+        'prices': [{'id': 2014, 'hourlyRecurringFee': 0.10}],
     },
     {
         'id': 4440,
         'keyName': 'KeyName019',
         'capacity': '4',
         'description': '4 Portable Public IP Addresses',
         'itemCategory': {'categoryCode': 'sov_sec_ip_addresses_pub'},
-        'prices': [{'id': 4444, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 4444, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {
         'id': 8880,
         'keyName': 'KeyName0199',
         'capacity': '8',
         'description': '8 Portable Public IP Addresses',
         'itemCategory': {'categoryCode': 'sov_sec_ip_addresses_pub'},
-        'prices': [{'id': 8888, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 8888, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {
         'id': 44400,
         'keyName': 'KeyName0155',
         'capacity': '4',
         'description': '4 Portable Private IP Addresses',
         'itemCategory': {'categoryCode': 'sov_sec_ip_addresses_priv'},
-        'prices': [{'id': 44441, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 44441, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {
         'id': 88800,
@@ -1012,7 +1012,7 @@
         'capacity': '0',
         'description': 'Global IPv6',
         'itemCategory': {'categoryCode': 'global_ipv6'},
-        'prices': [{'id': 611, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 611, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {'attributes': [],
      'capacity': '0',
@@ -1056,16 +1056,16 @@
      'keyName': 'OS_UBUNTU_14_04_LTS_TRUSTY_TAHR_64_BIT',
      'prices': [{'accountRestrictions': [],
                  'currentPriceFlag': '',
-                 'hourlyRecurringFee': '0',
+                 'hourlyRecurringFee': '0.10',
                  'id': 37650,
                  "locationGroupId": '',
                  'itemId': 4702,
                  'laborFee': '0',
                  'onSaleFlag': '',
                  'oneTimeFee': '0',
                  'quantity': '',
-                 'recurringFee': '0',
-                 'setupFee': '0',
+                 'recurringFee': '0.1',
+                 'setupFee': '0.1',
                  'sort': 9}],
      'softwareDescription': {'id': 1362,
                              'longDescription': 'Ubuntu / 14.04-64',

tests/CLI/modules/server_tests.py

@@ -367,18 +367,16 @@ def test_create_options_prices(self):
 
         self.assert_no_fail(result)
         output = json.loads(result.output)
-        self.assertEqual(output[1][0]['Hourly'], "%.4f" % 0.0)
-        self.assertEqual(output[1][0]['Value'], 'M1_64X512X25')
-        self.assertEqual(output[1][0]['Size'], 'M1.64x512x25')
+        self.assertEqual(output[2][0]['Monthly'], str(0.1))
+        self.assertEqual(output[2][0]['Key'], 'OS_UBUNTU_14_04_LTS_TRUSTY_TAHR_64_BIT')
 
     def test_create_options_location(self):
         result = self.run_command(['server', 'create-options', '--prices', 'dal13'])
 
         self.assert_no_fail(result)
         output = json.loads(result.output)
-        self.assertEqual(output[1][0]['Monthly'], "%.4f" % 0.0)
-        self.assertEqual(output[1][0]['Hourly'], "%.4f" % 0.0)
-        self.assertEqual(output[1][0]['Value'], 'M1_64X512X25')
+        self.assertEqual(output[2][0]['Monthly'], str(0.1))
+        self.assertEqual(output[2][0]['Key'], 'OS_UBUNTU_14_04_LTS_TRUSTY_TAHR_64_BIT')
 
     @mock.patch('SoftLayer.HardwareManager.place_order')
     def test_create_server(self, order_mock):