Bug fixes from testing the CLI

Nathan Beittenmiller · Nathan Beittenmiller · commit a4da9dce897d · 2013-07-08T15:10:18.000-05:00
diff --git a/SoftLayer/CLI/modules/bmetal.py b/SoftLayer/CLI/modules/bmetal.py
@@ -346,7 +346,9 @@ def execute(cls, client, args):
                 disk_prices.append(disk_price)
 
         if not disk_prices:
-            disk_price = cls._get_default_value(bmi_options, 'disk0')
+            disk_prices.append(cls._get_default_value(bmi_options, 'disk0'))
+
+        order['disks'] = disk_prices
 
         # Set the port speed
         port_speed = args.get('--network') or 10
@@ -399,7 +401,6 @@ def execute(cls, client, args):
                 "This action will incur charges on your account. Continue?"):
             result = mgr.place_order(**order)
 
-            print result
             t = Table(['name', 'value'])
             t.align['name'] = 'r'
             t.align['value'] = 'l'
diff --git a/SoftLayer/CLI/modules/hardware.py b/SoftLayer/CLI/modules/hardware.py
@@ -586,7 +586,7 @@ def _generate_windows_code(description):
 
 class CreateHardware(CLIRunnable):
     """
-usage: sl hardware create --hostname=HOST --domain=DOMAIN --cpu=CPU
+usage: sl hardware create --hostname=HOST --domain=DOMAIN --cpu=CPU 
     --chassis=CHASSIS --memory=MEMORY --os=OS --disk=SIZE... [options]
 
 Order/create a dedicated server. See 'sl hardware list-chassis' and
@@ -649,8 +649,10 @@ def execute(cls, client, args):
                 disk_prices.append(disk_price)
 
         if not disk_prices:
-            disk_price = cls._get_default_value(ds_options, 'disk0')
+            disk_prices.append(cls._get_default_value(ds_options, 'disk0'))
 
+        order['disks'] = disk_prices
+            
         # Set the disk controller price
         if args.get('--controller'):
             dc_price = cls._get_price_id_from_options(ds_options,
