mgr/cephadm: add sorted_dependencies function

Add `sorted_dependencies` a light wrapper around get_dependencies that
enforces the invariant of returning a sorted list of dependencies.
In the future we may want to simply replace get_dependencies if
there's no place we don't want sorted dependencies but this keeps
the changes to a minimum for now.

Signed-off-by: John Mulligan <jmulligan@redhat.com>

diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index abb4481d93a4383fa6a1c07b1104863ae2c853ce..d2ab1c4c2920fdd446c7e007ab961c4c35300313 100644 (file)
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -325,6 +325,18 @@ class CephadmService(metaclass=ABCMeta):
     ) -> List[str]:
         return []
 
+    @classmethod
+    def sorted_dependencies(
+        cls,
+        mgr: "CephadmOrchestrator",
+        spec: Optional[ServiceSpec] = None,
+        daemon_type: Optional[str] = None,
+    ) -> List[str]:
+        """A version of get_dependencies that guarantees that the returned
+        list is in sorted order.
+        """
+        return sorted(cls.get_dependencies(mgr, spec, daemon_type))
+
     def __init__(self, mgr: "CephadmOrchestrator"):
         self.mgr: "CephadmOrchestrator" = mgr