#1026 resolving pull request feedback

Author: allmightyspiff

SoftLayer/CLI/columns.py

@@ -57,7 +57,7 @@ def mask(self):
 def get_formatter(columns):
     """This function returns a callback to use with click options.
 
-    The returend function parses a comma-separated value and returns a new
+    The returned function parses a comma-separated value and returns a new
     ColumnFormatter.
 
     :param columns: a list of Column instances

SoftLayer/CLI/virt/capacity/create.py

@@ -7,23 +7,21 @@
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.vs_capacity import CapacityManager as CapacityManager
 
-
+from pprint import pprint as pp
 @click.command(epilog=click.style("""WARNING: Reserved Capacity is on a yearly contract"""
                                   """ and not cancelable until the contract is expired.""", fg='red'))
 @click.option('--name', '-n', required=True, prompt=True,
               help="Name for your new reserved capacity")
-@click.option('--datacenter', '-d', required=True, prompt=True,
-              help="Datacenter shortname")
 @click.option('--backend_router_id', '-b', required=True, prompt=True,
               help="backendRouterId, create-options has a list of valid ids to use.")
-@click.option('--capacity', '-c', required=True, prompt=True,
+@click.option('--flavor', '-f', required=True, prompt=True,
               help="Capacity keyname (C1_2X2_1_YEAR_TERM for example).")
-@click.option('--quantity', '-q', required=True, prompt=True,
+@click.option('--instances', '-i', required=True, prompt=True,
               help="Number of VSI instances this capacity reservation can support.")
 @click.option('--test', is_flag=True,
               help="Do not actually create the virtual server")
 @environment.pass_env
-def cli(env, name, datacenter, backend_router_id, capacity, quantity, test=False):
+def cli(env, name, backend_router_id, flavor, instances, test=False):
     """Create a Reserved Capacity instance.
 
     *WARNING*: Reserved Capacity is on a yearly contract and not cancelable until the contract is expired.
@@ -32,10 +30,9 @@ def cli(env, name, datacenter, backend_router_id, capacity, quantity, test=False
 
     result = manager.create(
         name=name,
-        datacenter=datacenter,
         backend_router_id=backend_router_id,
-        capacity=capacity,
-        quantity=quantity,
+        flavor=flavor,
+        instances=instances,
         test=test)
 
     if test:
@@ -44,14 +41,14 @@ def cli(env, name, datacenter, backend_router_id, capacity, quantity, test=False
         table.add_row(['Name', container['name']])
         table.add_row(['Location', container['locationObject']['longName']])
         for price in container['prices']:
-            table.add_row([price['item']['keyName'], price['item']['description']])
-        table.add_row(['Total', result['postTaxRecurring']])
+            table.add_row(['Contract', price['item']['description']])
+        table.add_row(['Hourly Total', result['postTaxRecurring']])
     else:
         table = formatting.Table(['Name', 'Value'], "Reciept")
         table.add_row(['Order Date', result['orderDate']])
         table.add_row(['Order ID', result['orderId']])
         table.add_row(['status', result['placedOrder']['status']])
         for item in result['placedOrder']['items']:
             table.add_row([item['categoryCode'], item['description']])
-        table.add_row(['Total', result['orderDetails']['postTaxRecurring']])
+        table.add_row(['Hourly Total', result['orderDetails']['postTaxRecurring']])
     env.fout(table)

SoftLayer/CLI/virt/capacity/create_options.py

@@ -14,8 +14,10 @@ def cli(env):
     """List options for creating Reserved Capacity"""
     manager = CapacityManager(env.client)
     items = manager.get_create_options()
+    # pp(items)
     items.sort(key=lambda term: int(term['capacity']))
-    table = formatting.Table(["KeyName", "Description", "Term", "Hourly Price"], title="Reserved Capacity Options")
+    table = formatting.Table(["KeyName", "Description", "Term", "Default Hourly Price Per Instance"], 
+                             title="Reserved Capacity Options")
     table.align["Hourly Price"] = "l"
     table.align["Description"] = "l"
     table.align["KeyName"] = "l"
@@ -25,6 +27,7 @@ def cli(env):
         ])
     env.fout(table)
 
+
     regions = manager.get_available_routers()
     location_table = formatting.Table(['Location', 'POD', 'BackendRouterId'], 'Orderable Locations')
     for region in regions:
@@ -38,6 +41,6 @@ def get_price(item):
     """Finds the price with the default locationGroupId"""
     the_price = "No Default Pricing"
     for price in item.get('prices', []):
-        if price.get('locationGroupId') == '':
+        if not price.get('locationGroupId'):
             the_price = "%0.4f" % float(price['hourlyRecurringFee'])
     return the_price

SoftLayer/managers/vs_capacity.py

@@ -97,21 +97,22 @@ def get_available_routers(self, dc=None):
         # Step 4, return the data.
         return regions
 
-    def create(self, name, datacenter, backend_router_id, capacity, quantity, test=False):
+    def create(self, name, backend_router_id, flavor, instances, test=False):
         """Orders a Virtual_ReservedCapacityGroup
 
         :param string name: Name for the new reserved capacity
-        :param string datacenter: like 'dal13'
         :param int backend_router_id: This selects the pod. See create_options for a list
-        :param string capacity: Capacity KeyName, see create_options for a list
-        :param int quantity: Number of guest this capacity can support
+        :param string flavor: Capacity KeyName, see create_options for a list
+        :param int instances: Number of guest this capacity can support
         :param bool test: If True, don't actually order, just test.
         """
-        args = (self.capacity_package, datacenter, [capacity])
+
+        # Since orderManger needs a DC id, just send in 0, the API will ignore it
+        args = (self.capacity_package, 0, [flavor])
         extras = {"backendRouterId": backend_router_id, "name": name}
         kwargs = {
             'extras': extras,
-            'quantity': quantity,
+            'quantity': instances,
             'complex_type': 'SoftLayer_Container_Product_Order_Virtual_ReservedCapacity',
             'hourly': True
         }
@@ -135,6 +136,7 @@ def create_guest(self, capacity_id, test, guest_object):
             }
 
         """
+
         vs_manager = VSManager(self.client)
         mask = "mask[instances[id, billingItem[id, item[id,keyName]]], backendRouter[id, datacenter[name]]]"
         capacity = self.get_object(capacity_id, mask=mask)
@@ -147,6 +149,8 @@ def create_guest(self, capacity_id, test, guest_object):
         guest_object['flavor'] = flavor
         guest_object['datacenter'] = capacity['backendRouter']['datacenter']['name']
 
+        # Reserved capacity only supports SAN as of 20181008
+        guest_object['local_disk'] = False
         template = vs_manager.verify_create_instance(**guest_object)
         template['reservedCapacityId'] = capacity_id
         if guest_object.get('ipv6'):