@@ -19,16 +19,14 @@
 
 from cliff import lister
 
-from openstackclient.common import exceptions as exc
 from openstackclient.common import utils
 
 
 class ListExtension(lister.Lister):
     """List extension command"""
 
-    # TODO(mfisch): add support for volume and compute
-    # when the underlying APIs support it. Add support
-    # for network when it's added to openstackclient.
+    # TODO(mfisch): add support for volume and network
+    # when the underlying APIs support it.
 
     log = logging.getLogger(__name__ + '.ListExtension')
 
@@ -44,6 +42,11 @@ def get_parser(self, prog_name):
             action='store_true',
             default=False,
             help='List extensions for the Identity API')
+        parser.add_argument(
+            '--compute',
+            action='store_true',
+            default=False,
+            help='List extensions for the Compute API')
         return parser
 
     def take_action(self, parsed_args):
@@ -59,17 +62,24 @@ def take_action(self, parsed_args):
 
         # by default we want to show everything, unless the
         # user specifies one or more of the APIs to show
-        # for now, only identity is supported
-        show_all = (not parsed_args.identity)
+        # for now, only identity and compute are supported.
+        show_all = (not parsed_args.identity and not parsed_args.compute)
 
         if parsed_args.identity or show_all:
             identity_client = self.app.client_manager.identity
             try:
                 data += identity_client.extensions.list()
             except Exception:
-                raise exc.CommandError(
-                    "Extensions list not supported by"
-                    " identity API")
+                message = "Extensions list not supported by Identity API"
+                self.log.warning(message)
+
+        if parsed_args.compute or show_all:
+            compute_client = self.app.client_manager.compute
+            try:
+                data += compute_client.list_extensions.show_all()
+            except Exception:
+                message = "Extensions list not supported by Compute API"
+                self.log.warning(message)
 
         return (columns,
                 (utils.get_item_properties(
 
@@ -15,6 +15,9 @@
 
 import logging
 
+from novaclient import extension
+from novaclient.v1_1.contrib import list_extensions
+
 from openstackclient.common import utils
 
 LOG = logging.getLogger(__name__)
@@ -39,6 +42,7 @@ def make_client(instance):
     # Set client http_log_debug to True if verbosity level is high enough
     http_log_debug = utils.get_effective_log_level() <= logging.DEBUG
 
+    extensions = [extension.Extension('list_extensions', list_extensions)]
     client = compute_client(
         username=instance._username,
         api_key=instance._password,
@@ -49,8 +53,7 @@ def make_client(instance):
         region_name=instance._region_name,
         # FIXME(dhellmann): get endpoint_type from option?
         endpoint_type='publicURL',
-        # FIXME(dhellmann): add extension discovery
-        extensions=[],
+        extensions=extensions,
         service_type=API_NAME,
         # FIXME(dhellmann): what is service_name?
         service_name='',