scenario polish

src/azure/cli/_argparse.py

@@ -352,10 +352,13 @@ def _display_usage(self, noun_map, out=sys.stdout):
 
         if isinstance(doc, GroupHelpFile):
             for child in doc.children:
-                args = delimiters.split('.')
+                args = delimiters.split('.') if delimiters != 'azure-cli' else []
                 args.append(child.name)
+                child.command = ' '.join(args)
+                child.delimiters = '.'.join(args)
                 it = self._get_args_itr(args)
                 m, _ = self._get_noun_map(args, it, out)
+
                 child.load(m)
 
         print_detailed_help(doc, out)
@@ -371,6 +374,12 @@ def _display_completions(self, noun_map, arguments, out=sys.stdout):
     def _display_children(self, noun_map, arguments, out=sys.stdout):
         nouns = self._get_noun_matches(arguments, noun_map, out)
 
+        group_help = HelpFile(noun_map['$full_name'])
+        group_help.load(noun_map)
+        print(L('Group'), file=out)
+        print_description_list([group_help], out)
+        print(L('\nSub-Commands'), file=out)
+
         help_files = []
         for noun in sorted(nouns):
             args = '{0} {1}'.format(' '.join(arguments), noun).split(' ') \

src/azure/cli/_help.py

@@ -95,9 +95,8 @@ def _print_header(help_file):
 
     indent = 1
     if help_file.long_summary:
-        _print_indent('{0}'.format(help_file.long_summary), indent)
-    else:
-        _print_indent('')
+        _print_indent('{0}'.format(help_file.long_summary.rstrip()), indent)
+    _print_indent('')
 
 def _print_groups(help_file):
     indent = 1

src/azure/cli/tests/test_help.py

@@ -310,7 +310,7 @@ def fn(a, b):
         io = StringIO()
         cmd_result = p.execute('group1'.split(), out=io)
         self.assertIsNone(cmd_result.result)
-        s = '    group2\n    group3\n'
+        s = 'Group\n    group1\n\nSub-Commands\n    group2\n    group3\n'
         self.assertEqual(s, io.getvalue())
         io.close()