check for default location set to None instead of empty string

Author: allmightyspiff

SoftLayer/managers/ordering.py

@@ -482,13 +482,14 @@ def get_location_id(self, location):
         :returns: integer id of the datacenter
         """
 
+        if isinstance(location, int):
+            return location
         mask = "mask[id,name,regions[keyname]]"
         if match(r'[a-zA-Z]{3}[0-9]{2}', location) is not None:
             search = {'name': {'operation': location}}
         else:
             search = {'regions': {'keyname': {'operation': location}}}
         datacenter = self.client.call('SoftLayer_Location', 'getDatacenters', mask=mask, filter=search)
-        # [{'id': 1854895, 'name': 'dal13', 'regions': [{'keyname': 'DALLAS13'}]}]
         if len(datacenter) != 1:
             raise exceptions.SoftLayerError("Unable to find location: %s" % location)
         return datacenter[0]['id']

tests/CLI/modules/order_tests.py

@@ -210,9 +210,9 @@ def test_location_list(self):
 
     def _get_order_items(self):
         item1 = {'keyName': 'ITEM1', 'description': 'description1',
-                 'prices': [{'id': 1111, 'locationGroupId': ''}]}
+                 'prices': [{'id': 1111, 'locationGroupId': None}]}
         item2 = {'keyName': 'ITEM2', 'description': 'description2',
-                 'prices': [{'id': 2222, 'locationGroupId': ''}]}
+                 'prices': [{'id': 2222, 'locationGroupId': None}]}
 
         return [item1, item2]
 

tests/managers/ordering_tests.py

@@ -225,9 +225,9 @@ def test_get_preset_by_key_preset_not_found(self):
         self.assertEqual('Preset {} does not exist in package {}'.format(keyname, 'PACKAGE_KEYNAME'), str(exc))
 
     def test_get_price_id_list(self):
-        price1 = {'id': 1234, 'locationGroupId': ''}
+        price1 = {'id': 1234, 'locationGroupId': None}
         item1 = {'id': 1111, 'keyName': 'ITEM1', 'prices': [price1]}
-        price2 = {'id': 5678, 'locationGroupId': ''}
+        price2 = {'id': 5678, 'locationGroupId': None}
         item2 = {'id': 2222, 'keyName': 'ITEM2', 'prices': [price2]}
 
         with mock.patch.object(self.ordering, 'list_items') as list_mock: