del-notification commands, rename the commands to notifications-add

Author: caberos

…ftLayer/CLI/hardware/add_notification.py …ftLayer/CLI/hardware/notification_add.pySoftLayer/CLI/hardware/add_notification.py renamed to SoftLayer/CLI/hardware/notification_add.py SoftLayer/CLI/hardware/add_notification.py renamed to SoftLayer/CLI/hardware/notification_add.py

@@ -0,0 +1,21 @@
+"""Remove a user hardware 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 hardware notification entry."""
+
+    hardware = SoftLayer.HardwareManager(env.client)
+
+    result = hardware.remove_notification(identifier)
+
+    if result:
+        env.fout("The hardware notification instance: {} was deleted.".format(identifier))

SoftLayer/CLI/hardware/notification_delete.py

@@ -18,12 +18,13 @@ def cli(env, identifier):
 
     notifications = hardware.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['hardware']['fullyQualifiedDomainName'], notification['hardware']['hostname'],
+        table.add_row([notification['id'],
+                       notification['hardware']['fullyQualifiedDomainName'], notification['hardware']['hostname'],
                        notification['user']['username'], notification['user']['email'],
                        notification['user']['firstName'], notification['user']['lastName']])
 

SoftLayer/CLI/hardware/notifications.py

@@ -295,7 +295,8 @@
     ('hardware:sensor', 'SoftLayer.CLI.hardware.sensor:cli'),
     ('hardware:monitoring', 'SoftLayer.CLI.hardware.monitoring:cli'),
     ('hardware:notifications', 'SoftLayer.CLI.hardware.notifications:cli'),
-    ('hardware:add-notification', 'SoftLayer.CLI.hardware.add_notification:cli'),
+    ('hardware:notification-add', 'SoftLayer.CLI.hardware.notification_add:cli'),
+    ('hardware:notification-del', 'SoftLayer.CLI.hardware.notification_delete:cli'),
     ('hardware:create-credential', 'SoftLayer.CLI.hardware.create_credential:cli'),
 
     ('securitygroup', 'SoftLayer.CLI.securitygroup'),

SoftLayer/CLI/routes.py

@@ -68,3 +68,5 @@
 
     }
 }
+
+deleteObjects = True

SoftLayer/fixtures/SoftLayer_User_Customer_Notification_Hardware.py

@@ -1110,6 +1110,12 @@ def create_credential(self, template):
         """Create a password for a software component"""
         return self.client.call('SoftLayer_Software_Component_Password', 'createObject', template)
 
+    def remove_notification(self, identifier):
+        """Create a password for a software component"""
+
+        template = [{'id': identifier}]
+        return self.client.call('SoftLayer_User_Customer_Notification_Hardware', 'deleteObjects', template)
+
 
 def _get_bandwidth_key(items, hourly=True, no_public=False, location=None):
     """Picks a valid Bandwidth Item, returns the KeyName"""

SoftLayer/managers/hardware.py

@@ -136,8 +136,12 @@ This function updates the firmware of a server. If already at the latest version
    :prog: hardware notifications
    :show-nested:
 
-.. click:: SoftLayer.CLI.hardware.add_notification:cli
-   :prog: hardware add-notification
+.. click:: SoftLayer.CLI.hardware.notification_add:cli
+   :prog: hardware notification-add
+   :show-nested:
+
+.. click:: SoftLayer.CLI.hardware.notification_delete:cli
+   :prog: hardware notification-delete
    :show-nested:
 
 .. click:: SoftLayer.CLI.hardware.create_credential:cli

docs/cli/hardware.rst

@@ -1045,7 +1045,11 @@ def test_notifications(self):
         self.assert_no_fail(result)
 
     def test_add_notification(self):
-        result = self.run_command(['hardware', 'add-notification', '100', '--users', '123456'])
+        result = self.run_command(['hardware', 'notification-add', '100', '--users', '123456'])
+        self.assert_no_fail(result)
+
+    def test_notification_delete(self):
+        result = self.run_command(['hardware', 'notification-delete', '100'])
         self.assert_no_fail(result)
 
     def test_create_credential(self):

tests/CLI/modules/server_tests.py

@@ -928,6 +928,10 @@ def test_add_notification(self):
         self.hardware.add_notification(100, 123456)
         self.assert_called_with('SoftLayer_User_Customer_Notification_Hardware', 'createObject')
 
+    def test_notification_del(self):
+        self.hardware.remove_notification(100)
+        self.assert_called_with('SoftLayer_User_Customer_Notification_Hardware', 'deleteObjects')
+
     def test_get_software_component(self):
         self.hardware.get_software_components(123456)
         self.assert_called_with('SoftLayer_Hardware', 'getSoftwareComponents')