more user improvements

Author: allmightyspiff

SoftLayer/CLI/user/edit_permissions.py

@@ -11,16 +11,20 @@
 @click.command()
 @click.argument('identifier')
 @click.option('--enable/--disable', default=True,
-              help="Enable or Disable selected permissions")
-@click.option('--permission', '-p', multiple=True,
-              help="Permission keyName to set, multiple instances allowed.")
+              help="Enable (DEFAULT) or Disable selected permissions")
+@click.option('--permission', '-p', multiple=True, required=True,
+              help="Permission keyName to set, multiple instances allowed. Use keyword ALL to select ALL permisssions")
+@click.option('--from-user', '-u', default=None, 
+              help="Set permissions to match this user's permissions")
 @environment.pass_env
-def cli(env, identifier, enable, permission):
+def cli(env, identifier, enable, permission, from_user):
     """Enable or Disable specific permissions."""
-
     mgr = SoftLayer.UserManager(env.client)
     user_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'username')
     result = False
+    # TODO, this bit. Make sure from-user and permission/enable are exclusive
+    if from_user:
+       result = mgr.permissions_from_user(user_id, from_user) 
     if enable:
         result = mgr.add_permissions(user_id, permission)
     else:

SoftLayer/CLI/user/list.py

@@ -8,23 +8,23 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 
+from pprint import pprint as pp
 
 COLUMNS = [
     column_helper.Column('id', ('id',)),
     column_helper.Column('username', ('username',)),
+    column_helper.Column('email', ('email',)),
     column_helper.Column('displayName', ('displayName',)),
     column_helper.Column('status', ('userStatus', 'name')),
     column_helper.Column('hardwareCount', ('hardwareCount',)),
-    column_helper.Column('virtualGuestCount', ('virtualGuestCount',)),
+    column_helper.Column('virtualGuestCount', ('virtualGuestCount',))
 ]
 
 DEFAULT_COLUMNS = [
     'id',
     'username',
-    'displayName',
-    'status',
-    'hardwareCount',
-    'virtualGuestCount'
+    'email',
+    'displayName'
 ]
 
 

SoftLayer/managers/user.py

@@ -11,6 +11,7 @@
 from SoftLayer import exceptions
 from SoftLayer import utils
 
+from pprint import pprint as pp
 
 class UserManager(utils.IdentifierMixin, object):
     """Manages Users.
@@ -46,7 +47,8 @@ def list_users(self, objectmask=None, objectfilter=None):
         """
 
         if objectmask is None:
-            objectmask = "mask[id, username, displayName, userStatus[name], hardwareCount, virtualGuestCount]"
+            objectmask = """mask[id, username, displayName, userStatus[name], hardwareCount, virtualGuestCount,
+                                 email, roles]"""
 
         return self.account_service.getUsers(mask=objectmask, filter=objectfilter)
 
@@ -79,7 +81,7 @@ def add_permissions(self, user_id, permissions):
         Example::
             add_permissions(123, ['BANDWIDTH_MANAGE'])
         """
-        pretty_permissions = format_permission_object(permissions)
+        pretty_permissions = self.format_permission_object(permissions)
         return self.user_service.addBulkPortalPermission(pretty_permissions, id=user_id)
 
     def remove_permissions(self, user_id, permissions):
@@ -92,7 +94,7 @@ def remove_permissions(self, user_id, permissions):
         Example::
             remove_permissions(123, ['BANDWIDTH_MANAGE'])
         """
-        pretty_permissions = format_permission_object(permissions)
+        pretty_permissions = self.format_permission_object(permissions)
         return self.user_service.removeBulkPortalPermission(pretty_permissions, id=user_id)
 
     def get_user_permissions(self, user_id):
@@ -165,9 +167,19 @@ def _get_id_from_username(self, username):
             raise exceptions.SoftLayerError("Unable to find user id for %s" % username)
 
 
-def format_permission_object(permissions):
-    """Formats a list of permission key names into something the SLAPI will respect"""
-    pretty_permissions = []
-    for permission in permissions:
-        pretty_permissions.append({'keyName': permission})
-    return pretty_permissions
+    def format_permission_object(self, permissions):
+        """Formats a list of permission key names into something the SLAPI will respect"""
+        pretty_permissions = []
+        available_permissions = self.get_all_permissions()
+        # pp(available_permissions)
+        for permission in permissions:
+            permission = permission.upper()
+            if permission == 'ALL':
+                return available_permissions
+            # Search through available_permissions to make sure what the user entered was valid
+            if next(filter(lambda x: x['keyName'] == permission, available_permissions), False):
+                pretty_permissions.append({'keyName': permission})
+            else:
+                raise exceptions.SoftLayerError("%s is not a valid permission" % permission)
+        pp(pretty_permissions)
+        return pretty_permissions