#1026 pylint fixes

Author: allmightyspiff

SoftLayer/CLI/virt/capacity/__init__.py

@@ -1,43 +1,42 @@
 """Manages Reserved Capacity."""
 # :license: MIT, see LICENSE for more details.
+
 import importlib
-import click
-import types
-import SoftLayer
 import os
-from SoftLayer.CLI import environment
-from SoftLayer.CLI import formatting
 
-from pprint import pprint as pp
+import click
+
 CONTEXT = {'help_option_names': ['-h', '--help'],
            'max_content_width': 999}
-class capacityCommands(click.MultiCommand):
+
+
+class CapacityCommands(click.MultiCommand):
     """Loads module for capacity related commands."""
 
-    def __init__(self, *path, **attrs):
+    def __init__(self, **attrs):
         click.MultiCommand.__init__(self, **attrs)
         self.path = os.path.dirname(__file__)
 
     def list_commands(self, ctx):
         """List all sub-commands."""
-        rv = []
+        commands = []
         for filename in os.listdir(self.path):
             if filename == '__init__.py':
                 continue
             if filename.endswith('.py'):
-                rv.append(filename[:-3])
-        rv.sort()
-        return rv
+                commands.append(filename[:-3])
+        commands.sort()
+        return commands
 
-    def get_command(self, ctx, name):
+    def get_command(self, ctx, cmd_name):
         """Get command for click."""
-        path = "%s.%s" % (__name__, name)
+        path = "%s.%s" % (__name__, cmd_name)
         module = importlib.import_module(path)
         return getattr(module, 'cli')
 
-@click.group(cls=capacityCommands,
-             context_settings=CONTEXT)
-@environment.pass_env
-def cli(env):
-    """Manages Reserved Capacity"""
+
+# Required to get the sub-sub-sub command to work.
+@click.group(cls=CapacityCommands, context_settings=CONTEXT)
+def cli():
+    """Base command for all capacity related concerns"""
     pass

SoftLayer/CLI/virt/capacity/create.py

@@ -1,19 +1,13 @@
-"""Create a Reserved Capacity instance. 
-
-
-"""
-# :license: MIT, see LICENSE for more details.
+"""Create a Reserved Capacity instance."""
 
 import click
 
-import SoftLayer
+
 from SoftLayer.CLI import environment
 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,
@@ -30,7 +24,10 @@
               help="Do not actually create the virtual server")
 @environment.pass_env
 def cli(env, name, datacenter, backend_router_id, capacity, quantity, test=False):
-    """Create a Reserved Capacity instance. *WARNING*: Reserved Capacity is on a yearly contract and not cancelable until the contract is expired."""
+    """Create a Reserved Capacity instance.
+
+    *WARNING*: Reserved Capacity is on a yearly contract and not cancelable until the contract is expired.
+    """
     manager = CapacityManager(env.client)
 
     result = manager.create(
@@ -58,22 +55,3 @@ def cli(env, name, datacenter, backend_router_id, capacity, quantity, test=False
             table.add_row([item['categoryCode'], item['description']])
         table.add_row(['Total', result['orderDetails']['postTaxRecurring']])
     env.fout(table)
-
-
-"""
-Calling: SoftLayer_Product_Order::placeOrder(
-id=None, 
-mask='', 
-filter='None', 
-args=(
-    {'orderContainers': [
-        {'backendRouterId': 1079095, 
-        'name': 'cgallo-test-capacity', 
-        'quantity': 1, 
-        'packageId': 1059, 
-        'location': 1854895, 
-        'useHourlyPricing': True, 
-        'complexType': 'SoftLayer_Container_Product_Order_Virtual_ReservedCapacity', 
-        'prices': [{'id': 217633}]}]},), limit=None, offset=None))
-Resetting dropped connection: r237377.application.qadal0501.softlayer.local
-"""

…tLayer/CLI/virt/capacity/create-guest.py …tLayer/CLI/virt/capacity/create_guest.pySoftLayer/CLI/virt/capacity/create-guest.py renamed to SoftLayer/CLI/virt/capacity/create_guest.py SoftLayer/CLI/virt/capacity/create-guest.py renamed to SoftLayer/CLI/virt/capacity/create_guest.py

@@ -3,100 +3,17 @@
 
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.CLI import helpers
+from SoftLayer.CLI.virt.create import _parse_create_args as _parse_create_args
 from SoftLayer.CLI.virt.create import _update_with_like_args as _update_with_like_args
 from SoftLayer.managers.vs_capacity import CapacityManager as CapacityManager
 
 
-from pprint import pprint as pp
-
-
-
-def _parse_create_args(client, args):
-    """Parses CLI arguments into a single data structure to be used by vs_capacity::create_guest.
-
-    :param dict args: CLI arguments
-    """
-    data = {
-        "hourly": True,
-        "domain": args['domain'],
-        "hostname": args['hostname'],
-        "private": args['private'],
-        "disks": args['disk'],
-        "boot_mode": args.get('boot_mode', None),
-        "local_disk": None
-    }
-    if args.get('os'):
-        data['os_code'] = args['os']
-
-    if args.get('image'):
-        if args.get('image').isdigit():
-            image_mgr = SoftLayer.ImageManager(client)
-            image_details = image_mgr.get_image(args.get('image'),
-                                                mask="id,globalIdentifier")
-            data['image_id'] = image_details['globalIdentifier']
-        else:
-            data['image_id'] = args['image']
-
-    if args.get('network'):
-        data['nic_speed'] = args.get('network')
-
-    if args.get('userdata'):
-        data['userdata'] = args['userdata']
-    elif args.get('userfile'):
-        with open(args['userfile'], 'r') as userfile:
-            data['userdata'] = userfile.read()
-
-    if args.get('postinstall'):
-        data['post_uri'] = args.get('postinstall')
-
-    # Get the SSH keys
-    if args.get('key'):
-        keys = []
-        for key in args.get('key'):
-            resolver = SoftLayer.SshKeyManager(client).resolve_ids
-            key_id = helpers.resolve_id(resolver, key, 'SshKey')
-            keys.append(key_id)
-        data['ssh_keys'] = keys
-
-    if args.get('vlan_public'):
-        data['public_vlan'] = args['vlan_public']
-
-    if args.get('vlan_private'):
-        data['private_vlan'] = args['vlan_private']
-
-    data['public_subnet'] = args.get('subnet_public', None)
-
-    data['private_subnet'] = args.get('subnet_private', None)
-
-    if args.get('public_security_group'):
-        pub_groups = args.get('public_security_group')
-        data['public_security_groups'] = [group for group in pub_groups]
-
-    if args.get('private_security_group'):
-        priv_groups = args.get('private_security_group')
-        data['private_security_groups'] = [group for group in priv_groups]
-
-    if args.get('tag'):
-        data['tags'] = ','.join(args['tag'])
-
-    if args.get('host_id'):
-        data['host_id'] = args['host_id']
-
-    if args.get('ipv6'):
-        data['ipv6'] = True
-
-    data['primary_disk'] = args.get('primary_disk')
-
-    return data
-
-
 @click.command()
 @click.option('--capacity-id', type=click.INT, help="Reserve capacity Id to provision this guest into.")
-@click.option('--primary-disk', type=click.Choice(['25','100']), default='25', help="Size of the main drive." )
+@click.option('--primary-disk', type=click.Choice(['25', '100']), default='25', help="Size of the main drive.")
 @click.option('--hostname', '-H', required=True, prompt=True, help="Host portion of the FQDN.")
 @click.option('--domain', '-D', required=True, prompt=True, help="Domain portion of the FQDN.")
 @click.option('--os', '-o', help="OS install code. Tip: you can specify <OS>_LATEST.")
@@ -113,12 +30,15 @@ def _parse_create_args(client, args):
 @helpers.multi_option('--tag', '-g', help="Tags to add to the instance.")
 @click.option('--userdata', '-u', help="User defined metadata string.")
 @click.option('--ipv6', is_flag=True, help="Adds an IPv6 address to this guest")
-@click.option('--test', is_flag=True, 
+@click.option('--test', is_flag=True,
               help="Test order, will return the order container, but not actually order a server.")
 @environment.pass_env
 def cli(env, **args):
     """Allows for creating a virtual guest in a reserved capacity."""
     create_args = _parse_create_args(env.client, args)
+    if args.get('ipv6'):
+        create_args['ipv6'] = True
+    create_args['primary_disk'] = args.get('primary_disk')
     manager = CapacityManager(env.client)
     capacity_id = args.get('capacity_id')
     test = args.get('test')
@@ -141,4 +61,3 @@ def _build_receipt(result, test=False):
     for item in prices:
         table.add_row([item['id'], item['item']['description']])
     return table
-

…ayer/CLI/virt/capacity/create-options.py …ayer/CLI/virt/capacity/create_options.pySoftLayer/CLI/virt/capacity/create-options.py renamed to SoftLayer/CLI/virt/capacity/create_options.py SoftLayer/CLI/virt/capacity/create-options.py renamed to SoftLayer/CLI/virt/capacity/create_options.py

@@ -3,14 +3,11 @@
 
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.vs_capacity import CapacityManager as CapacityManager
 
 
-from pprint import pprint as pp
-
 @click.command()
 @environment.pass_env
 def cli(env):
@@ -38,8 +35,9 @@ def cli(env):
 
 
 def get_price(item):
+    """Finds the price with the default locationGroupId"""
     the_price = "No Default Pricing"
-    for price in item.get('prices',[]):
+    for price in item.get('prices', []):
         if price.get('locationGroupId') == '':
-            the_price = "%0.4f"  % float(price['hourlyRecurringFee'])
+            the_price = "%0.4f" % float(price['hourlyRecurringFee'])
     return the_price

SoftLayer/CLI/virt/capacity/detail.py

@@ -1,9 +1,7 @@
 """Shows the details of a reserved capacity group"""
-# :license: MIT, see LICENSE for more details.
 
 import click
 
-import SoftLayer
 from SoftLayer.CLI import columns as column_helper
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
@@ -25,6 +23,7 @@
     'backend_ip'
 ]
 
+
 @click.command(epilog="Once provisioned, virtual guests can be managed with the slcli vs commands")
 @click.argument('identifier')
 @click.option('--columns',
@@ -38,31 +37,20 @@ def cli(env, identifier, columns):
     """Reserved Capacity Group details. Will show which guests are assigned to a reservation."""
 
     manager = CapacityManager(env.client)
-    mask = """mask[instances[id,createDate,guestId,billingItem[id, recurringFee, category[name]], 
+    mask = """mask[instances[id,createDate,guestId,billingItem[id, recurringFee, category[name]],
               guest[modifyDate,id, primaryBackendIpAddress, primaryIpAddress,domain, hostname]]]"""
     result = manager.get_object(identifier, mask)
     try:
         flavor = result['instances'][0]['billingItem']['description']
     except KeyError:
         flavor = "Pending Approval..."
 
-    table = formatting.Table(columns.columns, 
-        title = "%s - %s" % (result.get('name'), flavor)
-    )
+    table = formatting.Table(columns.columns, title="%s - %s" % (result.get('name'), flavor))
     # RCI = Reserved Capacity Instance
     for rci in result['instances']:
         guest = rci.get('guest', None)
-        guest_string = "---"
-        createDate = rci['createDate']
         if guest is not None:
-            guest_string = "%s (%s)" % (
-                guest.get('fullyQualifiedDomainName', 'No FQDN'), 
-                guest.get('primaryIpAddress', 'No Public Ip')
-            )
-            createDate = guest['modifyDate']
             table.add_row([value or formatting.blank() for value in columns.row(guest)])
         else:
             table.add_row(['-' for value in columns.columns])
     env.fout(table)
-
-

SoftLayer/CLI/virt/capacity/list.py

@@ -1,9 +1,7 @@
 """List Reserved Capacity"""
-# :license: MIT, see LICENSE for more details.
 
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.vs_capacity import CapacityManager as CapacityManager
@@ -16,19 +14,19 @@ def cli(env):
     manager = CapacityManager(env.client)
     result = manager.list()
     table = formatting.Table(
-        ["ID", "Name", "Capacity", "Flavor", "Location",  "Created"], 
+        ["ID", "Name", "Capacity", "Flavor", "Location", "Created"],
         title="Reserved Capacity"
     )
-    for rc in result:
-        occupied_string = "#" * int(rc.get('occupiedInstanceCount',0))
-        available_string = "-" * int(rc.get('availableInstanceCount',0))
+    for r_c in result:
+        occupied_string = "#" * int(r_c.get('occupiedInstanceCount', 0))
+        available_string = "-" * int(r_c.get('availableInstanceCount', 0))
 
         try:
-            flavor = rc['instances'][0]['billingItem']['description']
-            cost = float(rc['instances'][0]['billingItem']['hourlyRecurringFee'])
+            flavor = r_c['instances'][0]['billingItem']['description']
+            # cost = float(r_c['instances'][0]['billingItem']['hourlyRecurringFee'])
         except KeyError:
             flavor = "Unknown Billing Item"
-        location = rc['backendRouter']['hostname']
+        location = r_c['backendRouter']['hostname']
         capacity = "%s%s" % (occupied_string, available_string)
-        table.add_row([rc['id'], rc['name'], capacity, flavor, location, rc['createDate']])
+        table.add_row([r_c['id'], r_c['name'], capacity, flavor, location, r_c['createDate']])
     env.fout(table)

SoftLayer/CLI/virt/create.py

@@ -72,11 +72,11 @@ def _parse_create_args(client, args):
     :param dict args: CLI arguments
     """
     data = {
-        "hourly": args['billing'] == 'hourly',
+        "hourly": args.get('billing', 'hourly') == 'hourly',
         "domain": args['domain'],
         "hostname": args['hostname'],
-        "private": args['private'],
-        "dedicated": args['dedicated'],
+        "private": args.get('private', None),
+        "dedicated": args.get('dedicated', None),
         "disks": args['disk'],
         "cpus": args.get('cpu', None),
         "memory": args.get('memory', None),
@@ -89,7 +89,7 @@ def _parse_create_args(client, args):
     if not args.get('san') and args.get('flavor'):
         data['local_disk'] = None
     else:
-        data['local_disk'] = not args['san']
+        data['local_disk'] = not args.get('san')
 
     if args.get('os'):
         data['os_code'] = args['os']