Two Bug Fixes

sudorandom · Kevin McDonald · commit 1c7efebc967d · 2015-06-01T12:43:26.000-05:00
Fixes key error when vlans don't have datacenters Gives a better error for when a price can't be found for iscsi. Resolves softlayer#549 and softlayer#552
diff --git a/SoftLayer/CLI/vlan/list.py b/SoftLayer/CLI/vlan/list.py
@@ -4,6 +4,7 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer import utils
 
 
 import click
@@ -43,7 +44,7 @@ def cli(env, sortby, datacenter, number, name):
         table.add_row([
             vlan['id'],
             vlan['vlanNumber'],
-            vlan['primaryRouter']['datacenter']['name'],
+            utils.lookup(vlan, 'primaryRouter', 'datacenter', 'name'),
             vlan.get('name') or formatting.blank(),
             vlan['totalPrimaryIpAddressCount'],
             len(vlan['hardware']),
diff --git a/SoftLayer/managers/iscsi.py b/SoftLayer/managers/iscsi.py
@@ -5,6 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
+from SoftLayer import exceptions
 from SoftLayer import utils
 
 
@@ -28,8 +29,13 @@ def _find_item_prices(self, size, categorycode=''):
                     'categories': {
                         'categoryCode': {'operation': categorycode}
                     }}})
-        item_price = item_prices[0]['prices'][0]['id']
-        return item_price
+
+        for item_price in item_prices:
+            for price in item_price['prices']:
+                return price['id']
+
+        raise exceptions.SoftLayerError(
+            "Could not find a valid price with for the given size")
 
     def _build_order(self, item_price, location):
         """Returns a dict appropriate for Product_Order::placeOrder()."""
