fix the team code review comments

Author: caberos

SoftLayer/CLI/file/options.py

@@ -8,54 +8,43 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 
-volume_size = ['20', '40', '80', '100', '250', '500', '1000', '2000-3000', '4000-7000', '8000-9000', '10000-12000']
+
+PACKAGE_STORAGE = 759
 
 
 @click.command(cls=SLCommand)
 @environment.pass_env
 def cli(env):
     """List all options for ordering a file storage"""
 
-    network_manager = SoftLayer.NetworkManager(env.client)
-    datacenters = network_manager.get_datacenter()
-
-    table = formatting.Table(['Name', 'Value'], title='Volume table')
-
-    table.add_row(['Storage Type', 'performance,endurance'])
-    table.add_row(['Size (GB)', str(volume_size)])
-
-    iops_table = formatting.Table(['Size (GB)', '20', '40', '80', '100', '250', '500', '1000', '2000-3000',
-                                   '4000-7000', '8000-9000', '10000-12000'], title='IOPS table')
-    snapshot_table = formatting.Table(['Storage Size (GB)', 'Available Snapshot Size (GB)'], title="Snapshot table")
-
-    datacenter_str = ','.join([str(dc['longName']) for dc in datacenters])
-    iops_table.add_row(['Size (GB)', *volume_size])
-    iops_table.add_row(['Min IOPS', '100', '100', '100', '100', '100', '100', '100', '200', '300', '500', '1000'])
-    iops_table.add_row(['Max IOPS', '1000', '2000', '4000', '6000', '6000', '6000 or 10000', '6000 or 20000',
-                        '6000 or 40000', '6000 or 48000', '6000 or 48000', '6000 or 48000'])
-    # table.add_row(['iops', iops_table])
-    table.add_row(['Tier', '0.25,2,4,10'])
-    table.add_row(['location', datacenter_str])
-
-    snapshot_table.add_row(['20', '0,5,10,20'])
-    snapshot_table.add_row(['40', '0,5,10,20,40'])
-    snapshot_table.add_row(['80', '0,5,10,20,40,60,80'])
-    snapshot_table.add_row(['100', '0,5,10,20,40,60,80,100'])
-    snapshot_table.add_row(['250', '0,5,10,20,40,60,80,100,150,200,250'])
-    snapshot_table.add_row(['500', '0,5,10,20,40,60,80,100,150,200,250,300,350,400,450,500'])
-    snapshot_table.add_row(['1000', '0,5,10,20,40,60,80,100,150,200,250,300,350,400,450,500,600,700,1000'])
-    snapshot_table.add_row(['2000-3000', '0,5,10,20,40,60,80,100,150,200,250,300,350,400,450,500,600,700,1000,2000'])
-    snapshot_table.add_row(
-        ['4000-7000', '0,5,10,20,40,60,80,100,150,200,250,300,350,400,450,500,600,700,1000,2000,4000'])
-    snapshot_table.add_row(
-        ['8000-9000', '0,5,10,20,40,60,80,100,150,200,250,300,350,400,450,500,600,700,1000,2000,4000'])
-    snapshot_table.add_row(
-        ['10000-12000', '0,5,10,20,40,60,80,100,150,200,250,300,350,400,450,500,600,700,1000,2000,4000'])
-
-    # table.add_row(['Snapshot Size (GB)', snapshot_table])
-    table.add_row(['Note:',
-                   'IOPs limit above 6000 available in select data centers, refer to:'
-                   'http://knowledgelayer.softlayer.com/articles/new-ibm-block-and-file-storage-location-and-features'])
-    env.fout(table)
+    order_manager = SoftLayer.OrderingManager(env.client)
+    items = order_manager.get_items(PACKAGE_STORAGE)
+    datacenters = order_manager.get_regions(PACKAGE_STORAGE)
+
+    iops_table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
+    snapshot_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
+    storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
+    datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
+
+    for datacenter in datacenters:
+        datacenter_table.add_row([datacenter['location']['locationId'],
+                                  datacenter.get('description'),
+                                  datacenter['keyname']])
+
+    for item in items:
+        if item['itemCategory']['categoryCode'] == 'performance_storage_space':
+            storage_table.add_row([item.get('id'), item.get('description'),
+                                   item.get('keyName')])
+
+        if item['itemCategory']['categoryCode'] == 'storage_tier_level':
+            iops_table.add_row([item.get('id'), item.get('description'),
+                                item.get('keyName')])
+
+        if item['itemCategory']['categoryCode'] == 'storage_snapshot_space':
+            snapshot_table.add_row([item.get('id'), item.get('description'),
+                                    item.get('keyName')])
+
+    env.fout(datacenter_table)
     env.fout(iops_table)
+    env.fout(storage_table)
     env.fout(snapshot_table)

SoftLayer/managers/ordering.py

@@ -6,7 +6,6 @@
     :license: MIT, see LICENSE for more details.
 """
 
-
 from re import match
 
 from SoftLayer import exceptions
@@ -717,3 +716,22 @@ def resolve_location_name(self, location_key):
             if location.get('regions', default_regions)[index_first].get('keyname') == location_key:
                 return location_name
         raise exceptions.SoftLayerError("Location {} does not exist".format(location_key))
+
+    def get_items(self, package_id, storage_filter=None):
+        """"Returns the items .
+
+
+        :param int package_id: The package for which to get the items.
+        :param dict storage_filter: object filter.
+        """
+
+        return self.client.call('SoftLayer_Product_Package', 'getItems', filter=storage_filter,
+                                id=package_id)
+
+    def get_regions(self, package_id):
+        """returns the all regions.
+
+
+        :param int package_id: The package for which to get the items.
+        """
+        return self.client.call('SoftLayer_Product_Package', 'getRegions', id=package_id)

tests/managers/ordering_tests.py

@@ -744,7 +744,7 @@ def test_get_item_capacity_core(self):
                 "capacity": "1",
                 "id": 10201,
                 "keyName": "GUEST_CORE_1_DEDICATED",
-        }]
+            }]
 
         item_capacity = self.ordering.get_item_capacity(items, ['GUEST_CORE_1_DEDICATED', 'OS_RHEL_7_X_LAMP_64_BIT'])
 
@@ -761,7 +761,7 @@ def test_get_item_capacity_storage(self):
                 "capacity": "1",
                 "id": 10201,
                 "keyName": "READHEAVY_TIER",
-        }]
+            }]
 
         item_capacity = self.ordering.get_item_capacity(items, ['READHEAVY_TIER', 'STORAGE_SPACE_FOR_2_IOPS_PER_GB'])
 
@@ -779,7 +779,7 @@ def test_get_item_capacity_intel(self):
                 "capacity": "1",
                 "id": 10201,
                 "keyName": "GUEST_CORE_1_DEDICATED",
-        }]
+            }]
 
         item_capacity = self.ordering.get_item_capacity(items, ['INTEL_XEON_2690_2_60', 'BANDWIDTH_20000_GB'])
 
@@ -893,3 +893,11 @@ def test_issues1425_nonzeroterm(self):
         # Test None-existing price for term
         price_id = self.ordering.get_item_price_id("8", [price2, price1], 37)
         self.assertEqual(None, price_id)
+
+    def test_get_items(self):
+        self.ordering.get_items(123)
+        self.assert_called_with('SoftLayer_Product_Package', 'getItems')
+
+    def test_get_regions(self):
+        self.ordering.get_regions(123)
+        self.assert_called_with('SoftLayer_Product_Package', 'getRegions')