Merge branch 'master' into jayasilan-issue2007

Author: allmightyspiff

SoftLayer/managers/image.py

@@ -67,8 +67,8 @@ def list_private_images(self, guid=None, name=None, limit=100, **kwargs):
 
         kwargs['filter'] = _filter.to_dict()
 
-        account = self.client['Account']
-        return account.getPrivateBlockDeviceTemplateGroups(**kwargs, limit=limit)
+        return self.client.iter_call('SoftLayer_Account', 'getPrivateBlockDeviceTemplateGroups',
+                                     filter=kwargs['filter'], mask=kwargs['mask'], limit=limit)
 
     def list_public_images(self, guid=None, name=None, limit=100, **kwargs):
         """List all public images.
@@ -89,7 +89,8 @@ def list_public_images(self, guid=None, name=None, limit=100, **kwargs):
 
         kwargs['filter'] = _filter.to_dict()
 
-        return self.vgbdtg.getPublicImages(**kwargs, limit=limit)
+        return self.client.iter_call('SoftLayer_Virtual_Guest_Block_Device_Template_Group', 'getPublicImages',
+                                     filter=kwargs['filter'], mask=kwargs['mask'], limit=limit)
 
     def _get_ids_from_name_public(self, name):
         """Get public images which match the given name."""

tests/managers/image_tests.py

@@ -33,45 +33,41 @@ def test_delete_image(self):
         self.assert_called_with(IMAGE_SERVICE, 'deleteObject', identifier=100)
 
     def test_list_private_images(self):
-        results = self.image.list_private_images()
-
+        # Casting to list() to force the iter_call generator to run
+        results = list(self.image.list_private_images())
         self.assertEqual(len(results), 2)
-        self.assert_called_with('SoftLayer_Account',
-                                'getPrivateBlockDeviceTemplateGroups')
+        self.assert_called_with('SoftLayer_Account', 'getPrivateBlockDeviceTemplateGroups')
 
     def test_list_private_images_with_filters(self):
-        results = self.image.list_private_images(
-            guid='0FA9ECBD-CF7E-4A1F-1E36F8D27C2B', name='name')
+        # Casting to list() to force the iter_call generator to run
+        results = list(self.image.list_private_images(guid='0FA9ECBD-CF7E-4A1F-1E36F8D27C2B', name='name'))
 
-        self.assertEqual(len(results), 2)
         _filter = {
             'privateBlockDeviceTemplateGroups': {
                 'globalIdentifier': {
                     'operation': '_= 0FA9ECBD-CF7E-4A1F-1E36F8D27C2B'},
                 'name': {'operation': '_= name'}}
         }
-        self.assert_called_with('SoftLayer_Account',
-                                'getPrivateBlockDeviceTemplateGroups',
-                                filter=_filter)
+        self.assertEqual(len(results), 2)
+        self.assert_called_with('SoftLayer_Account', 'getPrivateBlockDeviceTemplateGroups', filter=_filter)
 
     def test_list_public_images(self):
-        results = self.image.list_public_images()
-
+        # Casting to list() to force the iter_call generator to run
+        results = list(self.image.list_public_images())
         self.assertEqual(len(results), 2)
         self.assert_called_with(IMAGE_SERVICE, 'getPublicImages')
 
     def test_list_public_images_with_filters(self):
-        results = self.image.list_public_images(
-            guid='0FA9ECBD-CF7E-4A1F-1E36F8D27C2B', name='name')
-
+        # Casting to list() to force the iter_call generator to run
+        results = list(self.image.list_public_images(guid='0FA9ECBD-CF7E-4A1F-1E36F8D27C2B', name='name'))
+        self.assertEqual(len(results), 2)
         _filter = {
             'globalIdentifier': {
                 'operation': '_= 0FA9ECBD-CF7E-4A1F-1E36F8D27C2B'},
             'name': {'operation': '_= name'}
         }
-        self.assertEqual(len(results), 2)
-        self.assert_called_with(IMAGE_SERVICE, 'getPublicImages',
-                                filter=_filter)
+
+        self.assert_called_with(IMAGE_SERVICE, 'getPublicImages', filter=_filter)
 
     def test_resolve_ids_guid(self):
         result = self.image.resolve_ids('3C1F3C68-0B67-4F5E-8907-D0FC84BF3F12')