From b535762127d481a2e8e5aa9dc56c361dc69cf042 Mon Sep 17 00:00:00 2001 From: Christopher Gallo Date: Tue, 6 Aug 2024 17:35:42 -0500 Subject: [PATCH] Added vpn status to user list. Fixed #2178 --- SoftLayer/CLI/user/list.py | 6 ++++-- SoftLayer/managers/user.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/SoftLayer/CLI/user/list.py b/SoftLayer/CLI/user/list.py index 17f3c8f69..779f14011 100644 --- a/SoftLayer/CLI/user/list.py +++ b/SoftLayer/CLI/user/list.py @@ -20,7 +20,8 @@ column_helper.Column('hardwareCount', ('hardwareCount',)), column_helper.Column('virtualGuestCount', ('virtualGuestCount',)), column_helper.Column('2FA', (TWO_FACTO_AUTH,)), - column_helper.Column('classicAPIKey', (CLASSIC_API_KEYS,)) + column_helper.Column('classicAPIKey', (CLASSIC_API_KEYS,)), + column_helper.Column('vpn', ('sslVpnAllowedFlag',)) ] DEFAULT_COLUMNS = [ @@ -30,6 +31,7 @@ 'displayName', '2FA', 'classicAPIKey', + 'vpn' ] @@ -48,7 +50,7 @@ def cli(env, columns): table = formatting.Table(columns.columns) for user in users: - user = _yes_format(user, [TWO_FACTO_AUTH, CLASSIC_API_KEYS]) + user = _yes_format(user, [TWO_FACTO_AUTH, CLASSIC_API_KEYS, 'sslVpnAllowedFlag']) table.add_row([value or formatting.blank() for value in columns.row(user)]) diff --git a/SoftLayer/managers/user.py b/SoftLayer/managers/user.py index 72b23dfda..87a5f0791 100644 --- a/SoftLayer/managers/user.py +++ b/SoftLayer/managers/user.py @@ -54,7 +54,7 @@ def list_users(self, objectmask=None, objectfilter=None): if objectmask is None: objectmask = """mask[id, username, displayName, userStatus[name], hardwareCount, virtualGuestCount, - email, roles, externalBindingCount,apiAuthenticationKeyCount]""" + email, roles, externalBindingCount,apiAuthenticationKeyCount, sslVpnAllowedFlag]""" return self.account_service.getUsers(mask=objectmask, filter=objectfilter)