Incorporating review comments

Author: hariha74

SoftLayer/CLI/block/snapshot/set_notify_status.py

@@ -9,22 +9,23 @@
 
 @click.command()
 @click.argument('volume_id')
-@click.option(
-    '--notification_flag',
+@click.option('--enable/--disable', default=True,
     help=
-    'Enable / disable sending sending notifications for snapshots space usage threshold warning [True|False]',
+    'Enable/Disable snapshot usage warning notification. Use  `slcli block snapshot-set-notification volumeId --enable` to enable',
     required=True)
 @environment.pass_env
-def cli(env, volume_id, notification_flag):
+def cli(env, volume_id, enable):
     """Enables/Disables snapshot space usage threshold warning for a given volume"""
-    if (notification_flag not in ['True', 'False']):
-        raise exceptions.CLIAbort('--notification-flag must be True or False')
-
     block_manager = SoftLayer.BlockStorageManager(env.client)
-    disabled = block_manager.set_block_volume_snapshot_notification(
-        volume_id, notification_flag)
 
-    if disabled:
+    if enable:
+        enabled = 'True'
+    else:
+        enabled = 'False'
+    status = block_manager.set_block_volume_snapshot_notification(
+        volume_id, enabled)
+
+    if status:
         click.echo(
             'Snapshots space usage threshold warning notification has bee set to %s for volume %s'
-            % (notification - flag, volume_id))
+            % (enabled, volume_id))

SoftLayer/CLI/file/snapshot/set_notify_status.py

@@ -9,23 +9,23 @@
 
 @click.command()
 @click.argument('volume_id')
-@click.option(
-    '--notification_flag',
+@click.option('--enable/--disable', default=True,
     help=
-    'Enable / disable sending sending notifications for snapshots space usage threshold warning [True|False]',
+    'Enable/Disable snapshot usage warning notification. Use  `slcli block snapshot-set-notification volumeId --enable` to enable' ,
     required=True)
 @environment.pass_env
-def cli(env, volume_id, notification_flag):
+def cli(env, volume_id, enable):
     """Enables/Disables snapshot space usage threshold warning for a given volume"""
-
-    if (notification_flag not in ['True', 'False']):
-        raise exceptions.CLIAbort('--notification-flag must be True or False')
-
     file_manager = SoftLayer.FileStorageManager(env.client)
-    disabled = file_manager.set_file_volume_snapshot_notification(
-        volume_id, notification_flag)
 
-    if disabled:
+    if enable:
+        enabled = 'True'
+    else:
+        enabled = 'False'
+
+    status = file_manager.set_file_volume_snapshot_notification(
+            volume_id, enabled)
+    if status:
         click.echo(
             'Snapshots space usage threshold warning notification has bee set to %s for volume %s'
-            % (notification - flag, volume_id))
+            % (enable, volume_id))

SoftLayer/managers/storage.py

@@ -112,15 +112,23 @@ def get_volume_snapshot_list(self, volume_id, **kwargs):
             kwargs['mask'] = ','.join(items)
 
         return self.client.call('Network_Storage', 'getSnapshots', id=volume_id, **kwargs)
-    def set_volume_snapshot_notification(self, volume_id, notification_flag, **kwargs):
-        """Returns a list of snapshots for the specified volume.
+    def set_volume_snapshot_notification(self, volume_id, enable):
+        """Enables/Disables snapshot space usage threshold warning for a given volume.
 
         :param volume_id: ID of volume.
-        :param kwargs:
-        :return: Returns a list of snapshots for the specified volume.
+        :param enable: Enable/Disable flag for snapshot warning notification.
+        :return:  Enables/Disables snapshot space usage threshold warning for a given volume.
         """
 
-        return self.client.call('Network_Storage', 'setSnapshotNotification', notification_flag, id=volume_id , **kwargs)
+        return self.client.call('Network_Storage', 'setSnapshotNotification', enable, id=volume_id)
+
+    def get_volume_snapshot_notification_status(self, volume_id):
+        """returns Enabled/Disabled status of snapshot space usage threshold warning for a given volume.
+
+        :param volume_id: ID of volume.
+        :return:  Enables/Disables snapshot space usage threshold warning for a given volume.
+        """
+        return self.client.call('Network_Storage', 'getSnapshotNotificationStatus', id=volume_id)
 
     def authorize_host_to_volume(self, volume_id, hardware_ids=None, virtual_guest_ids=None,
                                  ip_address_ids=None, subnet_ids=None):