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

moved tape_job.rs to pbs_config workspace

Browse Source
This commit is contained in:
Dietmar Maurer
2021-09-07 12:32:01 +02:00
parent 5839c469c1
commit e3619d4101
22 changed files with 578 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/docgen.rs
View File

@ -56,7 +56,7 @@ fn main() -> Result<(), Error> {
"apidata.js" => generate_api_tree(),
"datastore.cfg" => dump_section_config(&config::datastore::CONFIG),
"tape.cfg" => dump_section_config(&pbs_config::drive::CONFIG),
"tape-job.cfg" => dump_section_config(&config::tape_job::CONFIG),
"tape-job.cfg" => dump_section_config(&pbs_config::tape_job::CONFIG),
"user.cfg" => dump_section_config(&config::user::CONFIG),
"remote.cfg" => dump_section_config(&pbs_config::remote::CONFIG),
"sync.cfg" => dump_section_config(&config::sync::CONFIG),

22
src/bin/proxmox-backup-proxy.rs
View File

@ -32,7 +32,7 @@ use pbs_buildcfg::configdir;
use pbs_systemd::time::{compute_next_event, parse_calendar_event};
use pbs_tools::logrotate::LogRotate;
use proxmox_backup::api2::types::Authid;
use pbs_api_types::{Authid, TapeBackupJobConfig, VerificationJobConfig, SyncJobConfig};
use proxmox_backup::server;
use proxmox_backup::auth_helpers::*;
use proxmox_backup::tools::{
@ -520,12 +520,8 @@ async fn schedule_datastore_prune() {
async fn schedule_datastore_sync_jobs() {
use proxmox_backup::config::sync::{
self,
SyncJobConfig,
};
let config = match sync::config() {
let config = match proxmox_backup::config::sync::config() {
Err(err) => {
eprintln!("unable to read sync job config - {}", err);
return;
@ -564,12 +560,7 @@ async fn schedule_datastore_sync_jobs() {
async fn schedule_datastore_verify_jobs() {
use proxmox_backup::config::verify::{
self,
VerificationJobConfig,
};
let config = match verify::config() {
let config = match proxmox_backup::config::verify::config() {
Err(err) => {
eprintln!("unable to read verification job config - {}", err);
return;
@ -605,12 +596,7 @@ async fn schedule_datastore_verify_jobs() {
async fn schedule_tape_backup_jobs() {
use proxmox_backup::config::tape_job::{
self,
TapeBackupJobConfig,
};
let config = match tape_job::config() {
let config = match pbs_config::tape_job::config() {
Err(err) => {
eprintln!("unable to read tape job config - {}", err);
return;

16
src/bin/proxmox_tape/backup_job.rs
View File

@ -3,14 +3,12 @@ use serde_json::Value;
use proxmox::api::{api, cli::*, RpcEnvironment, ApiHandler};
use pbs_api_types::JOB_ID_SCHEMA;
use pbs_client::{connect_to_localhost, view_task_result};
use proxmox_backup::{
config,
api2::{
self,
types::*,
},
api2,
};
#[api(
@ -112,17 +110,17 @@ pub fn backup_job_commands() -> CommandLineInterface {
.insert("show",
CliCommand::new(&API_METHOD_SHOW_TAPE_BACKUP_JOB)
.arg_param(&["id"])
.completion_cb("id", config::tape_job::complete_tape_job_id)
.completion_cb("id", pbs_config::tape_job::complete_tape_job_id)
)
.insert("run",
CliCommand::new(&API_METHOD_RUN_TAPE_BACKUP_JOB)
.arg_param(&["id"])
.completion_cb("id", config::tape_job::complete_tape_job_id)
.completion_cb("id", pbs_config::tape_job::complete_tape_job_id)
)
.insert("create",
CliCommand::new(&api2::config::tape_backup_job::API_METHOD_CREATE_TAPE_BACKUP_JOB)
.arg_param(&["id"])
.completion_cb("id", config::tape_job::complete_tape_job_id)
.completion_cb("id", pbs_config::tape_job::complete_tape_job_id)
.completion_cb("schedule", config::datastore::complete_calendar_event)
.completion_cb("store", config::datastore::complete_datastore_name)
.completion_cb("pool", pbs_config::media_pool::complete_pool_name)
@ -131,7 +129,7 @@ pub fn backup_job_commands() -> CommandLineInterface {
.insert("update",
CliCommand::new(&api2::config::tape_backup_job::API_METHOD_UPDATE_TAPE_BACKUP_JOB)
.arg_param(&["id"])
.completion_cb("id", config::tape_job::complete_tape_job_id)
.completion_cb("id", pbs_config::tape_job::complete_tape_job_id)
.completion_cb("schedule", config::datastore::complete_calendar_event)
.completion_cb("store", config::datastore::complete_datastore_name)
.completion_cb("pool", pbs_config::media_pool::complete_pool_name)
@ -140,7 +138,7 @@ pub fn backup_job_commands() -> CommandLineInterface {
.insert("remove",
CliCommand::new(&api2::config::tape_backup_job::API_METHOD_DELETE_TAPE_BACKUP_JOB)
.arg_param(&["id"])
.completion_cb("id", config::tape_job::complete_tape_job_id)
.completion_cb("id", pbs_config::tape_job::complete_tape_job_id)
);
cmd_def.into()