Cargo.toml: pathpatterns, pxar, proxmox-fuse

[proxmox-backup.git] / src / api2.rs

diff --git a/src/api2.rs b/src/api2.rs
index c44fa6168916a4acb974412fc707b68a5225962c..abcba8e3e967d65bb59811dbc8d77ae866645c63 100644 (file)
--- a/src/api2.rs
+++ b/src/api2.rs
@@ -1,30 +1,32 @@
-pub mod types;
-pub mod config;
+pub mod access;
 pub mod admin;
 pub mod backup;
-pub mod reader;
+pub mod config;
 pub mod node;
-pub mod version;
+pub mod reader;
 mod subscription;
-mod access;
-
-use crate::api_schema::router::*;
+pub mod types;
+pub mod version;
+pub mod pull;
 
-pub fn router() -> Router {
+use proxmox::api::router::SubdirMap;
+use proxmox::api::Router;
+use proxmox::list_subdirs_api_method;
 
-    let nodes = Router::new()
-        .match_all("node", node::router());
+const NODES_ROUTER: Router = Router::new().match_all("node", &node::ROUTER);
 
-    let route = Router::new()
-        .subdir("access", access::router())
-        .subdir("admin", admin::router())
-        .subdir("backup", backup::router())
-        .subdir("reader", reader::router())
-        .subdir("config", config::router())
-        .subdir("nodes", nodes)
-        .subdir("subscription", subscription::router())
-        .subdir("version", version::router())
-        .list_subdirs();
+pub const SUBDIRS: SubdirMap = &[
+    ("access", &access::ROUTER),
+    ("admin", &admin::ROUTER),
+    ("backup", &backup::ROUTER),
+    ("config", &config::ROUTER),
+    ("nodes", &NODES_ROUTER),
+    ("pull", &pull::ROUTER),
+    ("reader", &reader::ROUTER),
+    ("subscription", &subscription::ROUTER),
+    ("version", &version::ROUTER),
+];
 
-    route
-}
+pub const ROUTER: Router = Router::new()
+    .get(&list_subdirs_api_method!(SUBDIRS))
+    .subdirs(SUBDIRS);