fix observations

Author: Brian Flores

SoftLayer/CLI/user/grant_access.py

@@ -1,11 +1,12 @@
-"""User grant access to devices."""
+"""Grants a user access to a given device"""
 # :license: MIT, see LICENSE for more details.
 
 import click
 import SoftLayer
 
 from SoftLayer.CLI.command import SLCommand as SLCommand
 from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
 
 
 @click.command(cls=SLCommand, )
@@ -15,7 +16,7 @@
 @click.option('--dedicated', help="dedicated host ID")
 @environment.pass_env
 def cli(env, identifier, hardware, virtual, dedicated):
-    """Grant access from a user to an specific device.
+    """Grants a user access to a given device.
 
     Example: slcli user grant-access 123456 --hardware 123456789
     """
@@ -25,20 +26,20 @@ def cli(env, identifier, hardware, virtual, dedicated):
     if hardware:
         result = mgr.grant_hardware_access(identifier, hardware)
         if result:
-            click.secho("Grant to access to hardware: %s" % hardware, fg='green')
+            click.secho(f"User {identifier} has been given access to hardware {hardware}", fg='green')
 
     if virtual:
         result = mgr.grant_virtual_access(identifier, virtual)
         if result:
-            click.secho("Grant to access to virtual guest: %s" % virtual, fg='green')
+            click.secho(f"User {identifier} has been given access to hardware {virtual}", fg='green')
 
     if dedicated:
         result = mgr.grant_dedicated_access(identifier, dedicated)
         if result:
-            click.secho("Grant to access to dedicated host: %s" % dedicated, fg='green')
+            click.secho(f"User {identifier} has been given access to hardware {dedicated}", fg='green')
 
     if not result:
-        raise SoftLayer.exceptions.SoftLayerError('You need argument a hardware, virtual or dedicated identifier.\n'
-                                                  'E.g slcli user grant-access 123456 --hardware 91803794\n'
-                                                  '    slcli user grant-access 123456 --dedicated 91803793\n'
-                                                  '    slcli user grant-access 123456 --virtual 91803792')
+        raise exceptions.CLIAbort('A device option is required.\n'
+                                  'E.g slcli user grant-access 123456 --hardware 91803794\n'
+                                  '    slcli user grant-access 123456 --dedicated 91803793\n'
+                                  '    slcli user grant-access 123456 --virtual 91803792')

tests/CLI/modules/user_tests.py

@@ -357,6 +357,11 @@ def test_grant_access_dedicated(self):
         result = self.run_command(['user', 'grant-access', '123456', '--dedicated', '369852'])
         self.assert_no_fail(result)
 
+    def test_grant_without_device(self):
+        result = self.run_command(['user', 'grant-access', '123456'])
+        self.assertEqual(2, result.exit_code)
+        self.assertIn('A device option is required.', result.exception.message)
+
     def test_remove_access_hardware(self):
         result = self.run_command(['user', 'remove-access', '123456', '--hardware', '147258'])
         self.assert_no_fail(result)