Minor cosmetic and parameter updates

Author: hariha74

SoftLayer/CLI/block/snapshot/get_notify_status.py

@@ -24,5 +24,5 @@ def cli(env, volume_id):
         click.echo('Snapshots space usage threshold warning flag setting is enabled for volume %s'
             % (volume_id))
     else:
-        click.echo('DISABLED: Snapshots space usage threshold warning flag setting is disabled for volume %s'
+        click.echo('Snapshots space usage threshold warning flag setting is disabled for volume %s'
             % (volume_id))

SoftLayer/CLI/block/snapshot/set_notify_status.py

@@ -15,7 +15,6 @@
 @environment.pass_env
 def cli(env, volume_id, notification_flag):
     """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')

SoftLayer/managers/block.py

@@ -110,7 +110,7 @@ def set_block_volume_snapshot_notification(self, volume_id, notification_flag, *
         :param notification-flag: 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,)
+        return self.client.call('Network_Storage', 'setSnapshotNotification', notification_flag, id=volume_id, **kwargs)
 
     def get_block_snapshots_notification_status(self, volume_id, **kwargs):
         """returns Enabled/Disabled snapshot space usage threshold warning for a given volume.
@@ -119,7 +119,7 @@ def get_block_snapshots_notification_status(self, volume_id, **kwargs):
         :param kwargs:
         :return: Enabled/Disabled snapshot space usage threshold warning for a given volume.
         """
-        return self.client.call('Network_Storage', 'getSnapshotNotificationStatus', id=volume_id,)
+        return self.client.call('Network_Storage', 'getSnapshotNotificationStatus', id=volume_id, **kwargs)
 
     def assign_subnets_to_acl(self, access_id, subnet_ids):
         """Assigns subnet records to ACL for the access host.

SoftLayer/managers/file.py

@@ -137,7 +137,7 @@ def set_file_volume_snapshot_notification(self, volume_id, notification_flag, **
         :param notification-flag: 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,)
+        return self.client.call('Network_Storage', 'setSnapshotNotification',  notification_flag, id=volume_id, **kwargs)
 
     def get_file_snapshots_notification_status(self, volume_id, **kwargs):
         """returns Enabled/Disabled snapshot space usage threshold warning for a given volume.
@@ -146,7 +146,7 @@ def get_file_snapshots_notification_status(self, volume_id, **kwargs):
         :param kwargs:
         :return: Enabled/Disabled snapshot space usage threshold warning for a given volume.
         """
-        return self.client.call('Network_Storage', 'getSnapshotNotificationStatus', id=volume_id,)
+        return self.client.call('Network_Storage', 'getSnapshotNotificationStatus', id=volume_id, **kwargs)
     def order_file_volume(self, storage_type, location, size,
                           iops=None, tier_level=None, snapshot_size=None,
                           service_offering='storage_as_a_service',

SoftLayer/managers/storage.py

@@ -112,6 +112,15 @@ 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.
+
+        :param volume_id: ID of volume.
+        :param kwargs:
+        :return: Returns a list of snapshots for the specified volume.
+        """
+
+        return self.client.call('Network_Storage', 'setSnapshotNotification', notification_flag, id=volume_id , **kwargs)
 
     def authorize_host_to_volume(self, volume_id, hardware_ids=None, virtual_guest_ids=None,
                                  ip_address_ids=None, subnet_ids=None):