Work on hardware ordering (adds extra options, makes it work)

sudorandom · sudorandom · commit 258c215b7b01 · 2015-03-26T16:02:11.000-05:00
diff --git a/SoftLayer/CLI/server/create.py b/SoftLayer/CLI/server/create.py
@@ -17,6 +17,11 @@
 @click.option('--size', '-s', help="Hardware size")
 @click.option('--os', '-o', help="OS install code")
 @click.option('--datacenter', '-d', help="Datacenter shortname")
+@click.option('--billing',
+              type=click.Choice(['hourly', 'monthly']),
+              default='hourly',
+              help="Billing rate")
+@click.option('--port-speed', type=click.INT, help="Port speeds")
 @click.option('--test',
               is_flag=True,
               help="Do not actually create the virtual server")
@@ -34,6 +39,7 @@
               help="The ID of the private VLAN on which you want the virtual "
                    "server placed",
               type=click.INT)
+@click.option('--extras', default='', help="Extra options; comma-separated")
 @click.option('--wait',
               type=click.INT,
               help="Wait until the server is finished provisioning for up to "
@@ -63,6 +69,10 @@ def cli(env, **args):
         'ssh_keys': ssh_keys,
         'post_uri': args.get('postinstall'),
         'os': args['os'],
+        'hourly': args.get('billing') == 'hourly',
+        'port_speed': args.get('port_speed'),
+        'no_public': args.get('no_public') or False,
+        'extras': args.get('extras').split(','),
     }
 
     # Do not create hardware server with --test or --export
diff --git a/SoftLayer/CLI/server/create_options.py b/SoftLayer/CLI/server/create_options.py
@@ -2,6 +2,7 @@
 # :license: MIT, see LICENSE for more details.
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.managers import hardware
 
 import click
 
@@ -14,7 +15,15 @@ def cli(env):
     mask = """
 id,
 activePresets,
-items[keyName,description,itemCategory[id,categoryCode]],
+items[
+    keyName,
+    capacity,
+    description,
+    attributes[id,attributeTypeKeyName],
+    softwareDescription[id,referenceCode,longDescription],
+    itemCategory[id,categoryCode],
+    prices
+],
 regions[location[location]]
 """
     package = env.client['Product_Package'].getObject(id=200, mask=mask)
@@ -40,7 +49,24 @@ def cli(env):
     os_table = formatting.Table(['operating_system', 'value'])
     for item in package['items']:
         if item['itemCategory']['categoryCode'] == 'os':
-            os_table.add_row([item['description'], item['keyName']])
+            os_table.add_row([item['softwareDescription']['longDescription'],
+                              item['softwareDescription']['referenceCode']])
     tables.append(os_table)
 
+    # Port speed
+    port_speed_table = formatting.Table(['port_speed', 'value'])
+    for item in package['items']:
+        if all([item['itemCategory']['categoryCode'] == 'port_speed',
+                not hardware.is_private_port_speed_item(item),
+                ]):
+            port_speed_table.add_row([item['description'], item['capacity']])
+    tables.append(port_speed_table)
+
+    port_speed_table = formatting.Table(['extras', 'value'])
+    for item in package['items']:
+        if item['itemCategory']['categoryCode'] in ['pri_ipv6_addresses',
+                                                    'static_ipv6_addresses',
+                                                    'sec_ip_addresses']:
+            port_speed_table.add_row([item['description'], item['keyName']])
+    tables.append(port_speed_table)
     return tables
diff --git a/SoftLayer/CLI/virt/create.py b/SoftLayer/CLI/virt/create.py
@@ -25,7 +25,7 @@
 @click.option('--billing',
               type=click.Choice(['hourly', 'monthly']),
               default='hourly',
-              help="""Billing rate""")
+              help="Billing rate")
 @click.option('--datacenter', '-d', help="Datacenter shortname")
 @click.option('--dedicated/--public',
               is_flag=True,
@@ -114,7 +114,7 @@ def cli(env, **args):
             total = total_monthly
 
         billing_rate = 'monthly'
-        if args.get('hourly'):
+        if args.get('billing') == 'hourly':
             billing_rate = 'hourly'
         table.add_row(['Total %s cost' % billing_rate, "%.2f" % total])
         output.append(table)
diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -13,14 +13,6 @@
 # Invalid names are ignored due to long method names and short argument names
 # pylint: disable=invalid-name, no-self-use
 
-REQUIRED_CATEGORIES = [
-    'bandwidth',
-    'port_speed',
-    'pri_ip_addresses',
-    'vpn_management',
-    'remote_management',
-]
-
 
 class HardwareManager(utils.IdentifierMixin, object):
     """Manage hardware devices.
@@ -309,13 +301,17 @@ def _generate_create_dict(self,
                               domain=None,
                               datacenter=None,
                               os=None,
+                              port_speed=None,
                               ssh_keys=None,
                               public_vlan=None,
                               private_vlan=None,
-                              post_uri=None):
-        """Translates arguments into a dictionary for creating a server.
+                              post_uri=None,
+                              hourly=True,
+                              no_public=False,
+                              extras=None):
+        """Translates arguments into a dictionary for creating a server."""
 
-        """
+        extras = extras or []
 
         hardware = {
             'hostname': hostname,
@@ -332,26 +328,44 @@ def _generate_create_dict(self,
         package_mask = '''
 items[
     keyName,
+    capacity,
     description,
+    attributes[id,attributeTypeKeyName],
     itemCategory[id,categoryCode],
+    softwareDescription[id,referenceCode],
     prices
-]
+],
+regions[location[location]]
 '''
         package = self.client['Product_Package'].getObject(id=200,
                                                            mask=package_mask)
 
         prices = []
-        for category in REQUIRED_CATEGORIES:
-            prices.append(_get_default_price_id(package['items'], category))
+        for category in ['pri_ip_addresses',
+                         'vpn_management',
+                         'remote_management',
+                         ]:
+            prices.append(_get_default_price_id(package['items'],
+                                                category,
+                                                hourly))
 
         prices.append(_get_os_price_id(package['items'], os))
+        prices.append(_get_bandwidth_price_id(package['items'],
+                                              hourly=hourly,
+                                              no_public=no_public))
+        prices.append(_get_port_speed_price_id(package['items'],
+                                               port_speed,
+                                               no_public))
+        for extra in extras:
+            prices.append(_get_extra_price_id(package['items'], extra, hourly))
 
         order = {
             'hardware': [hardware],
             'location': datacenter,  # TODO: lookup OS price id based on keyname instead of a name like "HONGKONG02"
-            'prices': prices,
+            'prices': [{'id': price} for price in prices],
             'packageId': 200,  # TODO: Look this up based on package type
             'presetId': 70,  # TODO: Verify that preset id is a thing
+            'useHourlyPricing': hourly,
         }
 
         if post_uri:
@@ -440,35 +454,123 @@ def update_firmware(self,
             id=hardware_id)
 
 
-def _get_default_price_id(items, option):
-    """Returns a 'free' price id given an option."""
+def _get_extra_price_id(items, key_name, hourly):
+    """Returns a price id attached to item with the given key_name."""
+
     for item in items:
+        if not utils.lookup(item, 'keyName') == key_name:
+            continue
 
+        for price in item['prices']:
+            if matches_billing(price, hourly):
+                return price['id']
+
+    raise SoftLayer.SoftLayerError("Could not find valid price for %s" %
+                                   key_name)
+
+
+def _get_default_price_id(items, option, hourly):
+    """Returns a 'free' price id given an option."""
+
+    for item in items:
         if not utils.lookup(item, 'itemCategory', 'categoryCode') == option:
             continue
 
         for price in item['prices']:
-            if all([float(price.get('hourlyRecurringFee', 0)) == 0.0,
-                    float(price.get('recurringFee', 0)) == 0.0,
+            if any([float(price.get('hourlyRecurringFee', 0)) != 0.0,
+                    float(price.get('recurringFee', 0)) != 0.0,
+                    not matches_billing(price, hourly)
                     ]):
-                return price['id']
+                continue
+            return price['id']
 
-    raise SoftLayer.SoftLayerError('Could not find valid price for %s option' %
+    raise SoftLayer.SoftLayerError("Could not find valid price for %s option" %
                                    option)
 
 
+def _get_bandwidth_price_id(items, hourly=True, no_public=False):
+
+    # Prefer pay-for-use data transfer with hourly
+    for item in items:
+
+        if not utils.lookup(item,
+                            'itemCategory',
+                            'categoryCode') == 'bandwidth':
+            continue
+
+        capacity = float(item.get('capacity', 0))
+        if any([
+            # Hourly and private only do pay-as-you-go bandwidth
+            (hourly or no_public) and capacity != 0.0,
+            not (hourly or no_public) and capacity == 0.0,
+        ]):
+            continue
+
+        for price in item['prices']:
+            if not matches_billing(price, hourly):
+                continue
+
+            return price['id']
+
+    raise SoftLayer.SoftLayerError(
+        "Could not find valid price for bandwidth option")
+
+
 def _get_os_price_id(items, os):
     """Returns the price id matching."""
     for item in items:
 
         if not utils.lookup(item, 'itemCategory', 'categoryCode') == 'os':
             continue
 
-        if not utils.lookup(item, 'keyName') == os:
+        if not utils.lookup(item,
+                            'softwareDescription',
+                            'referenceCode') == os:
             continue
 
         for price in item['prices']:
             return price['id']
 
     raise SoftLayer.SoftLayerError('Could not find valid price for os: "%s"' %
                                    os)
+
+
+def _get_port_speed_price_id(items, port_speed, no_public):
+
+    for item in items:
+
+        if not utils.lookup(item,
+                            'itemCategory',
+                            'categoryCode') == 'port_speed':
+            continue
+
+    for item in items:
+
+        if not utils.lookup(item,
+                            'itemCategory',
+                            'categoryCode') == 'port_speed':
+            continue
+
+        if any([int(utils.lookup(item, 'capacity')) != port_speed,
+                is_private_port_speed_item(item) != no_public,
+                ]):
+            continue
+
+        for price in item['prices']:
+            return price['id']
+
+    raise SoftLayer.SoftLayerError(
+        "Could not find valid price for port speed: '%s'" % port_speed)
+
+
+def matches_billing(price, hourly):
+    return any([hourly and price.get('hourlyRecurringFee') is not None,
+                not hourly and price.get('recurringFee') is not None])
+
+
+def is_private_port_speed_item(item):
+    for attribute in item['attributes']:
+        if attribute['attributeTypeKeyName'] == 'IS_PRIVATE_NETWORK_ONLY':
+            return True
+
+    return False
