Skip to content

Commit f7e8025

Browse files
allmightyspiffallmightyspiff
committed
fixed a bunch of tox related errors
1 parent b1752c1 commit f7e8025

7 files changed

Lines changed: 74 additions & 455 deletions

File tree

‎SoftLayer/API.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
:license: MIT, see LICENSE for more details.
77
"""
88
# pylint: disable=invalid-name
9+
from __future__ import generators
910
import warnings
1011

12+
1113
from SoftLayer import auth as slauth
1214
from SoftLayer import config
1315
from SoftLayer import consts
@@ -296,15 +298,12 @@ def iter_call(self, service, method, *args, **kwargs):
296298
if isinstance(results, list):
297299
# Close enough, this makes testing a lot easier
298300
results = transports.SoftLayerListResult(results, len(results))
299-
elif results is None:
300-
yield results, 0
301-
return
302301
else:
303-
yield results, 1
302+
yield results
304303
return
305304

306305
for item in results:
307-
yield item, results.total_count
306+
yield item
308307
result_count += 1
309308

310309
# Got less results than requested, we are at the end

‎SoftLayer/CLI/event_log/get.py‎

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
"""Get Event Logs."""
22
# :license: MIT, see LICENSE for more details.
33

4-
import json
5-
64
import click
75

86
import SoftLayer
9-
from SoftLayer import utils
107
from SoftLayer.CLI import environment
11-
12-
COLUMNS = ['event', 'object', 'type', 'date', 'username']
8+
from SoftLayer import utils
139

1410

1511
@click.command()
@@ -32,6 +28,7 @@
3228
@environment.pass_env
3329
def cli(env, date_min, date_max, obj_event, obj_id, obj_type, utc_offset, metadata, limit):
3430
"""Get Event Logs"""
31+
columns = ['Event', 'Object', 'Type', 'Date', 'Username']
3532

3633
event_mgr = SoftLayer.EventLogManager(env.client)
3734
user_mgr = SoftLayer.UserManager(env.client)
@@ -40,21 +37,16 @@ def cli(env, date_min, date_max, obj_event, obj_id, obj_type, utc_offset, metada
4037
log_time = "%Y-%m-%dT%H:%M:%S.%f%z"
4138
user_data = {}
4239

43-
if metadata and 'metadata' not in COLUMNS:
44-
COLUMNS.append('metadata')
40+
if metadata:
41+
columns.append('Metadata')
4542

4643
row_count = 0
47-
for log, rows in logs:
44+
click.secho(", ".join(columns))
45+
for log in logs:
4846
if log is None:
4947
click.secho('No logs available for filter %s.' % request_filter, fg='red')
5048
return
5149

52-
if row_count == 0:
53-
if limit < 0:
54-
limit = rows
55-
click.secho("Number of records: %s" % rows, fg='red')
56-
click.secho(", ".join(COLUMNS))
57-
5850
user = log['userType']
5951
label = log.get('label', '')
6052
if user == "CUSTOMER":
@@ -65,31 +57,23 @@ def cli(env, date_min, date_max, obj_event, obj_id, obj_type, utc_offset, metada
6557
user = username
6658

6759
if metadata:
68-
try:
69-
metadata_data = json.dumps(json.loads(log['metaData']), indent=4, sort_keys=True)
70-
if env.format == "table":
71-
metadata_data = metadata_data.strip("{}\n\t")
72-
except ValueError:
73-
metadata_data = log['metaData']
60+
metadata_data = log['metaData'].strip("\n\t")
7461

75-
click.secho('"{0}","{1}","{2}","{3}","{4}","{5}"'.format(
76-
log['eventName'],
77-
label,
78-
log['objectName'],
79-
utils.clean_time(log['eventCreateDate'], in_format=log_time),
80-
user,
81-
metadata_data)
82-
)
62+
click.secho("'{0}','{1}','{2}','{3}','{4}','{5}'".format(
63+
log['eventName'],
64+
label,
65+
log['objectName'],
66+
utils.clean_time(log['eventCreateDate'], in_format=log_time),
67+
user,
68+
metadata_data))
8369
else:
84-
click.secho('"{0}","{1}","{2}","{3}","{4}"'.format(
85-
log['eventName'],
86-
label,
87-
log['objectName'],
88-
utils.clean_time(log['eventCreateDate'], in_format=log_time),
89-
user)
90-
)
70+
click.secho("'{0}','{1}','{2}','{3}','{4}'".format(
71+
log['eventName'],
72+
label,
73+
log['objectName'],
74+
utils.clean_time(log['eventCreateDate'], in_format=log_time),
75+
user))
9176

9277
row_count = row_count + 1
9378
if row_count >= limit:
9479
return
95-

‎SoftLayer/managers/event_log.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,20 @@ def __init__(self, client):
2020
self.client = client
2121
self.event_log = client['Event_Log']
2222

23-
def get_event_logs(self, request_filter={}, log_limit=50, iter=True):
23+
def get_event_logs(self, request_filter=None, log_limit=20, iterator=True):
2424
"""Returns a list of event logs
2525
2626
:param dict request_filter: filter dict
2727
:param int log_limit: number of results to get in one API call
28-
:param bool iter: False will only make one API call for log_limit results.
28+
:param bool iterator: False will only make one API call for log_limit results.
2929
True will keep making API calls until all logs have been retreived. There may be a lot of these.
3030
:returns: List of event logs
3131
"""
32-
if iter:
32+
if iterator:
3333
# Call iter_call directly as this returns the actual generator
3434
return self.client.iter_call('Event_Log', 'getAllObjects', filter=request_filter, limit=log_limit)
3535
return self.client.call('Event_Log', 'getAllObjects', filter=request_filter, limit=log_limit)
3636

37-
3837
def get_event_log_types(self):
3938
"""Returns a list of event log types
4039
@@ -44,7 +43,7 @@ def get_event_log_types(self):
4443
return results
4544

4645
@staticmethod
47-
def build_filter(date_min, date_max, obj_event, obj_id, obj_type, utc_offset):
46+
def build_filter(date_min=None, date_max=None, obj_event=None, obj_id=None, obj_type=None, utc_offset=None):
4847
"""Returns a query filter that can be passed into EventLogManager.get_event_logs
4948
5049
:param string date_min: Lower bound date in MM/DD/YYYY format

‎SoftLayer/managers/network.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,14 +575,16 @@ def _get_cci_event_logs(self):
575575
event_log_mgr = event_log.EventLogManager(self.client)
576576

577577
# Get CCI Event Logs
578-
return event_log_mgr.get_event_logs_by_type('CCI')
578+
_filter = event_log_mgr.build_filter(obj_type='CCI')
579+
return event_log_mgr.get_event_logs(request_filter=_filter)
579580

580581
def _get_security_group_event_logs(self):
581582
# Load the event log manager
582583
event_log_mgr = event_log.EventLogManager(self.client)
583584

584585
# Get CCI Event Logs
585-
return event_log_mgr.get_event_logs_by_type('Security Group')
586+
_filter = event_log_mgr.build_filter(obj_type='Security Group')
587+
return event_log_mgr.get_event_logs(request_filter=_filter)
586588

587589
def resolve_global_ip_ids(self, identifier):
588590
"""Resolve global ip ids."""

0 commit comments

Comments
 (0)