From 74b6e3ec7275164e2ecbf6f98b24357b2a9bb174 Mon Sep 17 00:00:00 2001 From: "Jose M. Guisado" Date: Thu, 6 Jul 2023 18:23:56 +0200 Subject: rest: add optional param "backup" for create_image This parameter is used by ogServer to instruct target client if image backup should be performed before image creation. This parameter is optional to preserve backward compatibility with webconsole (legacy web client) and avoid the need of updating any legacy client. Default is true if the REST request is missing this parameter. --- src/json.h | 1 + src/rest.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/json.h b/src/json.h index 881a10a..9ac5c4e 100644 --- a/src/json.h +++ b/src/json.h @@ -91,6 +91,7 @@ struct og_msg_params { struct og_image image; const char *task_id; uint64_t flags; + bool backup; }; int og_json_parse_partition_setup(json_t *element, struct og_msg_params *params); diff --git a/src/rest.c b/src/rest.c index ff51332..da75f26 100644 --- a/src/rest.c +++ b/src/rest.c @@ -79,6 +79,7 @@ struct ev_loop *og_loop; #define OG_REST_PARAM_SCOPE (1UL << 41) #define OG_REST_PARAM_MODE (1UL << 42) #define OG_REST_PARAM_CENTER (1UL << 43) +#define OG_REST_PARAM_BACKUP (1UL << 44) static LIST_HEAD(client_list); static LIST_HEAD(client_wol_list); @@ -2187,12 +2188,18 @@ int og_json_parse_create_image(json_t *element, err = og_json_parse_uint64(value, ¶ms->image.group_id); } else if (!strcmp(key, "center_id")) { err = og_json_parse_uint64(value, ¶ms->image.center_id); + } else if (!strcmp(key, "backup")) { + err = og_json_parse_bool(value, ¶ms->backup); + params->flags |= OG_REST_PARAM_BACKUP; } if (err < 0) return err; } + if (!og_msg_params_validate(params, OG_REST_PARAM_BACKUP)) + params->backup = true; + return 0; } @@ -2252,6 +2259,7 @@ static int og_cmd_create_image(json_t *element, struct og_msg_params *params) return err; json_object_set_new(clients ,"repository", json_string(repository_ip)); + json_object_set_new(clients ,"backup", json_boolean(params->backup)); return og_send_request(OG_METHOD_POST, OG_CMD_IMAGE_CREATE, params, clients); -- cgit v1.2.3-18-g5258