Merge branch 'issue1993' of github.com:caberos/softlayer-python into caberos-issue1993

Author: allmightyspiff

SoftLayer/CLI/image/list.py

@@ -14,19 +14,23 @@
 @click.option('--name', default=None, help='Filter on image name')
 @click.option('--public/--private', is_flag=True, default=None,
               help='Display only public or private images')
+@click.option('--limit', '-l',
+              help='How many results to get in one api call',
+              default=100,
+              show_default=True)
 @environment.pass_env
-def cli(env, name, public):
+def cli(env, name, public, limit):
     """List images."""
 
     image_mgr = SoftLayer.ImageManager(env.client)
 
     images = []
     if public in [False, None]:
-        for image in image_mgr.list_private_images(name=name, mask=image_mod.MASK):
+        for image in image_mgr.list_private_images(name=name, limit=limit, mask=image_mod.MASK):
             images.append(image)
 
     if public in [True, None]:
-        for image in image_mgr.list_public_images(name=name, mask=image_mod.MASK):
+        for image in image_mgr.list_public_images(name=name, limit=limit, mask=image_mod.MASK):
             images.append(image)
 
     table = formatting.Table(['Id', 'Name', 'Type', 'Visibility', 'Account', 'OS', 'Created', 'Notes'])

SoftLayer/managers/image.py

@@ -46,7 +46,7 @@ def delete_image(self, image_id):
         """
         self.vgbdtg.deleteObject(id=image_id)
 
-    def list_private_images(self, guid=None, name=None, **kwargs):
+    def list_private_images(self, guid=None, name=None, limit=100, **kwargs):
         """List all private images.
 
         :param string guid: filter based on GUID
@@ -68,7 +68,7 @@ def list_private_images(self, guid=None, name=None, **kwargs):
         kwargs['filter'] = _filter.to_dict()
 
         account = self.client['Account']
-        return account.getPrivateBlockDeviceTemplateGroups(**kwargs)
+        return self.client.iter_call('Virtual_Guest_Block_Device_Template_Group' , 'getPrivateBlockDeviceTemplateGroups', **kwargs, limit=limit)
 
     def list_public_images(self, guid=None, name=None, limit=100, **kwargs):
         """List all public images.
@@ -89,7 +89,7 @@ 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('Virtual_Guest_Block_Device_Template_Group', 'getPublicImages', **kwargs, limit=limit)
 
     def _get_ids_from_name_public(self, name):
         """Get public images which match the given name."""