Skip to content

Commit 5650b08

Browse files
Merge pull request #2179 from allmightyspiff/issues2178
Added vpn status to user list.
2 parents a17430e + b535762 commit 5650b08

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

SoftLayer/CLI/user/list.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
column_helper.Column('hardwareCount', ('hardwareCount',)),
2121
column_helper.Column('virtualGuestCount', ('virtualGuestCount',)),
2222
column_helper.Column('2FA', (TWO_FACTO_AUTH,)),
23-
column_helper.Column('classicAPIKey', (CLASSIC_API_KEYS,))
23+
column_helper.Column('classicAPIKey', (CLASSIC_API_KEYS,)),
24+
column_helper.Column('vpn', ('sslVpnAllowedFlag',))
2425
]
2526

2627
DEFAULT_COLUMNS = [
@@ -30,6 +31,7 @@
3031
'displayName',
3132
'2FA',
3233
'classicAPIKey',
34+
'vpn'
3335
]
3436

3537

@@ -48,7 +50,7 @@ def cli(env, columns):
4850

4951
table = formatting.Table(columns.columns)
5052
for user in users:
51-
user = _yes_format(user, [TWO_FACTO_AUTH, CLASSIC_API_KEYS])
53+
user = _yes_format(user, [TWO_FACTO_AUTH, CLASSIC_API_KEYS, 'sslVpnAllowedFlag'])
5254
table.add_row([value or formatting.blank()
5355
for value in columns.row(user)])
5456

SoftLayer/managers/user.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def list_users(self, objectmask=None, objectfilter=None):
5454

5555
if objectmask is None:
5656
objectmask = """mask[id, username, displayName, userStatus[name], hardwareCount, virtualGuestCount,
57-
email, roles, externalBindingCount,apiAuthenticationKeyCount]"""
57+
email, roles, externalBindingCount,apiAuthenticationKeyCount, sslVpnAllowedFlag]"""
5858

5959
return self.account_service.getUsers(mask=objectmask, filter=objectfilter)
6060

0 commit comments

Comments
 (0)