Merge pull request #1231 from kremlin-/vdr-integration

bring in convert/refresh funcs

Author: allmightyspiff

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/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/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_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
+}

SoftLayer/managers/storage.py

@@ -414,3 +414,18 @@ def cancel_volume(self, volume_id, reason='No longer needed', immediate=False):
             immediate = True
 
         return self.client.call('SoftLayer_Billing_Item', 'cancelItem', immediate, True, reason, id=billing_item_id)
+
+    def refresh_dep_dupe(self, volume_id, snapshot_id):
+        """"Refresh a dependent 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
+        """
+        return self.client.call('Network_Storage', 'refreshDependentDuplicate', snapshot_id, id=volume_id)
+
+    def convert_dep_dupe(self, volume_id):
+        """Convert a dependent duplicate volume to an independent volume.
+
+        :param integer volume_id: The id of the volume.
+        """
+        return self.client.call('Network_Storage', 'convertCloneDependentToIndependent', id=volume_id)

docs/cli/block.rst

@@ -111,6 +111,13 @@ Block Commands
     :prog: block volume-limits
     :show-nested:
 
+.. click:: SoftLayer.CLI.block.refresh:cli
+   :prog block volume-refresh
+   :show-nested:
+
+.. click:: SoftLayer.CLI.block.convert:cli
+   :prog block volume-convert
+   :show-nested:
 
 .. click:: SoftLayer.CLI.block.subnets.list:cli
     :prog: block subnets-list

docs/cli/file.rst

@@ -99,6 +99,14 @@ File Commands
     :prog: file volume-limits
     :show-nested:
 
+.. click:: SoftLayer.CLI.file.refresh:cli
+    :prog file volume-refresh
+    :show-nested:
+
+.. click:: SoftLayer.CLI.file.convert:cli
+    :prog file volume-convert
+    :show-nested:
+
 .. click:: SoftLayer.CLI.file.snapshot.schedule_list:cli
     :prog: file snapshot-schedule-list
     :show-nested:

tests/CLI/modules/block_tests.py

@@ -716,3 +716,13 @@ def test_volume_limit(self, list_mock):
 
         result = self.run_command(['block', 'volume-limits'])
         self.assert_no_fail(result)
+
+    def test_dep_dupe_refresh(self):
+        result = self.run_command(['block', 'volume-refresh', '102', '103'])
+
+        self.assert_no_fail(result)
+
+    def test_dep_dupe_convert(self):
+        result = self.run_command(['block', 'volume-convert', '102'])
+
+        self.assert_no_fail(result)