From 7773ccc11f2b41a02d7a4b85fb2d14205781c0ea Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 5 Jun 2019 07:23:21 +0200
Subject: [PATCH] src/api2.rs: move backup api to /backup

---
 src/api2.rs                                           | 2 ++
 src/api2/admin/datastore.rs                           | 5 -----
 src/api2/{admin/datastore => }/backup.rs              | 4 ++++
 src/api2/{admin/datastore => }/backup/environment.rs  | 0
 src/api2/{admin/datastore => }/backup/service.rs      | 0
 src/api2/{admin/datastore => }/backup/upload_chunk.rs | 0
 src/bin/dump-backup-api.rs                            | 2 +-
 src/client/http_client.rs                             | 5 ++---
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename src/api2/{admin/datastore => }/backup.rs (99%)
 rename src/api2/{admin/datastore => }/backup/environment.rs (100%)
 rename src/api2/{admin/datastore => }/backup/service.rs (100%)
 rename src/api2/{admin/datastore => }/backup/upload_chunk.rs (100%)

diff --git a/src/api2.rs b/src/api2.rs
index 36d421cb..023bd867 100644
--- a/src/api2.rs
+++ b/src/api2.rs
@@ -1,6 +1,7 @@
 pub mod types;
 pub mod config;
 pub mod admin;
+pub mod backup;
 pub mod node;
 mod version;
 mod subscription;
@@ -16,6 +17,7 @@ pub fn router() -> Router {
     let route = Router::new()
         .subdir("access", access::router())
         .subdir("admin", admin::router())
+        .subdir("backup", backup::router())
         .subdir("config", config::router())
         .subdir("nodes", nodes)
         .subdir("subscription", subscription::router())
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index f55b1974..7f97c08f 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -20,7 +20,6 @@ use crate::server::WorkerTask;
 
 mod pxar;
 mod upload;
-pub mod backup;
 
 fn group_backups(backup_list: Vec<BackupInfo>) -> HashMap<String, Vec<BackupInfo>> {
 
@@ -393,10 +392,6 @@ pub fn router() -> Router {
             "test-upload",
             Router::new()
                 .upgrade(upload::api_method_upgrade_upload()))
-        .subdir(
-            "backup",
-            Router::new()
-                .upgrade(backup::api_method_upgrade_backup()))
         .subdir(
             "gc",
             Router::new()
diff --git a/src/api2/admin/datastore/backup.rs b/src/api2/backup.rs
similarity index 99%
rename from src/api2/admin/datastore/backup.rs
rename to src/api2/backup.rs
index a9380457..3641a2e6 100644
--- a/src/api2/admin/datastore/backup.rs
+++ b/src/api2/backup.rs
@@ -26,6 +26,10 @@ use service::*;
 mod upload_chunk;
 use upload_chunk::*;
 
+pub fn router() -> Router {
+    Router::new()
+        .upgrade(api_method_upgrade_backup())
+}
 
 pub fn api_method_upgrade_backup() -> ApiAsyncMethod {
     ApiAsyncMethod::new(
diff --git a/src/api2/admin/datastore/backup/environment.rs b/src/api2/backup/environment.rs
similarity index 100%
rename from src/api2/admin/datastore/backup/environment.rs
rename to src/api2/backup/environment.rs
diff --git a/src/api2/admin/datastore/backup/service.rs b/src/api2/backup/service.rs
similarity index 100%
rename from src/api2/admin/datastore/backup/service.rs
rename to src/api2/backup/service.rs
diff --git a/src/api2/admin/datastore/backup/upload_chunk.rs b/src/api2/backup/upload_chunk.rs
similarity index 100%
rename from src/api2/admin/datastore/backup/upload_chunk.rs
rename to src/api2/backup/upload_chunk.rs
diff --git a/src/bin/dump-backup-api.rs b/src/bin/dump-backup-api.rs
index b474f14a..b8aebdca 100644
--- a/src/bin/dump-backup-api.rs
+++ b/src/bin/dump-backup-api.rs
@@ -5,7 +5,7 @@ use proxmox_backup::api_schema::format::*;
 
 fn main() -> Result<(), Error> {
 
-    let api = api2::admin::datastore::backup::backup_api();
+    let api = api2::backup::backup_api();
 
     dump_api(&mut std::io::stdout(), &api, ".", 0)?;
 
diff --git a/src/client/http_client.rs b/src/client/http_client.rs
index 3c5ef067..5d8e309d 100644
--- a/src/client/http_client.rs
+++ b/src/client/http_client.rs
@@ -258,9 +258,8 @@ impl HttpClient {
         debug: bool,
     ) -> impl Future<Item=BackupClient, Error=Error> {
 
-        let path = format!("/api2/json/admin/datastore/{}/backup", datastore);
-        let param = json!({"backup-type": backup_type, "backup-id": backup_id, "debug": debug});
-        let mut req = Self::request_builder(&self.server, "GET", &path, Some(param)).unwrap();
+        let param = json!({"backup-type": backup_type, "backup-id": backup_id, "store": datastore, "debug": debug});
+        let mut req = Self::request_builder(&self.server, "GET", "/api2/json/backup", Some(param)).unwrap();
 
         let login = self.auth.listen();