Merge pull request #1786 from caberos/issue1771

slcli hw add-notifications crashes with a bad user

Author: allmightyspiff

SoftLayer/CLI/hardware/add_notification.py

@@ -5,12 +5,13 @@
 
 import SoftLayer
 from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
 
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('identifier')
-@click.option('--users', multiple=True,
+@click.option('--users', multiple=True, required=True,
               help='UserId to be notified on monitoring failure.')
 @environment.pass_env
 def cli(env, identifier, users):
@@ -24,8 +25,10 @@ def cli(env, identifier, users):
 
     for user in users:
         notification = hardware.add_notification(identifier, user)
-        table.add_row([notification['id'], notification['hardware']['fullyQualifiedDomainName'],
-                       notification['user']['username'], notification['user']['email'],
-                       notification['user']['firstName'], notification['user']['lastName']])
-
+        if notification:
+            table.add_row([notification['id'], notification['hardware']['fullyQualifiedDomainName'],
+                           notification['user']['username'], notification['user']['email'],
+                           notification['user']['firstName'], notification['user']['lastName']])
+        else:
+            raise exceptions.CLIAbort("User not found: {}.".format(user))
     env.fout(table)