bring in convert/refresh funcs

SoftLayer/CLI/block/convert.py

@@ -0,0 +1,17 @@
+"""Convert a dependent duplicate volume to an independent volume."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+
+
+@click.command()
+@click.argument('volume_id')
+@environment.pass_env
+def cli(env, volume_id):
+    """Convert a dependent duplicate volume to an independent volume."""
+    block_manager = SoftLayer.BlockStorageManager(env.client)
+    resp = block_manager.convert_dep_dupe(volume_id)
+
+    click.echo(resp)

SoftLayer/CLI/block/detail.py

@@ -5,6 +5,7 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 from SoftLayer import utils
 
 
@@ -14,7 +15,8 @@
 def cli(env, volume_id):
     """Display details for a specified volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
-    block_volume = block_manager.get_block_volume_details(volume_id)
+    block_volume_id = helpers.resolve_id(block_manager.resolve_ids, volume_id, 'Block Volume')
+    block_volume = block_manager.get_block_volume_details(block_volume_id)
     block_volume = utils.NestedDict(block_volume)
 
     table = formatting.KeyValueTable(['Name', 'Value'])

SoftLayer/CLI/block/refresh.py

@@ -0,0 +1,18 @@
+"""Refresh a dependent duplicate volume with a snapshot from its parent."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+
+
+@click.command()
+@click.argument('volume_id')
+@click.argument('snapshot_id')
+@environment.pass_env
+def cli(env, volume_id, snapshot_id):
+    """"Refresh a dependent duplicate volume with a snapshot from its parent."""
+    block_manager = SoftLayer.BlockStorageManager(env.client)
+    resp = block_manager.refresh_dep_dupe(volume_id, snapshot_id)
+
+    click.echo(resp)

SoftLayer/CLI/file/convert.py

@@ -0,0 +1,17 @@
+"""Convert a dependent duplicate volume to an independent volume."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+
+
+@click.command()
+@click.argument('volume_id')
+@environment.pass_env
+def cli(env, volume_id):
+    """Convert a dependent duplicate volume to an independent volume."""
+    file_manager = SoftLayer.FileStorageManager(env.client)
+    resp = file_manager.convert_dep_dupe(volume_id)
+
+    click.echo(resp)

SoftLayer/CLI/file/detail.py

@@ -5,6 +5,7 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI import helpers
 from SoftLayer import utils
 
 
@@ -14,7 +15,8 @@
 def cli(env, volume_id):
     """Display details for a specified volume."""
     file_manager = SoftLayer.FileStorageManager(env.client)
-    file_volume = file_manager.get_file_volume_details(volume_id)
+    file_volume_id = helpers.resolve_id(file_manager.resolve_ids, volume_id, 'File Storage')
+    file_volume = file_manager.get_file_volume_details(file_volume_id)
     file_volume = utils.NestedDict(file_volume)
 
     table = formatting.KeyValueTable(['Name', 'Value'])

SoftLayer/CLI/file/refresh.py

@@ -0,0 +1,18 @@
+"""Refresh a dependent duplicate volume with a snapshot from its parent."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+
+
+@click.command()
+@click.argument('volume_id')
+@click.argument('snapshot_id')
+@environment.pass_env
+def cli(env, volume_id, snapshot_id):
+    """"Refresh a dependent duplicate volume with a snapshot from its parent."""
+    file_manager = SoftLayer.FileStorageManager(env.client)
+    resp = file_manager.refresh_dep_dupe(volume_id, snapshot_id)
+
+    click.echo(resp)

SoftLayer/CLI/routes.py

@@ -106,6 +106,8 @@
     ('block:volume-order', 'SoftLayer.CLI.block.order:cli'),
     ('block:volume-set-lun-id', 'SoftLayer.CLI.block.lun:cli'),
     ('block:volume-limits', 'SoftLayer.CLI.block.limit:cli'),
+    ('block:volume-refresh', 'SoftLayer.CLI.block.refresh:cli'),
+    ('block:volume-convert', 'SoftLayer.CLI.block.convert:cli'),
 
     ('event-log', 'SoftLayer.CLI.event_log'),
     ('event-log:get', 'SoftLayer.CLI.event_log.get:cli'),
@@ -137,6 +139,8 @@
     ('file:volume-modify', 'SoftLayer.CLI.file.modify:cli'),
     ('file:volume-order', 'SoftLayer.CLI.file.order:cli'),
     ('file:volume-limits', 'SoftLayer.CLI.file.limit:cli'),
+    ('file:volume-refresh', 'SoftLayer.CLI.file.refresh:cli'),
+    ('file:volume-convert', 'SoftLayer.CLI.file.convert:cli'),
 
     ('firewall', 'SoftLayer.CLI.firewall'),
     ('firewall:add', 'SoftLayer.CLI.firewall.add:cli'),

SoftLayer/fixtures/SoftLayer_Location_Datacenter.py

@@ -0,0 +1,12 @@
+getDatacenters = [
+    {
+        "id": 1441195,
+        "longName": "Dallas 10",
+        "name": "dal10"
+    },
+    {
+        "id": 449494,
+        "longName": "Dallas 9",
+        "name": "dal09"
+    }
+]

SoftLayer/fixtures/SoftLayer_Network_Storage.py

@@ -157,6 +157,7 @@
     'storageTierLevel': 'READHEAVY_TIER',
     'storageType': {'keyName': 'ENDURANCE_STORAGE'},
     'username': 'username',
+    'dependentDuplicate': 1,
 }
 
 getSnapshots = [{
@@ -232,3 +233,11 @@
     'maximumAvailableCount': 300,
     'provisionedCount': 100
 }
+
+refreshDependentDuplicate = {
+    'dependentDuplicate': 1
+}
+
+convertCloneDependentToIndependent = {
+    'dependentDuplicate': 1
+}