From 0797d683be0470148a43c521a6325d27e883b70b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 20 Jun 2023 14:35:02 +0200 Subject: [PATCH] node-proxy: move administration operations to /admin path This adds a new path /admin where all administrator operation are grouped. Signed-off-by: Guillaume Abrioux (cherry picked from commit 2995c6a277159735002686d48484df7d6ae25ac0) --- src/cephadm/node-proxy/server.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/cephadm/node-proxy/server.py b/src/cephadm/node-proxy/server.py index 21a3c29b165..d05dbebd9c6 100644 --- a/src/cephadm/node-proxy/server.py +++ b/src/cephadm/node-proxy/server.py @@ -170,6 +170,18 @@ class Flush: self.backend.flush() return 'node-proxy data flushed' + +class Admin: + exposed = False + + def __init__(self, backend: BaseSystem, config: Config, reporter: Reporter) -> None: + self.reload = ConfigReload(config) + self.flush = Flush(backend) + self.shutdown = Shutdown(backend, reporter) + self.start = Start(backend, reporter) + self.stop = Stop(backend, reporter) + + class API: exposed = True @@ -179,13 +191,10 @@ class API: config: Config) -> None: self.system = System(backend) - self.shutdown = Shutdown(backend, reporter) - self.start = Start(backend, reporter) - self.stop = Stop(backend, reporter) - self.config_reload = ConfigReload(config) + self.admin = Admin(backend, config, reporter) def GET(self) -> str: - return 'use /system' + return 'use /system or /admin endpoints' def main() -> None: -- 2.39.5