Unify snapshot-enable logic; add checks in lists

David Pickle · David Pickle · commit 71e15dd9f810 · 2016-08-10T18:08:06.000-05:00
diff --git a/SoftLayer/CLI/block/list.py b/SoftLayer/CLI/block/list.py
@@ -16,7 +16,10 @@
                          mask="serviceResource.datacenter.name"),
     column_helper.Column(
         'storage_type',
-        lambda b: b['storageType']['keyName'].split('_').pop(0),
+        lambda b: b['storageType']['keyName'].split('_').pop(0)
+        if 'storageType' in b and 'keyName' in b['storageType']
+        and isinstance(b['storageType']['keyName'], str)
+        else '-',
         mask="storageType.keyName"),
     column_helper.Column('capacity_gb', ('capacityGb',), mask="capacityGb"),
     column_helper.Column('bytes_used', ('bytesUsed',), mask="bytesUsed"),
diff --git a/SoftLayer/CLI/block/snapshot/enable.py b/SoftLayer/CLI/block/snapshot/enable.py
@@ -30,11 +30,11 @@ def cli(env, volume_id, schedule_type, retention_count,
     """Enables snapshots for a given volume on the specified schedule"""
     block_manager = SoftLayer.BlockStorageManager(env.client)
 
+    valid_schedule_types = {'HOURLY', 'DAILY', 'WEEKLY'}
     valid_days = {'SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY',
                   'FRIDAY', 'SATURDAY'}
 
-    if (schedule_type != 'HOURLY' and schedule_type != 'DAILY'
-            and schedule_type != 'WEEKLY'):
+    if schedule_type not in valid_schedule_types:
         raise exceptions.CLIAbort(
             '--schedule-type must be HOURLY, DAILY, or WEEKLY, not '
             + schedule_type)
diff --git a/SoftLayer/CLI/file/list.py b/SoftLayer/CLI/file/list.py
@@ -16,7 +16,10 @@
                          mask="serviceResource.datacenter.name"),
     column_helper.Column(
         'storage_type',
-        lambda b: b['storageType']['keyName'].split('_').pop(0),
+        lambda b: b['storageType']['keyName'].split('_').pop(0)
+        if 'storageType' in b and 'keyName' in b['storageType']
+        and isinstance(b['storageType']['keyName'], str)
+        else '-',
         mask="storageType.keyName"),
     column_helper.Column('capacity_gb', ('capacityGb',), mask="capacityGb"),
     column_helper.Column('bytes_used', ('bytesUsed',), mask="bytesUsed"),
diff --git a/SoftLayer/CLI/file/snapshot/enable.py b/SoftLayer/CLI/file/snapshot/enable.py
@@ -30,11 +30,11 @@ def cli(env, volume_id, schedule_type, retention_count,
     """Enables snapshots for a given volume on the specified schedule"""
     file_manager = SoftLayer.FileStorageManager(env.client)
 
+    valid_schedule_types = {'HOURLY', 'DAILY', 'WEEKLY'}
     valid_days = {'SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY',
                   'FRIDAY', 'SATURDAY'}
 
-    if (schedule_type != 'HOURLY' and schedule_type != 'DAILY'
-            and schedule_type != 'WEEKLY'):
+    if schedule_type not in valid_schedule_types:
         raise exceptions.CLIAbort(
             '--schedule-type must be HOURLY, DAILY, or WEEKLY, not '
             + schedule_type)
