From e77a02ed87fb40aa85cf15546b42e15df000d219 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Sun, 3 Mar 2019 09:48:32 +0100 Subject: [PATCH] catar api: cleanup parameter names --- src/api2/admin/datastore/catar.rs | 24 ++++++++++++------------ src/bin/proxmox-backup-client.rs | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/api2/admin/datastore/catar.rs b/src/api2/admin/datastore/catar.rs index c377174e..1ab95ffd 100644 --- a/src/api2/admin/datastore/catar.rs +++ b/src/api2/admin/datastore/catar.rs @@ -63,9 +63,9 @@ fn upload_catar( archive_name.push_str(".didx"); - let backup_type = tools::required_string_param(¶m, "type")?; - let backup_id = tools::required_string_param(¶m, "id")?; - let backup_time = tools::required_integer_param(¶m, "time")?; + let backup_type = tools::required_string_param(¶m, "backup-type")?; + let backup_id = tools::required_string_param(¶m, "backup-id")?; + let backup_time = tools::required_integer_param(¶m, "backup-time")?; println!("Upload {}/{}/{}/{}/{}", store, backup_type, backup_id, backup_time, archive_name); @@ -109,10 +109,10 @@ pub fn api_method_upload_catar() -> ApiAsyncMethod { ObjectSchema::new("Upload .catar backup file.") .required("store", StringSchema::new("Datastore name.")) .required("archive-name", StringSchema::new("Backup archive name.")) - .required("type", StringSchema::new("Backup type.") + .required("backup-type", StringSchema::new("Backup type.") .format(Arc::new(ApiStringFormat::Enum(vec!["ct".into(), "host".into()])))) - .required("id", StringSchema::new("Backup ID.")) - .required("time", IntegerSchema::new("Backup time (Unix epoch.)") + .required("backup-id", StringSchema::new("Backup ID.")) + .required("backup-time", IntegerSchema::new("Backup time (Unix epoch.)") .minimum(1547797308)) .optional( "chunk-size", @@ -135,9 +135,9 @@ fn download_catar( let store = tools::required_string_param(¶m, "store")?; let archive_name = tools::required_string_param(¶m, "archive-name")?; - let backup_type = tools::required_string_param(¶m, "type")?; - let backup_id = tools::required_string_param(¶m, "id")?; - let backup_time = tools::required_integer_param(¶m, "time")?; + let backup_type = tools::required_string_param(¶m, "backup-type")?; + let backup_id = tools::required_string_param(¶m, "backup-id")?; + let backup_time = tools::required_integer_param(¶m, "backup-time")?; let backup_time = Local.timestamp(backup_time, 0); println!("Download {}.catar from {} ({}/{}/{}/{}.didx)", archive_name, store, @@ -178,10 +178,10 @@ pub fn api_method_download_catar() -> ApiAsyncMethod { ObjectSchema::new("Download .catar backup file.") .required("store", StringSchema::new("Datastore name.")) .required("archive-name", StringSchema::new("Backup archive name.")) - .required("type", StringSchema::new("Backup type.") + .required("backup-type", StringSchema::new("Backup type.") .format(Arc::new(ApiStringFormat::Enum(vec!["ct".into(), "host".into()])))) - .required("id", StringSchema::new("Backup ID.")) - .required("time", IntegerSchema::new("Backup time (Unix epoch.)") + .required("backup-id", StringSchema::new("Backup ID.")) + .required("backup-time", IntegerSchema::new("Backup time (Unix epoch.)") .minimum(1547797308)) ) diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index f008b376..9970ddc3 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -39,9 +39,9 @@ fn backup_directory>( let mut param = json!({ "archive-name": archive_name, - "type": "host", - "id": &tools::nodename(), - "time": backup_time.timestamp(), + "backup-type": "host", + "backup-id": &tools::nodename(), + "backup-time": backup_time.timestamp(), }); if let Some(size) = chunk_size {