fix the team code review comments

Author: caberos

SoftLayer/CLI/routes.py

@@ -55,7 +55,8 @@
     ('virtual:access', 'SoftLayer.CLI.virt.access:cli'),
     ('virtual:monitoring', 'SoftLayer.CLI.virt.monitoring:cli'),
     ('virtual:notifications', 'SoftLayer.CLI.virt.notifications:cli'),
-    ('virtual:add-notification', 'SoftLayer.CLI.virt.add_notification:cli'),
+    ('virtual:notification-add', 'SoftLayer.CLI.virt.notification_add:cli'),
+    ('virtual:notification-delete', 'SoftLayer.CLI.virt.notification_delete:cli'),
 
     ('dedicatedhost', 'SoftLayer.CLI.dedicatedhost'),
     ('dedicatedhost:list', 'SoftLayer.CLI.dedicatedhost.list:cli'),

SoftLayer/CLI/virt/add_notification.py SoftLayer/CLI/virt/notification_add.pySoftLayer/CLI/virt/add_notification.py renamed to SoftLayer/CLI/virt/notification_add.py

@@ -0,0 +1,21 @@
+"""Remove a user VS notification entry."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+
+import SoftLayer
+from SoftLayer.CLI import environment
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand, )
+@click.argument('identifier')
+@environment.pass_env
+def cli(env, identifier):
+    """Remove a user VS notification entry."""
+
+    virtual = SoftLayer.VSManager(env.client)
+
+    result = virtual.remove_notification(identifier)
+
+    if result:
+        env.fout("The hardware notification instance: {} was deleted.".format(identifier))

SoftLayer/CLI/virt/notification_delete.py

@@ -18,12 +18,13 @@ def cli(env, identifier):
 
     notifications = virtual.get_notifications(identifier)
 
-    table = formatting.KeyValueTable(['Domain', 'Hostmane', 'Username', 'Email', 'FirstName', 'Lastname'])
+    table = formatting.KeyValueTable(['Id', 'Domain', 'Hostmane', 'Username', 'Email', 'FirstName', 'Lastname'])
     table.align['Domain'] = 'r'
     table.align['Username'] = 'l'
 
     for notification in notifications:
-        table.add_row([notification['guest']['fullyQualifiedDomainName'], notification['guest']['hostname'],
+        table.add_row([notification['id'],
+                       notification['guest']['fullyQualifiedDomainName'], notification['guest']['hostname'],
                        notification['user']['username'], notification['user']['email'],
                        notification['user']['lastName'], notification['user']['firstName']])
 

SoftLayer/CLI/virt/notifications.py

@@ -53,3 +53,5 @@
         'username': 'test',
     }
 }
+
+deleteObjects = True

SoftLayer/fixtures/SoftLayer_User_Customer_Notification_Virtual_Guest.py

@@ -1111,7 +1111,7 @@ def create_credential(self, template):
         return self.client.call('SoftLayer_Software_Component_Password', 'createObject', template)
 
     def remove_notification(self, identifier):
-        """Create a password for a software component"""
+        """Remove a user hardware notification entry"""
 
         template = [{'id': identifier}]
         return self.client.call('SoftLayer_User_Customer_Notification_Hardware', 'deleteObjects', template)

SoftLayer/managers/hardware.py

@@ -1470,3 +1470,9 @@ def add_notification(self, virtual_id, user_id):
         mask = 'user'
         return self.client.call('SoftLayer_User_Customer_Notification_Virtual_Guest',
                                 'createObject', template, mask=mask)
+
+    def remove_notification(self, identifier):
+        """Remove a user vs notification entry"""
+
+        template = [{'id': identifier}]
+        return self.client.call('SoftLayer_User_Customer_Notification_Virtual_Guest', 'deleteObjects', template)

SoftLayer/managers/vs.py

@@ -283,8 +283,12 @@ If no timezone is specified, IMS local time (CST) will be assumed, which might n
    :prog: virtual notifications
    :show-nested:
 
-.. click:: SoftLayer.CLI.virt.add_notification:cli
-   :prog: virtual add-notification
+.. click:: SoftLayer.CLI.virt.notification_add:cli
+   :prog: virtual notification-add
+   :show-nested:
+
+.. click:: SoftLayer.CLI.virt.notification_delete:cli
+   :prog: virtual notification-delete
    :show-nested:
 
 Manages the migration of virutal guests. Supports migrating virtual guests on Dedicated Hosts as well.

docs/cli/vs.rst

@@ -984,5 +984,9 @@ def test_notifications(self):
         self.assert_no_fail(result)
 
     def test_add_notification(self):
-        result = self.run_command(['vs', 'add-notification', '100', '--users', '123456'])
+        result = self.run_command(['vs', 'notification-add', '100', '--users', '123456'])
+        self.assert_no_fail(result)
+
+    def test_notification_delete(self):
+        result = self.run_command(['vs', 'notification-delete', '100'])
         self.assert_no_fail(result)

tests/CLI/modules/vs/vs_tests.py

@@ -1338,3 +1338,7 @@ def test_notification(self):
     def test_add_notification(self):
         self.vs.add_notification(100, 123456)
         self.assert_called_with('SoftLayer_User_Customer_Notification_Virtual_Guest', 'createObject')
+
+    def test_notification_del(self):
+        self.vs.remove_notification(100)
+        self.assert_called_with('SoftLayer_User_Customer_Notification_Virtual_Guest', 'deleteObjects')