Refactor order place quantity option.

Author: Fernando Ojeda

SoftLayer/CLI/order/place.py

@@ -25,6 +25,7 @@
               help="Flag denoting whether or not to only verify the order, not place it")
 @click.option('--quantity',
               type=int,
+              default=1,
               help="The quantity of the item being ordered")
 @click.option('--billing',
               type=click.Choice(['hourly', 'monthly']),

SoftLayer/managers/ordering.py

@@ -415,7 +415,7 @@ def get_item_prices(self, package_id):
         return prices
 
     def verify_order(self, package_keyname, location, item_keynames, complex_type=None,
-                     hourly=True, preset_keyname=None, extras=None, quantity=None):
+                     hourly=True, preset_keyname=None, extras=None, quantity=1):
         """Verifies an order with the given package and prices.
 
         This function takes in parameters needed for an order and verifies the order
@@ -446,7 +446,7 @@ def verify_order(self, package_keyname, location, item_keynames, complex_type=No
         return self.order_svc.verifyOrder(order)
 
     def place_order(self, package_keyname, location, item_keynames, complex_type=None,
-                    hourly=True, preset_keyname=None, extras=None, quantity=None):
+                    hourly=True, preset_keyname=None, extras=None, quantity=1):
         """Places an order with the given package and prices.
 
         This function takes in parameters needed for an order and places the order.
@@ -509,7 +509,7 @@ def place_quote(self, package_keyname, location, item_keynames, complex_type=Non
         return self.order_svc.placeQuote(order)
 
     def generate_order(self, package_keyname, location, item_keynames, complex_type=None,
-                       hourly=True, preset_keyname=None, extras=None, quantity=None):
+                       hourly=True, preset_keyname=None, extras=None, quantity=1):
         """Generates an order with the given package and prices.
 
         This function takes in parameters needed for an order and generates an order
@@ -545,6 +545,7 @@ def generate_order(self, package_keyname, location, item_keynames, complex_type=
         #                                    'domain': 'softlayer.com'}]}
         order.update(extras)
         order['packageId'] = package['id']
+        order['quantity'] = quantity
         order['location'] = self.get_location_id(location)
         order['useHourlyPricing'] = hourly
 
@@ -561,11 +562,6 @@ def generate_order(self, package_keyname, location, item_keynames, complex_type=
             raise exceptions.SoftLayerError("A complex type must be specified with the order")
         order['complexType'] = complex_type
 
-        if not quantity:
-            order['quantity'] = 1
-        else:
-            order['quantity'] = quantity
-
         price_ids = self.get_price_id_list(package_keyname, item_keynames, preset_core)
         order['prices'] = [{'id': price_id} for price_id in price_ids]