tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update to first proxmox crate split

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2021-10-08 11:19:37 +02:00
parent e3f3359c86
commit 6ef1b649d9
265 changed files with 880 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
proxmox-file-restore/Cargo.toml
View File

@ -16,7 +16,12 @@ tokio = { version = "1.6", features = [ "io-std", "rt", "rt-multi-thread", "time
pxar = { version = "0.10.1", features = [ "tokio-io" ] }
proxmox = { version = "0.14.0", features = [ "api-macro", "cli" ] }
proxmox = { version = "0.14.0" }
proxmox-lang = "1"
proxmox-router = { version = "1", features = [ "cli" ] }
proxmox-schema = { version = "1", features = [ "api-macro" ] }
proxmox-time = "1"
proxmox-uuid = "1"
pbs-api-types = { path = "../pbs-api-types" }
pbs-buildcfg = { path = "../pbs-buildcfg" }

3
proxmox-file-restore/src/block_driver.rs
View File

@ -8,7 +8,8 @@ use anyhow::{bail, Error};
use serde::{Deserialize, Serialize};
use serde_json::{json, Value};
use proxmox::api::{api, cli::*};
use proxmox_router::cli::*;
use proxmox_schema::api;
use pbs_client::BackupRepository;
use pbs_datastore::backup_info::BackupDir;

2
proxmox-file-restore/src/block_driver_qemu.rs
View File

@ -110,7 +110,7 @@ async fn cleanup_map(map: &mut HashMap<String, VMState>) -> bool {
}
fn new_ticket() -> String {
proxmox::tools::Uuid::generate().to_string()
proxmox_uuid::Uuid::generate().to_string()
}
async fn ensure_running(details: &SnapRestoreDetails) -> Result<VsockClient, Error> {

12
proxmox-file-restore/src/main.rs
View File

@ -6,14 +6,12 @@ use std::sync::Arc;
use anyhow::{bail, format_err, Error};
use serde_json::{json, Value};
use proxmox::api::{
api,
cli::{
default_table_format_options, format_and_print_result_full, get_output_format,
run_cli_command, CliCommand, CliCommandMap, CliEnvironment, ColumnConfig, OUTPUT_FORMAT,
},
};
use proxmox::tools::fs::{create_path, CreateOptions};
use proxmox_router::cli::{
default_table_format_options, format_and_print_result_full, get_output_format,
run_cli_command, CliCommand, CliCommandMap, CliEnvironment, ColumnConfig, OUTPUT_FORMAT,
};
use proxmox_schema::api;
use pxar::accessor::aio::Accessor;
use pxar::decoder::aio::Decoder;

6
proxmox-file-restore/src/qemu_helper.rs
View File

@ -24,7 +24,7 @@ const MAX_CID_TRIES: u64 = 32;
fn create_restore_log_dir() -> Result<String, Error> {
let logpath = format!("{}/file-restore", pbs_buildcfg::PROXMOX_BACKUP_LOG_DIR);
proxmox::try_block!({
proxmox_lang::try_block!({
let backup_user = backup_user()?;
let opts = CreateOptions::new()
.owner(backup_user.uid)
@ -163,8 +163,8 @@ pub async fn start_vm(
// preface log file with start timestamp so one can see how long QEMU took to start
writeln!(logfd, "[{}] PBS file restore VM log", {
let now = proxmox::tools::time::epoch_i64();
proxmox::tools::time::epoch_to_rfc3339(now)?
let now = proxmox_time::epoch_i64();
proxmox_time::epoch_to_rfc3339(now)?
},)?;
let base_args = [