Skip to content

Commit 151b8d7

Browse files
committed
fix(sorters) fix docker node 1to1 sorter
Change-Id: Id8dd3de8625b4727aa7a4a523af224d712b68483
1 parent 6203c3c commit 151b8d7

1 file changed

Lines changed: 21 additions & 5 deletions

File tree

cmk/gui/views/sorter/sorters.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
from typing import Any, Literal
1010

1111
from cmk.gui import utils
12-
from cmk.gui.config import active_config
12+
from cmk.gui.config import active_config, Config
13+
from cmk.gui.http import Request
1314
from cmk.gui.i18n import _
1415
from cmk.gui.painter.v0.helpers import get_tag_groups
1516
from cmk.gui.painter.v0.painters import _get_docker_container_status_outputs
@@ -148,7 +149,7 @@ def register_sorters(registry: SorterRegistry) -> None:
148149
declare_1to1_sorter("host_group_memberlist", cmp_string_list)
149150
declare_1to1_sorter("host_contacts", cmp_string_list)
150151
declare_1to1_sorter("host_contact_groups", cmp_string_list)
151-
declare_1to1_sorter("host_docker_node", cmp_num_split)
152+
declare_1to1_sorter("host_docker_node", cmp_docker_nodes)
152153

153154
# Host group
154155
declare_1to1_sorter("hg_num_services", cmp_simple_number)
@@ -717,6 +718,23 @@ def _get_docker_nodes(row: Row) -> str:
717718
return output.split()[-1]
718719

719720

721+
def cmp_docker_nodes(column, r1, r2):
722+
return _sort_docker_nodes_(r1, r2, parameters=None, config=None, request=None)
723+
724+
725+
def _sort_docker_nodes_(
726+
r1: Row,
727+
r2: Row,
728+
*,
729+
parameters: Mapping[str, Any] | None,
730+
config: Config | None,
731+
request: Request | None,
732+
) -> int:
733+
val1 = _get_docker_nodes(row=r1)
734+
val2 = _get_docker_nodes(row=r2)
735+
return cmp_insensitive_string(val1, val2)
736+
737+
720738
class SorterHostDockerNode(Sorter):
721739
@property
722740
def ident(self) -> str:
@@ -731,6 +749,4 @@ def columns(self) -> Sequence[ColumnName]:
731749
return ["host_labels", "host_label_sources"]
732750

733751
def cmp(self, r1: Row, r2: Row, parameters: Mapping[str, Any] | None) -> int:
734-
val1 = _get_docker_nodes(row=r1)
735-
val2 = _get_docker_nodes(row=r2)
736-
return cmp_insensitive_string(val1, val2)
752+
return _sort_docker_nodes_(r1, r2, parameters=parameters, config=None, request=None)

0 commit comments

Comments
 (0)