Merge lp:~rackspace-titan/glance/glance-cli-filters into lp:~hudson-openstack/glance/trunk

[Jay Pipes]

Add filter support to bin/glance index and details calls

[Ed Leafe (ed-leafe)]

Is there any reason that 'SUPPORTED_FILTERS' (line 16) is all caps? Usually that style is only for constants that are defined in one place and used in another.

[Brian Waldon (bcwaldon)]

> Is there any reason that 'SUPPORTED_FILTERS' (line 16) is all caps? Usually
> that style is only for constants that are defined in one place and used in
> another.

As far as I can tell, it isn't modified. It matches capitalization in other sections of the code, as well. Would you prefer I change it?

[Jay Pipes (jaypipes)]

On Mon, Jun 20, 2011 at 5:42 PM, Brian Waldon
<email address hidden> wrote:
>> Is there any reason that 'SUPPORTED_FILTERS' (line 16) is all caps? Usually
>> that style is only for constants that are defined in one place and used in
>> another.
>
> As far as I can tell, it isn't modified. It matches capitalization in other sections of the code, as well. Would you prefer I change it?

No, please leave it. It's a constant. :)

-jay

[Brian Waldon (bcwaldon)]

Setting to WIP until I get the results ordering stuff in here.

[Brian Waldon (bcwaldon)]

I finally took the time to figure out what was up. This branch is ready to go in once lp:~rackspace-titan/glance/registry-marker-lp819551 merges.

[Jay Pipes (jaypipes)]

I love this. Can't wait to see it go in...

review: Approve

[Jason Kölker (jason-koelker)]

Is bueno.

I like that it now returns nothing instead of 'No images found', my scripts thank you. One day I'll get around to changing that to a non-zero status code, will make scripting easier.

review: Approve

[Jay Pipes (jaypipes)]

No images found should still return 0, though. :) It's a perfectly successful result.

[OpenStack Infra (hudson-openstack)]

Attempt to merge into lp:glance failed due to conflicts:

text conflict in bin/glance

[Jason Kölker (jason-koelker)]

> No images found should still return 0, though. :) It's a perfectly successful
> result.

Yea that makes sense since its successfully contacting the server and all. [ '' ] will do just fine for scripting ;)

[Brian Waldon (bcwaldon)]

Resolved merge conflicts. Ready to go again.

=== modified file 'bin/glance'
--- bin/glance	2011-07-30 03:26:00 +0000
+++ bin/glance	2011-08-02 21:12:37 +0000
@@ -95,6 +95,25 @@
     return fields
 
 
+def get_image_filters_from_args(args):
+    """Build a dictionary of query filters based on the supplied args."""
+    try:
+        fields = get_image_fields_from_args(args)
+    except RuntimeError, e:
+        print e
+        return FAILURE
+
+    SUPPORTED_FILTERS = ['name', 'disk_format', 'container_format', 'status',
+                         'size_min', 'size_max']
+    filters = {}
+    for (key, value) in fields.items():
+        if key not in SUPPORTED_FILTERS:
+            key = 'property-%s' % (key,)
+        filters[key] = value
+
+    return filters
+
+
 def print_image_formatted(client, image):
     """
     Formatted print of image metadata.
@@ -395,69 +414,132 @@
         return FAILURE
 
 
+def _images_index(client, filters, limit, print_header=False, **kwargs):
+    """Driver function for images_index"""
+    parameters = {
+        "filters": filters,
+        "limit": limit,
+    }
+
+    optional_kwargs = ['marker', 'sort_key', 'sort_dir']
+    for kwarg in optional_kwargs:
+        if kwarg in kwargs:
+            parameters[kwarg] = kwargs[kwarg]
+
+    images = client.get_images(**parameters)
+
+    if not images:
+        return SUCCESS
+
+    pretty_table = utils.PrettyTable()
+    pretty_table.add_column(16, label="ID")
+    pretty_table.add_column(30, label="Name")
+    pretty_table.add_column(20, label="Disk Format")
+    pretty_table.add_column(20, label="Container Format")
+    pretty_table.add_column(14, label="Size", just="r")
+
+    if print_header:
+        print pretty_table.make_header()
+
+    for image in images:
+        print pretty_table.make_row(image['id'],
+                                    image['name'],
+                                    image['disk_format'],
+                                    image['container_format'],
+                                    image['size'])
+
+    if not options.force and len(images) == limit and \
+       not user_confirm("Fetch next page?", True):
+        return SUCCESS
+
+    parameters['marker'] = images[-1]['id']
+    return _images_index(client, **parameters)
+
+
 @catch_error('show index')
 def images_index(options, args):
     """
-%(prog)s index [options]
+%(prog)s index [options] <field1=value1 field2=value2 ...>
 
 Returns basic information for all public images
-a Glance server knows about"""
+a Glance server knows about. Provided fields are
+handled as query filters. Supported filters
+include 'name', 'disk_format', 'container_format',
+'status', 'size_min', and 'size_max.' Any extra
+fields are treated as image metadata properties"""
     client = get_client(options)
-    images = client.get_images()
-    if not images:
-        print "No public images found."
+    filters = get_image_filters_from_args(args)
+    limit = options.limit
+    marker = options.marker
+    sort_key = options.sort_key
+    sort_dir = options.sort_dir
+
+    return _images_index(client,
+                         filters,
+                         limit,
+                         marker=marker,
+                         sort_key=sort_key,
+                         sort_dir=sort_dir,
+                         print_header=True)
+
+
+def _images_details(client, filters, limit, print_header=False, **kwargs):
+    """Driver function for images_details"""
+    parameters = {
+        "filters": filters,
+        "limit": limit,
+    }
+
+    optional_kwargs = ['marker', 'sort_key', 'sort_dir']
+    for kwarg in optional_kwargs:
+        if kwarg in kwargs:
+            parameters[kwarg] = kwargs[kwarg]
+
+    images = client.get_images_detailed(**parameters)
+
+    if len(images) == 0:
         return SUCCESS
 
-    print "Found %d public images..." % len(images)
-
-    pretty_table = utils.PrettyTable()
-    pretty_table.add_column(16, label="ID")
-    pretty_table.add_column(30, label="Name")
-    pretty_table.add_column(20, label="Disk Format")
-    pretty_table.add_column(20, label="Container Format")
-    pretty_table.add_column(14, label="Size", just="r")
-
-    print pretty_table.make_header()
+    if print_header:
+        print "=" * 80
 
     for image in images:
-        print pretty_table.make_row(
-            image['id'],
-            image['name'],
-            image['disk_format'],
-            image['container_format'],
-            image['size'])
-
-
-def images_detailed(options, args):
+        print_image_formatted(client, image)
+        print "=" * 80
+
+    if not options.force and len(images) == limit and \
+       not user_confirm("Fetch next page?", True):
+        return SUCCESS
+
+    parameters["marker"] = images[-1]['id']
+    return _images_details(client, **parameters)
+
+
+@catch_error('show details')
+def images_details(options, args):
     """
 %(prog)s details [options]
 
 Returns detailed information for all public images
-a Glance server knows about"""
-    c = get_client(options)
-    try:
-        images = c.get_images_detailed()
-        if len(images) == 0:
-            print "No public images found."
-            return SUCCESS
-
-        num_images = len(images)
-        print "Found %d public images..." % num_images
-        cur_image = 1
-        for image in images:
-            print "=" * 80
-            print_image_formatted(c, image)
-            if cur_image == num_images:
-                print "=" * 80
-            cur_image += 1
-
-        return SUCCESS
-    except Exception, e:
-        print "Failed to show details. Got error:"
-        pieces = unicode(e).split('\n')
-        for piece in pieces:
-            print piece
-        return FAILURE
+a Glance server knows about. Provided fields are
+handled as query filters. Supported filters
+include 'name', 'disk_format', 'container_format',
+'status', 'size_min', and 'size_max.' Any extra
+fields are treated as image metadata properties"""
+    client = get_client(options)
+    filters = get_image_filters_from_args(args)
+    limit = options.limit
+    marker = options.marker
+    sort_key = options.sort_key
+    sort_dir = options.sort_dir
+
+    return _images_details(client,
+                           filters,
+                           limit,
+                           marker=marker,
+                           sort_key=sort_key,
+                           sort_dir=sort_dir,
+                           print_header=True)
 
 
 def images_clear(options, args):
@@ -755,6 +837,16 @@
                       type=int, default=9292,
                       help="Port the Glance API host listens on. "
                            "Default: %default")
+    parser.add_option('--limit', dest="limit", metavar="LIMIT", default=10,
+                      type="int", help="Page size to use while "
+                                       "requesting image metadata")
+    parser.add_option('--marker', dest="marker", metavar="MARKER",
+                      default=None, help="Image index after which to "
+                                         "begin pagination")
+    parser.add_option('--sort_key', dest="sort_key", metavar="KEY",
+                      help="Sort results by this image attribute.")
+    parser.add_option('--sort_dir', dest="sort_dir", metavar="[desc|asc]",
+                      help="Sort results in this direction.")
     parser.add_option('-f', '--force', dest="force", metavar="FORCE",
                       default=False, action="store_true",
                       help="Prevent select actions from requesting "
@@ -814,7 +906,7 @@
                 'update': image_update,
                 'delete': image_delete,
                 'index': images_index,
-                'details': images_detailed,
+                'details': images_details,
                 'show': image_show,
                 'clear': images_clear}
 

=== modified file 'doc/source/glance.rst'
--- doc/source/glance.rst	2011-04-22 18:54:24 +0000
+++ doc/source/glance.rst	2011-08-02 21:12:37 +0000
@@ -96,6 +96,13 @@
     -H ADDRESS, --host=ADDRESS
                           Address of Glance API host. Default: example.com
     -p PORT, --port=PORT  Port the Glance API host listens on. Default: 9292
+    --limit=LIMIT         Page size to use while requesting image metadata
+    --marker=MARKER       Image index after which to begin pagination
+    --sort_key=KEY        Sort results by this image attribute.
+    --sort_dir=[desc|asc]
+                          Sort results in this direction.
+    -f, --force           Prevent select actions from requesting user
+                          confirmation
     --dry-run             Don't actually execute the command, just print output
                           showing what WOULD happen.
 
@@ -301,7 +308,6 @@
 available in Glance, as shown below::
 
   $> glance index --host=65.114.169.29
-  Found 4 public images...
   ID               Name                           Disk Format          Container Format     Size          
   ---------------- ------------------------------ -------------------- -------------------- --------------
   1                Ubuntu 10.10                   vhd                  ovf                        58520278
@@ -309,6 +315,25 @@
   3                Fedora 9                       vdi                  bare                           3040
   4                Vanilla Linux 2.6.22           qcow2                bare                              0
 
+Image metadata such as 'name', 'disk_format', 'container_format' and 'status'
+may be used to filter the results of an index or details command. These
+commands also accept 'size_min' and 'size_max' as lower and upper bounds
+of the image metadata 'size.' Any unrecognized fields are handled as
+custom image properties.
+
+The 'limit' and 'marker' options are used by the index and details commands
+to  control pagination. The 'marker' indicates the last record that was seen
+by the user. The page of results returned will begin after the provided image
+ID. The 'limit' param indicates the page size. Each request to the api will be 
+restricted to returning a maximum number of results. Without the 'force'
+option, the user will be prompted before each page of results is fetched 
+from the API.
+
+Results from index and details commands may be ordered using the 'sort_key'
+and 'sort_dir' options. Any image attribute may be used for 'sort_key',
+while  only 'asc' or 'desc' are allowed for 'sort_dir'.
+
+
 The ``details`` command
 -----------------------
 
@@ -316,7 +341,6 @@
 available in Glance, as shown below::
 
   $> glance details --host=65.114.169.29
-  Found 4 public images...
   ================================================================================
   URI: http://example.com/images/1
   Id: 1

=== modified file 'tests/functional/test_bin_glance.py'
--- tests/functional/test_bin_glance.py	2011-06-28 14:37:31 +0000
+++ tests/functional/test_bin_glance.py	2011-08-02 21:12:37 +0000
@@ -52,7 +52,7 @@
         exitcode, out, err = execute(cmd)
 
         self.assertEqual(0, exitcode)
-        self.assertEqual('No public images found.', out.strip())
+        self.assertEqual('', out.strip())
 
         # 1. Add public image
         cmd = "bin/glance --port=%d add is_public=True name=MyImage" % api_port
@@ -68,11 +68,9 @@
         exitcode, out, err = execute(cmd)
 
         self.assertEqual(0, exitcode)
-        lines = out.split("\n")
-        first_line = lines[0]
-        image_data_line = lines[3]
-        self.assertEqual('Found 1 public images...', first_line)
-        self.assertTrue('MyImage' in image_data_line)
+        lines = out.split("\n")[2:-1]
+        self.assertEqual(1, len(lines))
+        self.assertTrue('MyImage' in lines[0])
 
         # 3. Delete the image
         cmd = "bin/glance --port=%d --force delete 1" % api_port
@@ -88,7 +86,7 @@
         exitcode, out, err = execute(cmd)
 
         self.assertEqual(0, exitcode)
-        self.assertEqual('No public images found.', out.strip())
+        self.assertEqual('', out.strip())
 
         self.stop_servers()
 
@@ -117,7 +115,7 @@
         exitcode, out, err = execute(cmd)
 
         self.assertEqual(0, exitcode)
-        self.assertEqual('No public images found.', out.strip())
+        self.assertEqual('', out.strip())
 
         # 1. Add public image
         cmd = "bin/glance --port=%d add name=MyImage" % api_port
@@ -133,7 +131,7 @@
         exitcode, out, err = execute(cmd)
 
         self.assertEqual(0, exitcode)
-        self.assertEqual('No public images found.', out.strip())
+        self.assertEqual('', out.strip())
 
         # 3. Update the image to make it public
         cmd = "bin/glance --port=%d update 1 is_public=True" % api_port
@@ -149,12 +147,9 @@
         exitcode, out, err = execute(cmd)
 
         self.assertEqual(0, exitcode)
-        lines = out.split("\n")
-        first_line = lines[0]
-        self.assertEqual('Found 1 public images...', first_line)
-
-        image_data_line = lines[3]
-        self.assertTrue('MyImage' in image_data_line)
+        lines = out.split("\n")[2:-1]
+        self.assertEqual(len(lines), 1)
+        self.assertTrue('MyImage' in lines[0])
 
         # 5. Update the image's Name attribute
         updated_image_name = "Updated image name"
@@ -206,7 +201,7 @@
         exitcode, out, err = execute(cmd)
 
         self.assertEqual(0, exitcode)
-        self.assertEqual('No public images found.', out.strip())
+        self.assertEqual('', out.strip())
 
         # 1. Attempt to add an image
         with tempfile.NamedTemporaryFile() as image_file:
@@ -228,7 +223,7 @@
         exitcode, out, err = execute(cmd)
 
         self.assertEqual(0, exitcode)
-        self.assertEqual('No public images found.', out.strip())
+        self.assertEqual('', out.strip())
 
         # 3. Verify image status in show is 'killed'
         cmd = "bin/glance --port=%d show 1" % api_port
@@ -278,7 +273,7 @@
         self.assertEqual(0, exitcode)
         lines = out.split("\n")
         first_line = lines[0]
-        self.assertEqual('No public images found.', first_line)
+        self.assertEqual('', first_line)
 
         # 4. Lastly we manually verify with SQL that image properties are
         # also getting marked as deleted.
@@ -288,3 +283,257 @@
             self.assertEqual(0, rec[0])
 
         self.stop_servers()
+
+    def test_results_filtering(self):
+        self.cleanup()
+        self.start_servers()
+
+        api_port = self.api_port
+        registry_port = self.registry_port
+
+        # 1. Add some images
+        _add_cmd = "bin/glance --port=%d add is_public=True" % api_port
+        _add_args = [
+            "name=Name1 disk_format=vhd container_format=ovf foo=bar",
+            "name=Name2 disk_format=ami container_format=ami foo=bar",
+            "name=Name3 disk_format=vhd container_format=ovf foo=baz",
+        ]
+
+        for i, args in enumerate(_add_args):
+            cmd = "%s %s" % (_add_cmd, args)
+            exitcode, out, err = execute(cmd)
+            self.assertEqual(0, exitcode)
+            expected_out = 'Added new image with ID: %d' % (i + 1,)
+            self.assertEqual(expected_out, out.strip())
+
+        _base_cmd = "bin/glance --port=%d" % api_port
+        _index_cmd = "%s index -f" % (_base_cmd,)
+
+        # 2. Check name filter
+        cmd = "name=Name2"
+        exitcode, out, err = execute("%s %s" % (_index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(1, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('2'))
+
+        # 3. Check disk_format filter
+        cmd = "disk_format=vhd"
+        exitcode, out, err = execute("%s %s" % (_index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(2, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('3'))
+        self.assertTrue(image_lines[1].startswith('1'))
+
+        # 4. Check container_format filter
+        cmd = "container_format=ami"
+        exitcode, out, err = execute("%s %s" % (_index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(1, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('2'))
+
+        # 5. Check container_format filter
+        cmd = "container_format=ami"
+        exitcode, out, err = execute("%s %s" % (_index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(1, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('2'))
+
+        # 6. Check status filter
+        cmd = "status=killed"
+        exitcode, out, err = execute("%s %s" % (_index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(0, len(image_lines))
+
+        # 7. Check property filter
+        cmd = "foo=bar"
+        exitcode, out, err = execute("%s %s" % (_index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(2, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('2'))
+        self.assertTrue(image_lines[1].startswith('1'))
+
+        # 8. Check multiple filters
+        cmd = "name=Name2 foo=bar"
+        exitcode, out, err = execute("%s %s" % (_index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(1, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('2'))
+
+        # 9. Ensure details call also respects filters
+        _details_cmd = "%s details" % (_base_cmd,)
+        cmd = "foo=bar"
+        exitcode, out, err = execute("%s %s" % (_details_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[1:-1]
+        self.assertEqual(22, len(image_lines))
+        self.assertTrue(image_lines[1].startswith('Id: 2'))
+        self.assertTrue(image_lines[12].startswith('Id: 1'))
+
+        self.stop_servers()
+
+    def test_results_pagination(self):
+        self.cleanup()
+        self.start_servers()
+
+        _base_cmd = "bin/glance --port=%d" % self.api_port
+        index_cmd = "%s index -f" % _base_cmd
+        details_cmd = "%s details -f" % _base_cmd
+
+        # 1. Add some images
+        _add_cmd = "bin/glance --port=%d add is_public=True" % self.api_port
+        _add_args = [
+            "name=Name1 disk_format=ami container_format=ami",
+            "name=Name2 disk_format=vhd container_format=ovf",
+            "name=Name3 disk_format=ami container_format=ami",
+            "name=Name4 disk_format=ami container_format=ami",
+            "name=Name5 disk_format=vhd container_format=ovf",
+        ]
+
+        for i, args in enumerate(_add_args):
+            cmd = "%s %s" % (_add_cmd, args)
+            exitcode, out, err = execute(cmd)
+            self.assertEqual(0, exitcode)
+            expected_out = 'Added new image with ID: %d' % (i + 1,)
+            self.assertEqual(expected_out, out.strip())
+
+        # 2. Limit less than total
+        cmd = "--limit=3"
+        exitcode, out, err = execute("%s %s" % (index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(5, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('5'))
+        self.assertTrue(image_lines[1].startswith('4'))
+        self.assertTrue(image_lines[2].startswith('3'))
+        self.assertTrue(image_lines[3].startswith('2'))
+        self.assertTrue(image_lines[4].startswith('1'))
+
+        # 3. With a marker
+        cmd = "--marker=4"
+        exitcode, out, err = execute("%s %s" % (index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(3, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('3'))
+        self.assertTrue(image_lines[1].startswith('2'))
+        self.assertTrue(image_lines[2].startswith('1'))
+
+        # 3. With a marker and limit
+        cmd = "--marker=3 --limit=1"
+        exitcode, out, err = execute("%s %s" % (index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(2, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('2'))
+        self.assertTrue(image_lines[1].startswith('1'))
+
+        # 4. Pagination params with filtered results
+        cmd = "--marker=4 --limit=1 container_format=ami"
+        exitcode, out, err = execute("%s %s" % (index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(2, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('3'))
+        self.assertTrue(image_lines[1].startswith('1'))
+
+        # 5. Pagination params with filtered results in a details call
+        cmd = "--marker=4 --limit=1 container_format=ami"
+        exitcode, out, err = execute("%s %s" % (details_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[1:-1]
+        self.assertEqual(20, len(image_lines))
+        self.assertTrue(image_lines[1].startswith('Id: 3'))
+        self.assertTrue(image_lines[11].startswith('Id: 1'))
+
+    def test_results_sorting(self):
+        self.cleanup()
+        self.start_servers()
+
+        _base_cmd = "bin/glance --port=%d" % self.api_port
+        index_cmd = "%s index -f" % _base_cmd
+        details_cmd = "%s details -f" % _base_cmd
+
+        # 1. Add some images
+        _add_cmd = "bin/glance --port=%d add is_public=True" % self.api_port
+        _add_args = [
+            "name=Name1 disk_format=ami container_format=ami",
+            "name=Name4 disk_format=vhd container_format=ovf",
+            "name=Name3 disk_format=ami container_format=ami",
+            "name=Name2 disk_format=ami container_format=ami",
+            "name=Name5 disk_format=vhd container_format=ovf",
+        ]
+
+        for i, args in enumerate(_add_args):
+            cmd = "%s %s" % (_add_cmd, args)
+            exitcode, out, err = execute(cmd)
+            self.assertEqual(0, exitcode)
+            expected_out = 'Added new image with ID: %d' % (i + 1,)
+            self.assertEqual(expected_out, out.strip())
+
+        # 2. Sort by name asc
+        cmd = "--sort_key=name --sort_dir=asc"
+        exitcode, out, err = execute("%s %s" % (index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(5, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('1'))
+        self.assertTrue(image_lines[1].startswith('4'))
+        self.assertTrue(image_lines[2].startswith('3'))
+        self.assertTrue(image_lines[3].startswith('2'))
+        self.assertTrue(image_lines[4].startswith('5'))
+
+        # 3. Sort by name asc with a marker
+        cmd = "--sort_key=name --sort_dir=asc --marker=4"
+        exitcode, out, err = execute("%s %s" % (index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(3, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('3'))
+        self.assertTrue(image_lines[1].startswith('2'))
+        self.assertTrue(image_lines[2].startswith('5'))
+
+        # 4. Sort by container_format desc
+        cmd = "--sort_key=container_format --sort_dir=desc"
+        exitcode, out, err = execute("%s %s" % (index_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[2:-1]
+        self.assertEqual(5, len(image_lines))
+        self.assertTrue(image_lines[0].startswith('5'))
+        self.assertTrue(image_lines[1].startswith('2'))
+        self.assertTrue(image_lines[2].startswith('4'))
+        self.assertTrue(image_lines[3].startswith('3'))
+        self.assertTrue(image_lines[4].startswith('1'))
+
+        # 5. Sort by name asc with a marker (details)
+        cmd = "--sort_key=name --sort_dir=asc --marker=4"
+        exitcode, out, err = execute("%s %s" % (details_cmd, cmd))
+
+        self.assertEqual(0, exitcode)
+        image_lines = out.split("\n")[1:-1]
+        self.assertEqual(30, len(image_lines))
+        self.assertTrue(image_lines[1].startswith('Id: 3'))
+        self.assertTrue(image_lines[11].startswith('Id: 2'))
+        self.assertTrue(image_lines[21].startswith('Id: 5'))