previous issues were fixed, now the place quote method creates a quote with pending status

Author: acamacho82

SoftLayer/CLI/order/quote.py SoftLayer/CLI/order/place_quote.pySoftLayer/CLI/order/quote.py renamed to SoftLayer/CLI/order/place_quote.py

@@ -1,43 +1,39 @@
-"""Save an order as quote"""
+"""Place quote"""
 # :license: MIT, see LICENSE for more details.
 
 import json
 
 import click
 
 from SoftLayer.CLI import environment
-from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
 from SoftLayer.managers import ordering
 
-COLUMNS = ['keyName',
-           'description',
-           'cost', ]
 
 @click.command()
 @click.argument('package_keyname')
 @click.argument('location')
 @click.option('--preset',
               help="The order preset (if required by the package)")
 @click.option('--name',
-              help="Quote name (optional)")
+              help="A custom name to be assigned to the quote (optional)")
 @click.option('--send-email',
               is_flag=True,
-              help="Quote will be sent to the email address")
+              help="The quote will be sent to the email address associated.")
 @click.option('--complex-type', help=("The complex type of the order. This typically begins"
                                       " with 'SoftLayer_Container_Product_Order_'."))
 @click.option('--extras',
               help="JSON string denoting extra data that needs to be sent with the order")
 @click.argument('order_items', nargs=-1)
 @environment.pass_env
-def cli(env, package_keyname, location, preset, name, email, complex_type,
+def cli(env, package_keyname, location, preset, name, send_email, complex_type,
         extras, order_items):
-    """Save an order as quote.
+    """Place a quote.
 
-    This CLI command is used for saving an order in quote of the specified package in
+    This CLI command is used for placing a quote of the specified package in
     the given location (denoted by a datacenter's long name). Orders made via the CLI
     can then be converted to be made programmatically by calling
-    SoftLayer.OrderingManager.place_order() with the same keynames.
+    SoftLayer.OrderingManager.place_quote() with the same keynames.
 
     Packages for ordering can be retrieved from `slcli order package-list`
     Presets for ordering can be retrieved from `slcli order preset-list` (not all packages
@@ -49,9 +45,9 @@ def cli(env, package_keyname, location, preset, name, email, complex_type,
 
     \b
     Example:
-        # Order an hourly VSI with 4 CPU, 16 GB RAM, 100 GB SAN disk,
+        # Place quote a VSI with 4 CPU, 16 GB RAM, 100 GB SAN disk,
         # Ubuntu 16.04, and 1 Gbps public & private uplink in dal13
-        slcli order quote --name " My quote name" --email CLOUD_SERVER DALLAS13 \\
+        slcli order place-quote --name " My quote name" --send-email CLOUD_SERVER DALLAS13 \\
             GUEST_CORES_4 \\
             RAM_16_GB \\
             REBOOT_REMOTE_CONSOLE \\
@@ -78,16 +74,18 @@ def cli(env, package_keyname, location, preset, name, email, complex_type,
     kwargs = {'preset_keyname': preset,
               'extras': extras,
               'quantity': 1,
-              'quoteName': name,
-              'sendQuoteEmailFlag': email,
+              'quote_name': name,
+              'send_email': send_email,
               'complex_type': complex_type}
 
-    order = manager.save_quote(*args, **kwargs)
+    order = manager.place_quote(*args, **kwargs)
 
     table = formatting.KeyValueTable(['name', 'value'])
     table.align['name'] = 'r'
     table.align['value'] = 'l'
-    table.add_row(['id', order['orderId']])
+    table.add_row(['id', order['quote']['id']])
+    table.add_row(['name', order['quote']['name']])
     table.add_row(['created', order['orderDate']])
-    table.add_row(['status', order['placedOrder']['status']])
-    env.fout(table)
+    table.add_row(['expires', order['quote']['expirationDate']])
+    table.add_row(['status', order['quote']['status']])
+    env.fout(table)

SoftLayer/CLI/routes.py

@@ -210,6 +210,7 @@
     ('order:place', 'SoftLayer.CLI.order.place:cli'),
     ('order:preset-list', 'SoftLayer.CLI.order.preset_list:cli'),
     ('order:package-locations', 'SoftLayer.CLI.order.package_locations:cli'),
+    ('order:place-quote', 'SoftLayer.CLI.order.place_quote:cli'),
 
     ('rwhois', 'SoftLayer.CLI.rwhois'),
     ('rwhois:edit', 'SoftLayer.CLI.rwhois.edit:cli'),

SoftLayer/managers/ordering.py

@@ -430,36 +430,39 @@ def place_order(self, package_keyname, location, item_keynames, complex_type=Non
                                     extras=extras, quantity=quantity)
         return self.order_svc.placeOrder(order)
 
-    def save_quote(self, package_keyname, location, item_keynames, complex_type=None,
-                    preset_keyname=None, extras=None, quantity=1):
-
-        """Save an order as Quote with the given package and prices.
-
-                This function takes in parameters needed for an order and places the order.
-
-                :param str package_keyname: The keyname for the package being ordered
-                :param str location: The datacenter location string for ordering (Ex: DALLAS13)
-                :param list item_keynames: The list of item keyname strings to order. To see list of
-                                           possible keynames for a package, use list_items()
-                                           (or `slcli order item-list`)
-                :param str complex_type: The complex type to send with the order. Typically begins
-                                         with `SoftLayer_Container_Product_Order_`.
-                :param string preset_keyname: If needed, specifies a preset to use for that package.
-                                              To see a list of possible keynames for a package, use
-                                              list_preset() (or `slcli order preset-list`)
-                :param dict extras: The extra data for the order in dictionary format.
-                                    Example: A VSI order requires hostname and domain to be set, so
-                                    extras will look like the following:
-                                    {'virtualGuests': [{'hostname': 'test', domain': 'softlayer.com'}]}
-                :param int quantity: The number of resources to order
-
-                """
-        order = self.generate_order(package_keyname, location, item_keynames,
-                                    complex_type=complex_type, hourly=False,
-                                    preset_keyname=preset_keyname,
-                                    extras=extras, quantity=quantity)
-        return self.order_svc.placeOrder(order, True)
+    def place_quote(self, package_keyname, location, item_keynames, complex_type=None,
+                    preset_keyname=None, extras=None, quantity=1, quote_name=None, send_email=False):
+
+        """Place a quote with the given package and prices.
+
+        This function takes in parameters needed for an order and places the quote.
+
+        :param str package_keyname: The keyname for the package being ordered
+        :param str location: The datacenter location string for ordering (Ex: DALLAS13)
+        :param list item_keynames: The list of item keyname strings to order. To see list of
+                                   possible keynames for a package, use list_items()
+                                   (or `slcli order item-list`)
+        :param str complex_type: The complex type to send with the order. Typically begins
+                                 with `SoftLayer_Container_Product_Order_`.
+        :param string preset_keyname: If needed, specifies a preset to use for that package.
+                                      To see a list of possible keynames for a package, use
+                                      list_preset() (or `slcli order preset-list`)
+        :param dict extras: The extra data for the order in dictionary format.
+                            Example: A VSI order requires hostname and domain to be set, so
+                            extras will look like the following:
+                            {'virtualGuests': [{'hostname': 'test', domain': 'softlayer.com'}]}
+        :param int quantity: The number of resources to order
+        :param string quote_name: A custom name to be assigned to the quote (optional).
+        :param bool send_email: This flag indicates that the quote should be sent to the email
+                                address associated with the account or order.
+        """
+        order = self.generate_order(package_keyname, location, item_keynames, complex_type=complex_type,
+                                    hourly=False, preset_keyname=preset_keyname, extras=extras, quantity=quantity)
+
+        order['quoteName'] = quote_name
+        order['sendQuoteEmailFlag'] = send_email
 
+        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=1):