Merge pull request #1421 from ATGE/issues/1400

Add 2FA and classic APIKeys fields to slcli user list as default values

Author: allmightyspiff

SoftLayer/CLI/user/list.py

@@ -8,6 +8,8 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 
+TWO_FACTO_AUTH = 'externalBindingCount'
+CLASSIC_API_KEYS = 'apiAuthenticationKeyCount'
 
 COLUMNS = [
     column_helper.Column('id', ('id',)),
@@ -17,15 +19,17 @@
     column_helper.Column('status', ('userStatus', 'name')),
     column_helper.Column('hardwareCount', ('hardwareCount',)),
     column_helper.Column('virtualGuestCount', ('virtualGuestCount',)),
-    column_helper.Column('2FAs', ('externalBindingCount',)),
-    column_helper.Column('classicAPIKeys', ('apiAuthenticationKeyCount',))
+    column_helper.Column('2FA', (TWO_FACTO_AUTH,)),
+    column_helper.Column('classicAPIKey', (CLASSIC_API_KEYS,))
 ]
 
 DEFAULT_COLUMNS = [
     'id',
     'username',
     'email',
-    'displayName'
+    'displayName',
+    '2FA',
+    'classicAPIKey',
 ]
 
 
@@ -44,7 +48,16 @@ def cli(env, columns):
 
     table = formatting.Table(columns.columns)
     for user in users:
+        user = _yes_format(user, [TWO_FACTO_AUTH, CLASSIC_API_KEYS])
         table.add_row([value or formatting.blank()
                        for value in columns.row(user)])
 
     env.fout(table)
+
+
+def _yes_format(user, keys):
+    """Changes all dictionary values to yes whose keys are in the list. """
+    for key in keys:
+        if user.get(key):
+            user[key] = 'yes'
+    return user

SoftLayer/fixtures/SoftLayer_Account.py

@@ -691,13 +691,17 @@
      'id': 11100,
      'userStatus': {'name': 'Active'},
      'username': 'SL1234',
-     'virtualGuestCount': 99},
+     'virtualGuestCount': 99,
+     'externalBindingCount': 1,
+     'apiAuthenticationKeyCount': 1,
+     },
     {'displayName': 'PulseL',
      'hardwareCount': 100,
      'id': 11111,
      'userStatus': {'name': 'Active'},
      'username': 'sl1234-abob',
-     'virtualGuestCount': 99}
+     'virtualGuestCount': 99,
+     }
 ]
 
 getReservedCapacityGroups = [