2 files changed, 31 insertions, 0 deletions
diff --git a/openstackclient/common/commandmanager.py b/openstackclient/common/commandmanager.py
index 9901ea20..2d9575d9 100644
--- a/openstackclient/common/commandmanager.py
+++ b/openstackclient/common/commandmanager.py
@@ -16,6 +16,7 @@
 """Modify cliff.CommandManager"""
 
 import logging
+import pkg_resources
 
 import cliff.commandmanager
 
@@ -46,3 +47,17 @@ class CommandManager(cliff.commandmanager.CommandManager):
     def get_command_groups(self):
         """Returns a list of the loaded command groups"""
         return self.group_list
+
+    def get_command_names(self, group=None):
+        """Returns a list of commands loaded for the specified group"""
+        group_list = []
+        if group is not None:
+            for ep in pkg_resources.iter_entry_points(group):
+                cmd_name = (
+                    ep.name.replace('_', ' ')
+                    if self.convert_underscores
+                    else ep.name
+                )
+                group_list.append(cmd_name)
+            return group_list
+        return self.commands.keys()
diff --git a/openstackclient/common/module.py b/openstackclient/common/module.py
index 7f9c52db..356cdca3 100644
--- a/openstackclient/common/module.py
+++ b/openstackclient/common/module.py
@@ -19,9 +19,25 @@ import logging
 import six
 import sys
 
+from cliff import lister
 from cliff import show
 
 
+class ListCommand(lister.Lister):
+    """List recognized commands by group"""
+
+    auth_required = False
+    log = logging.getLogger(__name__ + '.ListCommand')
+
+    def take_action(self, parsed_args):
+        self.log.debug('take_action(%s)', parsed_args)
+        cm = self.app.command_manager
+        groups = cm.get_command_groups()
+
+        columns = ('Command Group', 'Commands')
+        return (columns, ((c, cm.get_command_names(group=c)) for c in groups))
+
+
 class ListModule(show.ShowOne):
     """List module versions"""