Merge pull request #1832 from ko101/master

update volume-refresh command

Author: allmightyspiff

SoftLayer/CLI/block/refresh.py

@@ -9,10 +9,12 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.argument('snapshot_id')
+@click.option('--force-refresh', '-f', is_flag=True, default=False, show_default=True,
+              help="Cancel current refresh process and initiates the new refresh.")
 @environment.pass_env
-def cli(env, volume_id, snapshot_id):
+def cli(env, volume_id, snapshot_id, force_refresh):
     """Refresh a duplicate volume with a snapshot from its parent."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
-    resp = block_manager.refresh_dupe(volume_id, snapshot_id)
+    resp = block_manager.refresh_dupe(volume_id, snapshot_id, force_refresh)
 
     click.echo(resp)

SoftLayer/CLI/file/refresh.py

@@ -9,10 +9,12 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @click.argument('snapshot_id')
+@click.option('--force-refresh', '-f', is_flag=True, default=False, show_default=True,
+              help="Cancel current refresh process and initiates the new refresh.")
 @environment.pass_env
-def cli(env, volume_id, snapshot_id):
+def cli(env, volume_id, snapshot_id, force_refresh):
     """Refresh a duplicate volume with a snapshot from its parent."""
     file_manager = SoftLayer.FileStorageManager(env.client)
-    resp = file_manager.refresh_dupe(volume_id, snapshot_id)
+    resp = file_manager.refresh_dupe(volume_id, snapshot_id, force_refresh)
 
     click.echo(resp)

SoftLayer/managers/storage.py

@@ -563,15 +563,17 @@ def cancel_volume(self,
                                 reason,
                                 id=billing_item_id)
 
-    def refresh_dupe(self, volume_id, snapshot_id):
+    def refresh_dupe(self, volume_id, snapshot_id, force_refresh=False):
         """"Refresh a duplicate volume with a snapshot from its parent.
 
         :param integer volume_id: The id of the volume
         :param integer snapshot_id: The id of the snapshot
+        :param boolean force_refresh: Force refreshing the volume if True
         """
         return self.client.call('Network_Storage',
                                 'refreshDuplicate',
                                 snapshot_id,
+                                force_refresh,
                                 id=volume_id)
 
     def convert_dep_dupe(self, volume_id):