Skip to content

Commit d21cbd1

Browse files
author
Erick Sapp
committed
Added and renamed fields.
1 parent 004e5af commit d21cbd1

File tree

2 files changed

+51
-17
lines changed

2 files changed

+51
-17
lines changed

‎SoftLayer/CLI/event_log/get.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from SoftLayer.CLI import environment
1010
from SoftLayer.CLI import formatting
1111

12-
COLUMNS = ['event', 'label', 'date']
12+
COLUMNS = ['event', 'object', 'type', 'date', 'username']
1313

1414

1515
@click.command()
@@ -31,6 +31,7 @@
3131
def cli(env, date_min, date_max, obj_event, obj_id, obj_type, utc_offset, metadata):
3232
"""Get Event Logs"""
3333
mgr = SoftLayer.EventLogManager(env.client)
34+
usrmgr = SoftLayer.UserManager(env.client)
3435
request_filter = mgr.build_filter(date_min, date_max, obj_event, obj_id, obj_type, utc_offset)
3536
logs = mgr.get_event_logs(request_filter)
3637

@@ -46,6 +47,9 @@ def cli(env, date_min, date_max, obj_event, obj_id, obj_type, utc_offset, metada
4647
table.align['metadata'] = "l"
4748

4849
for log in logs:
50+
user = log['userType']
51+
if user == "CUSTOMER":
52+
user = usrmgr.get_user(log['userId'], "mask[username]")['username']
4953
if metadata:
5054
try:
5155
metadata_data = json.dumps(json.loads(log['metaData']), indent=4, sort_keys=True)
@@ -54,7 +58,9 @@ def cli(env, date_min, date_max, obj_event, obj_id, obj_type, utc_offset, metada
5458
except ValueError:
5559
metadata_data = log['metaData']
5660

57-
table.add_row([log['eventName'], log['label'], log['eventCreateDate'], metadata_data])
61+
table.add_row([log['eventName'], log['label'], log['objectName'],
62+
log['eventCreateDate'], user, metadata_data])
5863
else:
59-
table.add_row([log['eventName'], log['label'], log['eventCreateDate']])
64+
table.add_row([log['eventName'], log['label'], log['objectName'],
65+
log['eventCreateDate'], user])
6066
env.fout(table)

‎tests/CLI/modules/event_log_tests.py‎

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,17 @@ def test_get_event_log_with_metadata(self):
1515
{
1616
'date': '2017-10-23T14:22:36.221541-05:00',
1717
'event': 'Disable Port',
18-
'label': 'test.softlayer.com',
18+
'object': 'test.softlayer.com',
19+
'username': 'SYSTEM',
20+
'type': 'CCI',
1921
'metadata': ''
2022
},
2123
{
2224
'date': '2017-10-18T09:40:41.830338-05:00',
2325
'event': 'Security Group Rule Added',
24-
'label': 'test.softlayer.com',
26+
'object': 'test.softlayer.com',
27+
'username': 'SL12345-test',
28+
'type': 'CCI',
2529
'metadata': json.dumps(json.loads(
2630
'{"networkComponentId":"100",'
2731
'"networkInterfaceType":"public",'
@@ -39,7 +43,9 @@ def test_get_event_log_with_metadata(self):
3943
{
4044
'date': '2017-10-18T09:40:32.238869-05:00',
4145
'event': 'Security Group Added',
42-
'label': 'test.softlayer.com',
46+
'object': 'test.softlayer.com',
47+
'username': 'SL12345-test',
48+
'type': 'CCI',
4349
'metadata': json.dumps(json.loads(
4450
'{"networkComponentId":"100",'
4551
'"networkInterfaceType":"public",'
@@ -54,7 +60,9 @@ def test_get_event_log_with_metadata(self):
5460
{
5561
'date': '2017-10-18T10:42:13.089536-05:00',
5662
'event': 'Security Group Rule(s) Removed',
57-
'label': 'test_SG',
63+
'object': 'test_SG',
64+
'username': 'SL12345-test',
65+
'type': 'Security Group',
5866
'metadata': json.dumps(json.loads(
5967
'{"requestId":"2abda7ca97e5a1444cae0b9",'
6068
'"rules":[{"direction":"ingress",'
@@ -69,7 +77,9 @@ def test_get_event_log_with_metadata(self):
6977
{
7078
'date': '2017-10-18T10:42:11.679736-05:00',
7179
'event': 'Network Component Removed from Security Group',
72-
'label': 'test_SG',
80+
'object': 'test_SG',
81+
'username': 'SL12345-test',
82+
'type': 'Security Group',
7383
'metadata': json.dumps(json.loads(
7484
'{"fullyQualifiedDomainName":"test.softlayer.com",'
7585
'"networkComponentId":"100",'
@@ -83,7 +93,9 @@ def test_get_event_log_with_metadata(self):
8393
{
8494
'date': '2017-10-18T10:41:49.802498-05:00',
8595
'event': 'Security Group Rule(s) Added',
86-
'label': 'test_SG',
96+
'object': 'test_SG',
97+
'username': 'SL12345-test',
98+
'type': 'Security Group',
8799
'metadata': json.dumps(json.loads(
88100
'{"requestId":"0a293c1c3e59e4471da6495",'
89101
'"rules":[{"direction":"ingress",'
@@ -98,7 +110,9 @@ def test_get_event_log_with_metadata(self):
98110
{
99111
'date': '2017-10-18T10:41:42.176328-05:00',
100112
'event': 'Network Component Added to Security Group',
101-
'label': 'test_SG',
113+
'object': 'test_SG',
114+
'username': 'SL12345-test',
115+
'type': 'Security Group',
102116
'metadata': json.dumps(json.loads(
103117
'{"fullyQualifiedDomainName":"test.softlayer.com",'
104118
'"networkComponentId":"100",'
@@ -121,37 +135,51 @@ def test_get_event_log_without_metadata(self):
121135
{
122136
'date': '2017-10-23T14:22:36.221541-05:00',
123137
'event': 'Disable Port',
124-
'label': 'test.softlayer.com'
138+
'username': 'SYSTEM',
139+
'type': 'CCI',
140+
'object': 'test.softlayer.com'
125141
},
126142
{
127143
'date': '2017-10-18T09:40:41.830338-05:00',
128144
'event': 'Security Group Rule Added',
129-
'label': 'test.softlayer.com'
145+
'username': 'SL12345-test',
146+
'type': 'CCI',
147+
'object': 'test.softlayer.com'
130148
},
131149
{
132150
'date': '2017-10-18T09:40:32.238869-05:00',
133151
'event': 'Security Group Added',
134-
'label': 'test.softlayer.com'
152+
'username': 'SL12345-test',
153+
'type': 'CCI',
154+
'object': 'test.softlayer.com'
135155
},
136156
{
137157
'date': '2017-10-18T10:42:13.089536-05:00',
138158
'event': 'Security Group Rule(s) Removed',
139-
'label': 'test_SG'
159+
'username': 'SL12345-test',
160+
'type': 'Security Group',
161+
'object': 'test_SG'
140162
},
141163
{
142164
'date': '2017-10-18T10:42:11.679736-05:00',
143165
'event': 'Network Component Removed from Security Group',
144-
'label': 'test_SG'
166+
'username': 'SL12345-test',
167+
'type': 'Security Group',
168+
'object': 'test_SG'
145169
},
146170
{
147171
'date': '2017-10-18T10:41:49.802498-05:00',
148172
'event': 'Security Group Rule(s) Added',
149-
'label': 'test_SG'
173+
'username': 'SL12345-test',
174+
'type': 'Security Group',
175+
'object': 'test_SG'
150176
},
151177
{
152178
'date': '2017-10-18T10:41:42.176328-05:00',
153179
'event': 'Network Component Added to Security Group',
154-
'label': 'test_SG'
180+
'username': 'SL12345-test',
181+
'type': 'Security Group',
182+
'object': 'test_SG'
155183
}
156184
]
157185

0 commit comments

Comments
 (0)