Changes based on peer review notes

Nathan Beittenmiller · Nathan Beittenmiller · commit 54e441daafaf · 2013-07-10T14:28:34.000-05:00
diff --git a/SoftLayer/CLI/modules/bmetal.py b/SoftLayer/CLI/modules/bmetal.py
@@ -429,18 +429,18 @@ def _get_cpu_and_memory_price_ids(cls, bmi_options, cpu_value,
 
     @classmethod
     def _get_default_value(cls, bmi_options, option):
-        if bmi_options['categories'].get(option):
-            for item in bmi_options['categories'][option]['items']:
-                if not any([
-                        float(item['prices'][0].get('setupFee', 0)),
-                        float(item['prices'][0].get('recurringFee', 0)),
-                        float(item['prices'][0].get('hourlyRecurringFee', 0)),
-                        float(item['prices'][0].get('oneTimeFee', 0)),
-                        float(item['prices'][0].get('laborFee', 0)),
-                ]):
-                    return item['price_id']
-
-        return None
+        if option not in bmi_options['categories']:
+            return
+
+        for item in bmi_options['categories'][option]['items']:
+            if not any([
+                    float(item['prices'][0].get('setupFee', 0)),
+                    float(item['prices'][0].get('recurringFee', 0)),
+                    float(item['prices'][0].get('hourlyRecurringFee', 0)),
+                    float(item['prices'][0].get('oneTimeFee', 0)),
+                    float(item['prices'][0].get('laborFee', 0)),
+            ]):
+                return item['price_id']
 
     @classmethod
     def _get_price_id_from_options(cls, bmi_options, option, value):
diff --git a/SoftLayer/CLI/modules/hardware.py b/SoftLayer/CLI/modules/hardware.py
@@ -717,18 +717,18 @@ def execute(cls, client, args):
 
     @classmethod
     def _get_default_value(cls, ds_options, option):
-        if ds_options['categories'].get(option):
-            for item in ds_options['categories'][option]['items']:
-                if not any([
-                        float(item['prices'][0].get('setupFee', 0)),
-                        float(item['prices'][0].get('recurringFee', 0)),
-                        float(item['prices'][0].get('hourlyRecurringFee', 0)),
-                        float(item['prices'][0].get('oneTimeFee', 0)),
-                        float(item['prices'][0].get('laborFee', 0)),
-                ]):
-                    return item['price_id']
-
-        return None
+        if option not in ds_options['categories']:
+            return
+            
+        for item in ds_options['categories'][option]['items']:
+            if not any([
+                    float(item['prices'][0].get('setupFee', 0)),
+                    float(item['prices'][0].get('recurringFee', 0)),
+                    float(item['prices'][0].get('hourlyRecurringFee', 0)),
+                    float(item['prices'][0].get('oneTimeFee', 0)),
+                    float(item['prices'][0].get('laborFee', 0)),
+            ]):
+                return item['price_id']
 
     @classmethod
     def _get_price_id_from_options(cls, ds_options, option, value):
diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -347,18 +347,18 @@ def _get_bare_metal_package_id(self):
         return hw_id
 
     def _get_default_value(self, package_options, category):
-        if package_options['categories'].get(category):
-            for item in package_options['categories'][category]['items']:
-                if not any([
-                        float(item['prices'][0].get('setupFee', 0)),
-                        float(item['prices'][0].get('recurringFee', 0)),
-                        float(item['prices'][0].get('hourlyRecurringFee', 0)),
-                        float(item['prices'][0].get('oneTimeFee', 0)),
-                        float(item['prices'][0].get('laborFee', 0)),
-                ]):
-                    return item['price_id']
-
-        return None
+        if category not in package_options['categories']:
+            return
+            
+        for item in package_options['categories'][category]['items']:
+            if not any([
+                    float(item['prices'][0].get('setupFee', 0)),
+                    float(item['prices'][0].get('recurringFee', 0)),
+                    float(item['prices'][0].get('hourlyRecurringFee', 0)),
+                    float(item['prices'][0].get('oneTimeFee', 0)),
+                    float(item['prices'][0].get('laborFee', 0)),
+            ]):
+                return item['price_id']
 
     def _get_ids_from_hostname(self, hostname):
         results = self.list_hardware(hostname=hostname, mask="id")
@@ -432,7 +432,7 @@ def _parse_package_data(self, id):
                 'price_id': item['prices'][0]['id'],
                 'recurring_fee': float(item['prices'][0].get('recurringFee',
                                                              0)),
-                'capacity': float(item.get('capacity') or 0),
+                'capacity': float(item.get('capacity', 0)),
             })
 
         return results
