#2562 cli: list-hosts can display description/comment
Merged a year ago by tkopecek. Opened 2 years ago by tkopecek.
tkopecek/koji issue2553  into  master

file modified
+25 -3
@@ -2843,6 +2843,8 @@ 

      parser.add_option("--quiet", action="store_true", default=goptions.quiet,

                        help=_("Do not print header information"))

      parser.add_option("--show-channels", action="store_true", help=_("Show host's channels"))

+     parser.add_option("--comment", action="store_true", help=_("Show comments"))

+     parser.add_option("--description", action="store_true", help=_("Show descriptions"))

      (options, args) = parser.parse_args(args)

      opts = {}

      ensure_connection(session)
@@ -2866,6 +2868,16 @@ 

          else:

              return 'N'

  

+     def truncate(s):

+         if s:

+             s = s.replace('\n', ' ')

+             if len(s) > 47:

+                 return s[:47] + '...'

+             else:

+                 return s

+         else:

+             return ''

+ 

      # pull in the last update using multicall to speed it up a bit

      session.multicall = True

      for host in hosts:
@@ -2880,6 +2892,8 @@ 

          host['enabled'] = yesno(host['enabled'])

          host['ready'] = yesno(host['ready'])

          host['arches'] = ','.join(host['arches'].split())

+         host['description'] = truncate(host['description'])

+         host['comment'] = truncate(host['comment'])

  

      # pull hosts' channels

      if options.show_channels:
@@ -2894,13 +2908,21 @@ 

      else:

          longest_host = 8

      if not options.quiet:

-         hdr = "{hostname:<{longest_host}} Enb Rdy Load/Cap  Arches           Last Update".format(

-             longest_host=longest_host, hostname='Hostname')

+         hdr = "{hostname:<{longest_host}} Enb Rdy Load/Cap  Arches           Last Update         "

+         hdr = hdr.format(longest_host=longest_host, hostname='Hostname')

+         if options.description:

+             hdr += "Description".ljust(51)

+         if options.comment:

+             hdr += "Comment".ljust(51)

          if options.show_channels:

-             hdr += "         Channels"

+             hdr += "Channels"

          print(hdr)

      mask = "%%(name)-%ss %%(enabled)-3s %%(ready)-3s %%(task_load)4.1f/%%(capacity)-4.1f " \

             "%%(arches)-16s %%(update)-19s" % longest_host

+     if options.description:

+         mask += " %(description)-50s"

+     if options.comment:

+         mask += " %(comment)-50s"

      if options.show_channels:

          mask += " %(channels)s"

      for host in hosts:

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

2 years ago

pretty please pagure-ci rebuild

2 years ago

pretty please pagure-ci rebuild

2 years ago

Metadata Update from @jcupova:
- Pull-request tagged with: testing-done

2 years ago

Metadata Update from @mfilip:
- Pull-request untagged with: testing-ready

2 years ago

The testing ready tag was removed temporarily because of conflict with other PR.

Metadata Update from @mfilip:
- Pull-request tagged with: testing-ready

2 years ago

pretty please pagure-ci rebuild

a year ago

flake8 error:

./cli/koji_cli/commands.py:2911:100: E501 line too long (106 > 99 characters)
./cli/koji_cli/commands.py:2931:1: E302 expected 2 blank lines, found 1

otherwise, :thumbsup:

The testing ready tag was removed temporarily because of conflict with other PR.

Metadata Update from @mfilip:
- Pull-request untagged with: testing-ready

a year ago

rebased onto 4fa9d54

a year ago

Commit 2a191d4 fixes this pull-request

Pull-Request has been merged by tkopecek

a year ago

Metadata Update from @mfilip:
- Pull-request tagged with: testing-ready

a year ago