autoscale logs, tox fixes

Author: allmightyspiff

SoftLayer/CLI/autoscale/detail.py

@@ -21,6 +21,8 @@ def cli(env, identifier):
 
     # Group Config Table
     table = formatting.KeyValueTable(["Group", "Value"])
+    table.align['Group'] = 'l'
+    table.align['Value'] = 'l'
 
     table.add_row(['Id', group.get('id')])
     # Ideally we would use regionalGroup->preferredDatacenter, but that generates an error.
@@ -31,7 +33,7 @@ def cli(env, identifier):
     table.add_row(['Current Members', group.get('virtualGuestMemberCount')])
     table.add_row(['Cooldown', "{} seconds".format(group.get('cooldown'))])
     table.add_row(['Last Action', utils.clean_time(group.get('lastActionDate'))])
-    
+
     for network in group.get('networkVlans'):
         network_type = utils.lookup(network, 'networkVlan', 'networkSpace')
         router = utils.lookup(network, 'networkVlan', 'primaryRouter', 'hostname')
@@ -43,8 +45,11 @@ def cli(env, identifier):
 
     # Template Config Table
     config_table = formatting.KeyValueTable(["Template", "Value"])
+    config_table.align['Template'] = 'l'
+    config_table.align['Value'] = 'l'
+
     template = group.get('virtualGuestMemberTemplate')
-    
+
     config_table.add_row(['Hostname', template.get('hostname')])
     config_table.add_row(['Domain', template.get('domain')])
     config_table.add_row(['Core', template.get('startCpus')])

SoftLayer/CLI/autoscale/list.py

@@ -3,7 +3,6 @@
 
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.autoscale import AutoScaleManager
@@ -17,16 +16,14 @@ def cli(env):
 
     autoscale = AutoScaleManager(env.client)
     groups = autoscale.list()
-    # print(groups)
-    # pp(groups)
-    table = formatting.Table(["Id", "Name", "Status", "Min/Max", "Running"])
 
+    table = formatting.Table(["Id", "Name", "Status", "Min/Max", "Running"])
+    table.align['Name'] = 'l'
     for group in groups:
         status = utils.lookup(group, 'status', 'name')
-        min_max = "{}/{}".format(group.get('minimumMemberCount', '-'), group.get('maximumMemberCount'), '-')
+        min_max = "{}/{}".format(group.get('minimumMemberCount'), group.get('maximumMemberCount'))
         table.add_row([
             group.get('id'), group.get('name'), status, min_max, group.get('virtualGuestMemberCount')
         ])
 
-
     env.fout(table)

SoftLayer/CLI/autoscale/logs.py

@@ -0,0 +1,37 @@
+"""Retreive logs for an autoscale group"""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+from SoftLayer.managers.autoscale import AutoScaleManager
+from SoftLayer import utils
+
+
+@click.command()
+@click.argument('identifier')
+@click.option('--date-min', '-d', 'date_min', type=click.DateTime(formats=["%Y-%m-%d", "%m/%d/%Y"]),
+              help='Earliest date to retreive logs for.')
+@environment.pass_env
+def cli(env, identifier, date_min):
+    """Retreive logs for an autoscale group"""
+
+    autoscale = AutoScaleManager(env.client)
+
+    mask = "mask[id,createDate,description]"
+    object_filter = {}
+    if date_min:
+        object_filter['logs'] = {
+            'createDate': {
+                'operation': 'greaterThanDate',
+                'options': [{'name': 'date', 'value': [date_min.strftime("%m/%d/%Y")]}]
+            }
+        }
+
+    logs = autoscale.get_logs(identifier, mask=mask, object_filter=object_filter)
+    table = formatting.Table(['Date', 'Entry'], title="Logs")
+    table.align['Entry'] = 'l'
+    for log in logs:
+        table.add_row([utils.clean_time(log.get('createDate')), log.get('description')])
+    env.fout(table)

SoftLayer/CLI/autoscale/scale.py

@@ -3,7 +3,6 @@
 
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.autoscale import AutoScaleManager
@@ -15,7 +14,7 @@
 @click.option('--up/--down', 'scale_up', is_flag=True, default=True,
               help="'--up' adds guests, '--down' removes guests.")
 @click.option('--by/--to', 'scale_by', is_flag=True, required=True,
-              help="'--by' will add/remove the specified number of guests." \
+              help="'--by' will add/remove the specified number of guests."
               " '--to' will add/remove a number of guests to get the group's guest count to the specified number.")
 @click.option('--amount', required=True, type=click.INT, help="Number of guests for the scale action.")
 @environment.pass_env
@@ -30,19 +29,19 @@ def cli(env, identifier, scale_up, scale_by, amount):
 
     result = []
     if scale_by:
-        click.secho("Scaling group {} by {}".format(identifier,  amount), fg='green')
+        click.secho("Scaling group {} by {}".format(identifier, amount), fg='green')
         result = autoscale.scale(identifier, amount)
     else:
-        click.secho("Scaling group {} to {}".format(identifier,  amount), fg='green')
+        click.secho("Scaling group {} to {}".format(identifier, amount), fg='green')
         result = autoscale.scale_to(identifier, amount)
 
     try:
         # Check if the first guest has a cancellation date, assume we are removing guests if it is.
-        cancellationDate = result[0]['virtualGuest']['billingItem']['cancellationDate'] or False
-    except (IndexError, KeyError, TypeError) as e:
-        cancellationDate = False
+        cancel_date = result[0]['virtualGuest']['billingItem']['cancellationDate'] or False
+    except (IndexError, KeyError, TypeError):
+        cancel_date = False
 
-    if cancellationDate:
+    if cancel_date:
         member_table = formatting.Table(['Id', 'Hostname', 'Created'], title="Cancelled Guests")
     else:
         member_table = formatting.Table(['Id', 'Hostname', 'Created'], title="Added Guests")

SoftLayer/CLI/routes.py

@@ -307,6 +307,7 @@
     ('autoscale:list', 'SoftLayer.CLI.autoscale.list:cli'),
     ('autoscale:detail', 'SoftLayer.CLI.autoscale.detail:cli'),
     ('autoscale:scale', 'SoftLayer.CLI.autoscale.scale:cli'),
+    ('autoscale:logs', 'SoftLayer.CLI.autoscale.logs:cli'),
 ]
 
 ALL_ALIASES = {

SoftLayer/managers/autoscale.py

@@ -7,13 +7,12 @@
 """
 
 
-
 class AutoScaleManager(object):
+    """Manager for interacting with Autoscale instances."""
 
     def __init__(self, client):
         self.client = client
 
-
     def list(self, mask=None):
         """Calls SoftLayer_Account getScaleGroups()_
 
@@ -71,4 +70,15 @@ def scale_to(self, identifier, amount):
         :param amount: number to scale the group to.
         .. _scaleTo(): https://sldn.softlayer.com/reference/services/SoftLayer_Scale_Group/scaleTo/
         """
-        return self.client.call('SoftLayer_Scale_Group', 'scaleTo', amount, id=identifier)
+        return self.client.call('SoftLayer_Scale_Group', 'scaleTo', amount, id=identifier)
+
+    def get_logs(self, identifier, mask=None, object_filter=None):
+        """Calls SoftLayer_Scale_Group getLogs()_
+
+        :param identifier: SoftLayer_Scale_Group Id
+        :param mask: optional SoftLayer_Scale_Group_Log objectMask
+        :param object_filter: optional SoftLayer_Scale_Group_Log objectFilter
+        .. getLogs(): https://sldn.softlayer.com/reference/services/SoftLayer_Scale_Group/getLogs/
+        """
+        return self.client.call('SoftLayer_Scale_Group', 'getLogs', id=identifier, mask=mask, filter=object_filter,
+                                iter=True)