From d95ced64ad4c06042babcd461635590765e5ace4 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 8 May 2019 12:41:58 +0200
Subject: [PATCH] src/api2/admin/datastore/backup/environment.rs: use separate
 file

---
 src/api2/admin/datastore/backup.rs            | 50 +----------------
 .../admin/datastore/backup/environment.rs     | 55 +++++++++++++++++++
 2 files changed, 58 insertions(+), 47 deletions(-)
 create mode 100644 src/api2/admin/datastore/backup/environment.rs

diff --git a/src/api2/admin/datastore/backup.rs b/src/api2/admin/datastore/backup.rs
index 47bfad61..6919f5d1 100644
--- a/src/api2/admin/datastore/backup.rs
+++ b/src/api2/admin/datastore/backup.rs
@@ -17,6 +17,9 @@ use crate::api_schema::*;
 use crate::server::formatter::*;
 use crate::server::WorkerTask;
 
+mod environment;
+use environment::*;
+
 pub fn api_method_upgrade_backup() -> ApiAsyncMethod {
     ApiAsyncMethod::new(
         upgrade_h2upload,
@@ -29,53 +32,6 @@ lazy_static!{
     static ref BACKUP_ROUTER: Router = backup_api();
 }
 
-/// `RpcEnvironmet` implementation for backup service
-#[derive(Clone)]
-pub struct BackupEnvironment {
-    env_type: RpcEnvironmentType,
-    result_attributes: HashMap<String, Value>,
-    user: String,
-    worker: Arc<WorkerTask>,
-
-}
-
-impl BackupEnvironment {
-    pub fn new(env_type: RpcEnvironmentType, user: String, worker: Arc<WorkerTask>) -> Self {
-        Self {
-            result_attributes: HashMap::new(),
-            env_type,
-            user,
-            worker,
-        }
-    }
-
-    pub fn log<S: AsRef<str>>(&self, msg: S) {
-        self.worker.log(msg);
-    }
-}
-
-impl RpcEnvironment for BackupEnvironment {
-
-    fn set_result_attrib(&mut self, name: &str, value: Value) {
-        self.result_attributes.insert(name.into(), value);
-    }
-
-    fn get_result_attrib(&self, name: &str) -> Option<&Value> {
-        self.result_attributes.get(name)
-    }
-
-    fn env_type(&self) -> RpcEnvironmentType {
-        self.env_type
-    }
-
-    fn set_user(&mut self, _user: Option<String>) {
-        panic!("unable to change user");
-    }
-
-    fn get_user(&self) -> Option<String> {
-        Some(self.user.clone())
-    }
-}
 
 pub struct BackupService {
     rpcenv: BackupEnvironment,
diff --git a/src/api2/admin/datastore/backup/environment.rs b/src/api2/admin/datastore/backup/environment.rs
new file mode 100644
index 00000000..0c22e3d3
--- /dev/null
+++ b/src/api2/admin/datastore/backup/environment.rs
@@ -0,0 +1,55 @@
+use std::sync::Arc;
+use std::collections::HashMap;
+
+use serde_json::Value;
+
+use crate::api_schema::router::{RpcEnvironment, RpcEnvironmentType};
+use crate::server::WorkerTask;
+
+/// `RpcEnvironmet` implementation for backup service
+#[derive(Clone)]
+pub struct BackupEnvironment {
+    env_type: RpcEnvironmentType,
+    result_attributes: HashMap<String, Value>,
+    user: String,
+    worker: Arc<WorkerTask>,
+
+}
+
+impl BackupEnvironment {
+    pub fn new(env_type: RpcEnvironmentType, user: String, worker: Arc<WorkerTask>) -> Self {
+        Self {
+            result_attributes: HashMap::new(),
+            env_type,
+            user,
+            worker,
+        }
+    }
+
+    pub fn log<S: AsRef<str>>(&self, msg: S) {
+        self.worker.log(msg);
+    }
+}
+
+impl RpcEnvironment for BackupEnvironment {
+
+    fn set_result_attrib(&mut self, name: &str, value: Value) {
+        self.result_attributes.insert(name.into(), value);
+    }
+
+    fn get_result_attrib(&self, name: &str) -> Option<&Value> {
+        self.result_attributes.get(name)
+    }
+
+    fn env_type(&self) -> RpcEnvironmentType {
+        self.env_type
+    }
+
+    fn set_user(&mut self, _user: Option<String>) {
+        panic!("unable to change user");
+    }
+
+    fn get_user(&self) -> Option<String> {
+        Some(self.user.clone())
+    }
+}