fix the unit test

Author: caberos

SoftLayer/fixtures/SoftLayer_Product_Package.py

@@ -866,8 +866,8 @@
             'referenceCode': 'REDHAT_5_64'
         },
         'prices': [{'id': 1122,
-                    'hourlyRecurringFee': 0.0,
-                    'recurringFee': 0.0,
+                    'hourlyRecurringFee': 0.10,
+                    'recurringFee': 0.10,
                     'categories': [{'id': 26,
                                     'name': 'Uplink Port Speeds',
                                     'categoryCode': 'port_speed'}]}],
@@ -879,8 +879,8 @@
         'description': 'Public & Private Networks',
         'itemCategory': {'categoryCode': 'Uplink Port Speeds'},
         'prices': [{'id': 4477,
-                    'hourlyRecurringFee': 0.0,
-                    'recurringFee': 0.0,
+                    'hourlyRecurringFee': 0.10,
+                    'recurringFee': 0.10,
                     'categories': [{'id': 26,
                                     'name': 'Uplink Port Speeds',
                                     'categoryCode': 'port_speed'}]}],
@@ -921,8 +921,8 @@
         'itemCategory': {'categoryCode': 'Computing Instance'},
         'prices': [{'id': 1144,
                     'locationGroupId': None,
-                    'hourlyRecurringFee': 0.0,
-                    'recurringFee': 0.0,
+                    'hourlyRecurringFee': 0.10,
+                    'recurringFee': 0.10,
                     'categories': [{'id': 80,
                                     'name': 'Computing Instance',
                                     'categoryCode': 'guest_core'}]}],
@@ -948,39 +948,39 @@
         'capacity': '1',
         'description': '1 GB iSCSI Storage',
         'itemCategory': {'categoryCode': 'iscsi'},
-        'prices': [{'id': 2222, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 2222, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {
         'id': 1121,
         'keyName': 'KeyName081',
         'capacity': '20',
         'description': '20 GB iSCSI snapshot',
         'itemCategory': {'categoryCode': 'iscsi_snapshot_space'},
-        'prices': [{'id': 2014, 'hourlyRecurringFee': 0.0}],
+        'prices': [{'id': 2014, 'hourlyRecurringFee': 0.10}],
     },
     {
         'id': 4440,
         'keyName': 'KeyName019',
         'capacity': '4',
         'description': '4 Portable Public IP Addresses',
         'itemCategory': {'categoryCode': 'sov_sec_ip_addresses_pub'},
-        'prices': [{'id': 4444, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 4444, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {
         'id': 8880,
         'keyName': 'KeyName0199',
         'capacity': '8',
         'description': '8 Portable Public IP Addresses',
         'itemCategory': {'categoryCode': 'sov_sec_ip_addresses_pub'},
-        'prices': [{'id': 8888, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 8888, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {
         'id': 44400,
         'keyName': 'KeyName0155',
         'capacity': '4',
         'description': '4 Portable Private IP Addresses',
         'itemCategory': {'categoryCode': 'sov_sec_ip_addresses_priv'},
-        'prices': [{'id': 44441, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 44441, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {
         'id': 88800,
@@ -1012,7 +1012,7 @@
         'capacity': '0',
         'description': 'Global IPv6',
         'itemCategory': {'categoryCode': 'global_ipv6'},
-        'prices': [{'id': 611, 'hourlyRecurringFee': 0.0, 'recurringFee': 0.0}],
+        'prices': [{'id': 611, 'hourlyRecurringFee': 0.10, 'recurringFee': 0.10}],
     },
     {'attributes': [],
      'capacity': '0',
@@ -1056,16 +1056,16 @@
      'keyName': 'OS_UBUNTU_14_04_LTS_TRUSTY_TAHR_64_BIT',
      'prices': [{'accountRestrictions': [],
                  'currentPriceFlag': '',
-                 'hourlyRecurringFee': '0',
+                 'hourlyRecurringFee': '0.10',
                  'id': 37650,
                  "locationGroupId": '',
                  'itemId': 4702,
                  'laborFee': '0',
                  'onSaleFlag': '',
                  'oneTimeFee': '0',
                  'quantity': '',
-                 'recurringFee': '0',
-                 'setupFee': '0',
+                 'recurringFee': '0.1',
+                 'setupFee': '0.1',
                  'sort': 9}],
      'softwareDescription': {'id': 1362,
                              'longDescription': 'Ubuntu / 14.04-64',

tests/CLI/modules/server_tests.py

@@ -367,18 +367,17 @@ def test_create_options_prices(self):
 
         self.assert_no_fail(result)
         output = json.loads(result.output)
-        self.assertEqual(output[1][0]['Hourly'], "%.4f" % 0.0)
-        self.assertEqual(output[1][0]['Value'], 'M1_64X512X25')
-        self.assertEqual(output[1][0]['Size'], 'M1.64x512x25')
+        self.assertEqual(output[2][0]['Monthly'], str(0.1))
+        self.assertEqual(output[2][0]['OS Key'], 'OS_UBUNTU_14_04_LTS_TRUSTY_TAHR_64_BIT')
 
     def test_create_options_location(self):
         result = self.run_command(['server', 'create-options', '--prices', 'dal13'])
 
         self.assert_no_fail(result)
         output = json.loads(result.output)
-        self.assertEqual(output[1][0]['Monthly'], "%.4f" % 0.0)
-        self.assertEqual(output[1][0]['Hourly'], "%.4f" % 0.0)
-        self.assertEqual(output[1][0]['Value'], 'M1_64X512X25')
+        print(output)
+        self.assertEqual(output[2][0]['Monthly'], str(0.1))
+        self.assertEqual(output[2][0]['OS Key'], 'OS_UBUNTU_14_04_LTS_TRUSTY_TAHR_64_BIT')
 
     @mock.patch('SoftLayer.HardwareManager.place_order')
     def test_create_server(self, order_mock):