proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-20 04:04:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api/cli/command.rs: handle fixed_param

Browse Source
This commit is contained in:
Dietmar Maurer 2020-04-25 16:16:57 +02:00
parent 341795c1ee
commit b6765d06c5
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxmox/src/api/cli/command.rs
View File

@ -30,7 +30,9 @@ fn parse_arguments(
) -> Result<Value, Error> {
let (params, remaining) =
match getopts::parse_arguments(&args, cli_cmd.arg_param, &cli_cmd.info.parameters) {
match getopts::parse_arguments(
&args, cli_cmd.arg_param, &cli_cmd.fixed_param, &cli_cmd.info.parameters
) {
Ok((p, r)) => (p, r),
Err(err) => {
let err_msg = err.to_string();

11
proxmox/src/api/cli/getopts.rs
View File

@ -1,3 +1,5 @@
use std::collections::HashMap;
use anyhow::*;
use serde_json::Value;
@ -146,6 +148,7 @@ pub(crate) fn parse_argument_list<T: AsRef<str>>(
pub fn parse_arguments<T: AsRef<str>>(
args: &[T],
arg_param: &[&str],
fixed_param: &HashMap<&'static str, String>,
schema: &ObjectSchema,
) -> Result<(Value, Vec<String>), ParameterError> {
let mut errors = ParameterError::new();
@ -195,6 +198,10 @@ pub fn parse_arguments<T: AsRef<str>>(
return Err(errors);
}
for (name, value) in fixed_param.iter() {
data.push((name.to_string(), value.to_string()));
}
let options = parse_parameter_strings(&data, schema, true)?;
Ok((options, remaining))
@ -222,7 +229,7 @@ fn test_boolean_arg() {
variants.push((vec!["--enable", "false"], false));
for (args, expect) in variants {
let res = parse_arguments(&args, &vec![], &PARAMETERS);
let res = parse_arguments(&args, &vec![], &HashMap::new(), &PARAMETERS);
assert!(res.is_ok());
if let Ok((options, remaining)) = res {
assert!(options["enable"] == expect);
@ -242,7 +249,7 @@ fn test_argument_paramenter() {
);
let args = vec!["-enable", "local"];
let res = parse_arguments(&args, &vec!["storage"], &PARAMETERS);
let res = parse_arguments(&args, &vec!["storage"], &HashMap::new(), &PARAMETERS);
assert!(res.is_ok());
if let Ok((options, remaining)) = res {
assert!(options["enable"] == true);