Merge branch 'caberos-issue1772'

Author: allmightyspiff

…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

@@ -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'),
@@ -295,7 +296,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-delete', 'SoftLayer.CLI.hardware.notification_delete:cli'),
     ('hardware:create-credential', 'SoftLayer.CLI.hardware.create_credential:cli'),
 
     ('securitygroup', 'SoftLayer.CLI.securitygroup'),

SoftLayer/CLI/routes.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 virtual server notification instance: {} was deleted.".format(identifier))

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

@@ -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/notification_delete.py

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

SoftLayer/CLI/virt/notifications.py

@@ -53,3 +53,5 @@
         'username': 'test',
     }
 }
+
+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):
+        """Remove a user hardware notification entry"""
+
+        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"""