Merge pull request #1497 from FernandoOjeda/ft/volume_interval

Remove block/file interval option for replica volume.

Author: allmightyspiff

SoftLayer/CLI/block/replication/order.py

@@ -5,6 +5,8 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import helpers
+from SoftLayer import utils
 
 
 CONTEXT_SETTINGS = {'token_normalize_func': lambda x: x.upper()}
@@ -14,9 +16,9 @@
 @click.argument('volume_id')
 @click.option('--snapshot-schedule', '-s',
               help='Snapshot schedule to use for replication, '
-              '(INTERVAL | HOURLY | DAILY | WEEKLY)',
+              '(HOURLY | DAILY | WEEKLY)',
               required=True,
-              type=click.Choice(['INTERVAL', 'HOURLY', 'DAILY', 'WEEKLY']))
+              type=click.Choice(['HOURLY', 'DAILY', 'WEEKLY']))
 @click.option('--location', '-l',
               help='Short name of the data center for the replicant '
               '(e.g.: dal09)',
@@ -40,13 +42,14 @@
 def cli(env, volume_id, snapshot_schedule, location, tier, os_type):
     """Order a block storage replica volume."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
+    block_volume_id = helpers.resolve_id(block_manager.resolve_ids, volume_id, 'Block Volume')
 
     if tier is not None:
         tier = float(tier)
 
     try:
         order = block_manager.order_replicant_volume(
-            volume_id,
+            block_volume_id,
             snapshot_schedule=snapshot_schedule,
             location=location,
             tier=tier,
@@ -57,9 +60,9 @@ def cli(env, volume_id, snapshot_schedule, location, tier, os_type):
 
     if 'placedOrder' in order.keys():
         click.echo("Order #{0} placed successfully!".format(
-            order['placedOrder']['id']))
-        for item in order['placedOrder']['items']:
-            click.echo(" > %s" % item['description'])
+            utils.lookup(order, 'placedOrder', 'id')))
+        for item in utils.lookup(order, 'placedOrder', 'items'):
+            click.echo(" > %s" % item.get('description'))
     else:
         click.echo("Order could not be placed! Please verify your options " +
                    "and try again.")

SoftLayer/CLI/file/replication/order.py

@@ -5,6 +5,8 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import helpers
+from SoftLayer import utils
 
 
 CONTEXT_SETTINGS = {'token_normalize_func': lambda x: x.upper()}
@@ -14,9 +16,9 @@
 @click.argument('volume_id')
 @click.option('--snapshot-schedule', '-s',
               help='Snapshot schedule to use for replication, '
-              '(INTERVAL | HOURLY | DAILY | WEEKLY)',
+              '(HOURLY | DAILY | WEEKLY)',
               required=True,
-              type=click.Choice(['INTERVAL', 'HOURLY', 'DAILY', 'WEEKLY']))
+              type=click.Choice(['HOURLY', 'DAILY', 'WEEKLY']))
 @click.option('--location', '-l',
               help='Short name of the data center for the replicant '
               '(e.g.: dal09)',
@@ -29,13 +31,14 @@
 def cli(env, volume_id, snapshot_schedule, location, tier):
     """Order a file storage replica volume."""
     file_manager = SoftLayer.FileStorageManager(env.client)
+    file_volume_id = helpers.resolve_id(file_manager.resolve_ids, volume_id, 'File Storage')
 
     if tier is not None:
         tier = float(tier)
 
     try:
         order = file_manager.order_replicant_volume(
-            volume_id,
+            file_volume_id,
             snapshot_schedule=snapshot_schedule,
             location=location,
             tier=tier,
@@ -45,9 +48,9 @@ def cli(env, volume_id, snapshot_schedule, location, tier):
 
     if 'placedOrder' in order.keys():
         click.echo("Order #{0} placed successfully!".format(
-            order['placedOrder']['id']))
-        for item in order['placedOrder']['items']:
-            click.echo(" > %s" % item['description'])
+            utils.lookup(order, 'placedOrder', 'id')))
+        for item in utils.lookup(order, 'placedOrder', 'items'):
+            click.echo(" > %s" % item.get('description'))
     else:
         click.echo("Order could not be placed! Please verify your options " +
                    "and try again.")