Forgot to commit unit test updates

Nathan Beittenmiller · Nathan Beittenmiller · commit 5ed1e083bb84 · 2013-07-08T11:30:11.000-05:00
diff --git a/SoftLayer/tests/managers/hardware_tests.py b/SoftLayer/tests/managers/hardware_tests.py
@@ -155,26 +155,15 @@ def test_generate_create_dict_with_all_bare_metal_options(self):
             {'name': 'Bare Metal Instance', 'id': package_id}]
 
         args = {
-            'server_core': 100,
+            'server': 100,
             'hourly': False,
             'hostname': 'unicorn',
             'domain': 'giggles.woo',
-            'disk0': 500,
+            'disks': [500],
             'location': 'Wyrmshire',
             'os': 200,
-            'image_id': None,
-            'pri_ip_addresses': 300,
-            'bandwidth': 400,
-            'userdata': None,
-            'monitoring': 500,
             'port_speed': 600,
-            'vulnerability_scanner': 700,
-            'response': 800,
-            'vpn_management': 900,
-            'remote_management': 1000,
-            'notification': 1100,
             'bare_metal': True,
-            'database': 1200,
         }
 
         assert_data = {
@@ -186,18 +175,10 @@ def test_generate_create_dict_with_all_bare_metal_options(self):
             'location': args['location'],
             'packageId': package_id,
             'prices': [
-                {'id': args['server_core']},
-                {'id': args['disk0']},
+                {'id': args['server']},
+                {'id': args['disks'][0]},
                 {'id': args['os']},
-                {'id': args['pri_ip_addresses']},
-                {'id': args['bandwidth']},
-                {'id': args['monitoring']},
                 {'id': args['port_speed']},
-                {'id': args['vulnerability_scanner']},
-                {'id': args['response']},
-                {'id': args['vpn_management']},
-                {'id': args['remote_management']},
-                {'id': args['notification']},
             ],
         }
 
@@ -210,28 +191,14 @@ def test_generate_create_dict_with_all_dedicated_server_options(self):
             'server': 100,
             'hostname': 'unicorn',
             'domain': 'giggles.woo',
-            'disk0': 500,
+            'disks': [500],
             'location': 'Wyrmshire',
             'os': 200,
-            'image_id': None,
-            'pri_ip_addresses': 300,
-            'bandwidth': 400,
-            'userdata': None,
-            'monitoring': 500,
             'port_speed': 600,
-            'vulnerability_scanner': 700,
-            'response': 800,
-            'vpn_management': 900,
-            'remote_management': 1000,
-            'notification': 1100,
             'bare_metal': False,
-            'database': 1200,
             'package_id': 13,
-            'firewall': 1300,
             'ram': 1400,
             'disk_controller': 1500,
-            'lockbox': 1600,
-            'nas': 9999,
         }
 
         assert_data = {
@@ -244,22 +211,11 @@ def test_generate_create_dict_with_all_dedicated_server_options(self):
             'packageId': 13,
             'prices': [
                 {'id': args['server']},
-                {'id': args['disk0']},
+                {'id': args['disks'][0]},
                 {'id': args['os']},
-                {'id': args['pri_ip_addresses']},
-                {'id': args['bandwidth']},
-                {'id': args['monitoring']},
                 {'id': args['port_speed']},
-                {'id': args['vulnerability_scanner']},
-                {'id': args['response']},
-                {'id': args['vpn_management']},
-                {'id': args['remote_management']},
-                {'id': args['notification']},
-                {'id': args['firewall']},
                 {'id': args['ram']},
                 {'id': args['disk_controller']},
-                {'id': args['lockbox']},
-                {'id': args['nas']},
             ],
         }
 
