From 4158eb738c0626dab9092b3148f079de1840857b Mon Sep 17 00:00:00 2001 From: Fernando Ojeda Date: Wed, 31 Jul 2019 11:18:54 -0400 Subject: [PATCH 1/2] Remove VpnAllowedFlag. --- SoftLayer/CLI/user/detail.py | 1 - SoftLayer/fixtures/SoftLayer_User_Customer.py | 1 - 2 files changed, 2 deletions(-) diff --git a/SoftLayer/CLI/user/detail.py b/SoftLayer/CLI/user/detail.py index 11b55546a..3754b552c 100644 --- a/SoftLayer/CLI/user/detail.py +++ b/SoftLayer/CLI/user/detail.py @@ -81,7 +81,6 @@ def basic_info(user, keys): if user.get('parentId', False): table.add_row(['Parent User', utils.lookup(user, 'parent', 'username')]) table.add_row(['Status', utils.lookup(user, 'userStatus', 'name')]) - table.add_row(['PPTP VPN', user.get('pptpVpnAllowedFlag', 'No')]) table.add_row(['SSL VPN', user.get('sslVpnAllowedFlag', 'No')]) for login in user.get('unsuccessfulLogins', {}): login_string = "%s From: %s" % (login.get('createDate'), login.get('ipAddress')) diff --git a/SoftLayer/fixtures/SoftLayer_User_Customer.py b/SoftLayer/fixtures/SoftLayer_User_Customer.py index 32dc17704..204d56a9a 100644 --- a/SoftLayer/fixtures/SoftLayer_User_Customer.py +++ b/SoftLayer/fixtures/SoftLayer_User_Customer.py @@ -16,7 +16,6 @@ 'parent': {'id': 167758, 'username': 'SL12345'}, 'parentId': 167758, 'postalCode': '77002', - 'pptpVpnAllowedFlag': False, 'sslVpnAllowedFlag': True, 'state': 'TX', 'statusDate': None, From 742be8f184cc7512f1846bc63e1a33eda00246e8 Mon Sep 17 00:00:00 2001 From: Fernando Ojeda Date: Wed, 31 Jul 2019 15:56:15 -0400 Subject: [PATCH 2/2] Fix coverage issue. --- SoftLayer/CLI/user/detail.py | 3 ++- SoftLayer/fixtures/SoftLayer_User_Customer.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SoftLayer/CLI/user/detail.py b/SoftLayer/CLI/user/detail.py index 3754b552c..9486525a2 100644 --- a/SoftLayer/CLI/user/detail.py +++ b/SoftLayer/CLI/user/detail.py @@ -80,7 +80,8 @@ def basic_info(user, keys): table.add_row(['Phone Number', user.get('officePhone')]) if user.get('parentId', False): table.add_row(['Parent User', utils.lookup(user, 'parent', 'username')]) - table.add_row(['Status', utils.lookup(user, 'userStatus', 'name')]) + table.add_row( + ['Status', utils.lookup(user, 'userStatus', 'name')]) table.add_row(['SSL VPN', user.get('sslVpnAllowedFlag', 'No')]) for login in user.get('unsuccessfulLogins', {}): login_string = "%s From: %s" % (login.get('createDate'), login.get('ipAddress')) diff --git a/SoftLayer/fixtures/SoftLayer_User_Customer.py b/SoftLayer/fixtures/SoftLayer_User_Customer.py index 204d56a9a..4b30ba326 100644 --- a/SoftLayer/fixtures/SoftLayer_User_Customer.py +++ b/SoftLayer/fixtures/SoftLayer_User_Customer.py @@ -13,7 +13,8 @@ 'isMasterUserFlag': False, 'lastName': 'Testerson', 'openIdConnectUserName': 'test@us.ibm.com', - 'parent': {'id': 167758, 'username': 'SL12345'}, + 'parent': { + 'id': 167758, 'username': 'SL12345'}, 'parentId': 167758, 'postalCode': '77002', 'sslVpnAllowedFlag': True,