Merge pull request #471 from Neetuj/issue470

Issue470
softlayer · Jan 12, 2015 · 3287aef · 3287aef
2 parents d14de67 + 2752e0f
commit 3287aef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/SoftLayer/CLI/server/__init__.py b/SoftLayer/CLI/server/__init__.py
@@ -114,11 +114,11 @@ def get_create_options(ds_options, section, pretty=True):
 
     elif 'disk' == section:
         disks = []
-        type_regex = re.compile(r'^[\d\.]+[GT]B\s+(.+)$')
+        type_regex = re.compile(r'^[\d\.\s]+[GT]B\s+(.+)$')
         for disk in ds_options['categories']['disk0']['items']:
             disk_type = 'SATA'
-            disk_type = type_regex.match(disk['description']).group(1)
-
+            if type_regex.match(disk['description']) is not None:
+                disk_type = type_regex.match(disk['description']).group(1)
             disk_type = disk_type.replace('RPM', '').strip()
             disk_type = disk_type.replace(' ', '_').upper()
             disk_type = str(int(disk['capacity'])) + '_' + disk_type

diff --git a/tox.ini b/tox.ini
@@ -29,7 +29,7 @@ commands =
            -d I0011 \           # Locally Disabling
            --max-args=20 \
            --max-branches=40 \
-           --max-statements=86 \
+           --max-statements=87 \
            --max-returns=8 \
            --min-public-methods=0 \
            --min-similarity-lines=30