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

move media_pool config to pbs_config workspace

Browse Source
This commit is contained in:
Dietmar Maurer
2021-09-06 08:56:04 +02:00
parent 68149b9045
commit aad2d162ab
12 changed files with 38 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/api2/config/media_pool.rs
View File

@ -10,15 +10,15 @@ use proxmox::{
},
};
use pbs_api_types::{
Authid,
MEDIA_POOL_NAME_SCHEMA,
MediaPoolConfig,
MediaPoolConfigUpdater,
};
use crate::{
api2::types::{
Authid,
MEDIA_POOL_NAME_SCHEMA,
MediaPoolConfig,
MediaPoolConfigUpdater,
},
config::{
self,
cached_user_info::CachedUserInfo,
acl::{
PRIV_TAPE_AUDIT,
@ -46,9 +46,9 @@ pub fn create_pool(
config: MediaPoolConfig,
) -> Result<(), Error> {
let _lock = config::media_pool::lock()?;
let _lock = pbs_config::media_pool::lock()?;
let (mut section_config, _digest) = config::media_pool::config()?;
let (mut section_config, _digest) = pbs_config::media_pool::config()?;
if section_config.sections.get(&config.name).is_some() {
bail!("Media pool '{}' already exists", config.name);
@ -56,7 +56,7 @@ pub fn create_pool(
section_config.set_data(&config.name, "pool", &config)?;
config::media_pool::save_config(&section_config)?;
pbs_config::media_pool::save_config(&section_config)?;
Ok(())
}
@ -81,7 +81,7 @@ pub fn list_pools(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let user_info = CachedUserInfo::new()?;
let (config, digest) = config::media_pool::config()?;
let (config, digest) = pbs_config::media_pool::config()?;
let list = config.convert_to_typed_array::<MediaPoolConfig>("pool")?;
@ -116,7 +116,7 @@ pub fn list_pools(
/// Get media pool configuration
pub fn get_config(name: String) -> Result<MediaPoolConfig, Error> {
let (config, _digest) = config::media_pool::config()?;
let (config, _digest) = pbs_config::media_pool::config()?;
let data: MediaPoolConfig = config.lookup("pool", &name)?;
@ -172,9 +172,9 @@ pub fn update_pool(
delete: Option<Vec<DeletableProperty>>,
) -> Result<(), Error> {
let _lock = config::media_pool::lock()?;
let _lock = pbs_config::media_pool::lock()?;
let (mut config, _digest) = config::media_pool::config()?;
let (mut config, _digest) = pbs_config::media_pool::config()?;
let mut data: MediaPoolConfig = config.lookup("pool", &name)?;
@ -206,7 +206,7 @@ pub fn update_pool(
config.set_data(&name, "pool", &data)?;
config::media_pool::save_config(&config)?;
pbs_config::media_pool::save_config(&config)?;
Ok(())
}
@ -227,16 +227,16 @@ pub fn update_pool(
/// Delete a media pool configuration
pub fn delete_pool(name: String) -> Result<(), Error> {
let _lock = config::media_pool::lock()?;
let _lock = pbs_config::media_pool::lock()?;
let (mut config, _digest) = config::media_pool::config()?;
let (mut config, _digest) = pbs_config::media_pool::config()?;
match config.sections.get(&name) {
Some(_) => { config.sections.remove(&name); },
None => bail!("delete pool '{}' failed - no such pool", name),
}
config::media_pool::save_config(&config)?;
pbs_config::media_pool::save_config(&config)?;
Ok(())
}

6
src/api2/tape/backup.rs
View File

@ -122,7 +122,7 @@ pub fn list_tape_backup_jobs(
let user_info = CachedUserInfo::new()?;
let (job_config, digest) = config::tape_job::config()?;
let (pool_config, _pool_digest) = config::media_pool::config()?;
let (pool_config, _pool_digest) = pbs_config::media_pool::config()?;
let (drive_config, _digest) = pbs_config::drive::config()?;
let job_list_iter = job_config
@ -191,7 +191,7 @@ pub fn do_tape_backup_job(
let datastore = DataStore::lookup_datastore(&setup.store)?;
let (config, _digest) = config::media_pool::config()?;
let (config, _digest) = pbs_config::media_pool::config()?;
let pool_config: MediaPoolConfig = config.lookup("pool", &setup.pool)?;
let (drive_config, _digest) = pbs_config::drive::config()?;
@ -370,7 +370,7 @@ pub fn backup(
let datastore = DataStore::lookup_datastore(&setup.store)?;
let (config, _digest) = config::media_pool::config()?;
let (config, _digest) = pbs_config::media_pool::config()?;
let pool_config: MediaPoolConfig = config.lookup("pool", &setup.pool)?;
let (drive_config, _digest) = pbs_config::drive::config()?;

4
src/api2/tape/drive.rs
View File

@ -514,7 +514,7 @@ pub fn label_media(
rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
if let Some(ref pool) = pool {
let (pool_config, _digest) = config::media_pool::config()?;
let (pool_config, _digest) = pbs_config::media_pool::config()?;
if pool_config.sections.get(pool).is_none() {
bail!("no such pool ('{}')", pool);
@ -1029,7 +1029,7 @@ pub fn barcode_label_media(
rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
if let Some(ref pool) = pool {
let (pool_config, _digest) = config::media_pool::config()?;
let (pool_config, _digest) = pbs_config::media_pool::config()?;
if pool_config.sections.get(pool).is_none() {
bail!("no such pool ('{}')", pool);

9
src/api2/tape/media.rs
View File

@ -18,13 +18,12 @@ use pbs_api_types::{
use crate::{
config::{
self,
cached_user_info::CachedUserInfo,
acl::{
PRIV_TAPE_AUDIT,
},
},
tape::{
tape::{
TAPE_STATUS_DIR,
Inventory,
MediaPool,
@ -54,7 +53,7 @@ pub async fn list_media_sets(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let user_info = CachedUserInfo::new()?;
let (config, _digest) = config::media_pool::config()?;
let (config, _digest) = pbs_config::media_pool::config()?;
let status_path = Path::new(TAPE_STATUS_DIR);
@ -143,7 +142,7 @@ pub async fn list_media(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let user_info = CachedUserInfo::new()?;
let (config, _digest) = config::media_pool::config()?;
let (config, _digest) = pbs_config::media_pool::config()?;
let status_path = Path::new(TAPE_STATUS_DIR);
@ -410,7 +409,7 @@ pub fn list_content(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let user_info = CachedUserInfo::new()?;
let (config, _digest) = config::media_pool::config()?;
let (config, _digest) = pbs_config::media_pool::config()?;
let status_path = Path::new(TAPE_STATUS_DIR);
let inventory = Inventory::load(status_path)?;