improve gather list of locations

Author: ATGE

SoftLayer/managers/image.py

@@ -195,19 +195,17 @@ def add_locations(self, image_id, location_names):
         :param int image_id: The ID of the image
         :param location_names: Locations for the Image.
         """
-        locations = self.get_locations_id_list(image_id, location_names)
-        locations_ids = [{'id': location_id} for location_id in locations]
-        return self.vgbdtg.addLocations(locations_ids, id=image_id)
+        locations = self.get_locations_list(image_id, location_names)
+        return self.vgbdtg.addLocations(locations, id=image_id)
 
     def remove_locations(self, image_id, location_names):
         """Remove available locations from an archive image template.
 
         :param int image_id: The ID of the image
         :param location_names: Locations for the Image.
         """
-        locations = self.get_locations_id_list(image_id, location_names)
-        locations_ids = [{'id': location_id} for location_id in locations]
-        return self.vgbdtg.removeLocations(locations_ids, id=image_id)
+        locations = self.get_locations_list(image_id, location_names)
+        return self.vgbdtg.removeLocations(locations, id=image_id)
 
     def get_storage_locations(self, image_id):
         """Get available locations for public image storage.
@@ -216,13 +214,12 @@ def get_storage_locations(self, image_id):
         """
         return self.vgbdtg.getStorageLocations(id=image_id)
 
-    def get_locations_id_list(self, image_id, location_names):
-        """Converts a list of location names to a list of location IDs.
+    def get_locations_list(self, image_id, location_names):
+        """Converts a list of location names to a list of locations.
 
         :param int image_id: The ID of the image.
         :param list location_names: A list of location names strings.
-        :returns: A list of locations IDs associated with the given location
-                  keynames in the image id.
+        :returns: A list of locations associated with the given location names in the image.
         """
         locations = self.get_storage_locations(image_id)
         locations_ids = []
@@ -235,10 +232,8 @@ def get_locations_id_list(self, image_id, location_names):
                     matching_location = location
                     break
             if matching_location.get('id') is None:
-                raise exceptions.SoftLayerError(
-                    output_error.format(location_name, image_id)
-                )
+                raise exceptions.SoftLayerError(output_error.format(location_name, image_id))
 
-            locations_ids.append(matching_location.get('id'))
+            locations_ids.append(matching_location)
 
         return locations_ids

tests/managers/image_tests.py

@@ -219,7 +219,7 @@ def test_get_locations_id_fails(self):
         locations = ['test']
         self.assertRaises(
             exceptions.SoftLayerError,
-            self.image.get_locations_id_list,
+            self.image.get_locations_list,
             100,
             locations
         )