summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenGnSys Support Team <soporte-og@soleta.eu>2019-06-21 13:22:12 +0200
committerOpenGnSys Support Team <soporte-og@soleta.eu>2019-07-03 02:56:07 +0200
commit6b30dbc65c817e7777c10144d3fd1e8af75ef556 (patch)
tree4fb26a8592b1056f06e0bd50439c5c1455ec8a03
parenteae2385f67d50da21a646b8c645fd0a98b2c23c9 (diff)
#915 add POST hardware command to REST API in ogAdmServer
This patch implements the command "hardware" that fetches the hardware configuration from the clients. Request: POST /hardware {"clients" : [ "192.168.2.1", "192.168.2.2" ]} Reply: 200 OK This allows to refresh the hardware inventory from clients.
-rw-r--r--sources/ogAdmServer.cpp30
-rwxr-xr-xtests/run-tests.sh1
2 files changed, 31 insertions, 0 deletions
diff --git a/sources/ogAdmServer.cpp b/sources/ogAdmServer.cpp
index 2504236..2fc9b3f 100644
--- a/sources/ogAdmServer.cpp
+++ b/sources/ogAdmServer.cpp
@@ -3874,6 +3874,27 @@ static int og_cmd_stop(json_t *element, struct og_msg_params *params)
return og_cmd_legacy_send(params, "Purgar", CLIENTE_APAGADO);
}
+static int og_cmd_hardware(json_t *element, struct og_msg_params *params)
+{
+ const char *key;
+ json_t *value;
+ int err = 0;
+
+ if (json_typeof(element) != JSON_OBJECT)
+ return -1;
+
+ json_object_foreach(element, key, value) {
+ if (!strcmp(key, "clients"))
+ err = og_json_parse_clients(value, params);
+
+ if (err < 0)
+ break;
+ }
+
+ return og_cmd_legacy_send(params, "InventarioHardware",
+ CLIENTE_OCUPADO);
+}
+
static int og_client_not_found(struct og_client *cli)
{
char buf[] = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n";
@@ -4034,6 +4055,15 @@ static int og_client_state_process_payload_rest(struct og_client *cli)
return og_client_not_found(cli);
}
err = og_cmd_refresh(root, &params);
+ } else if (!strncmp(cmd, "hardware", strlen("hardware"))) {
+ if (method != OG_METHOD_POST)
+ return -1;
+
+ if (!root) {
+ syslog(LOG_ERR, "command hardware with no payload\n");
+ return og_client_not_found(cli);
+ }
+ err = og_cmd_hardware(root, &params);
} else {
syslog(LOG_ERR, "unknown command %s\n", cmd);
err = og_client_not_found(cli);
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index ca00b5f..dfa4843 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -10,3 +10,4 @@ curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/poweroff -d @pow
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/reboot -d @reboot.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/stop -d @stop.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/refresh -d @refresh.json
+curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/hardware -d @post_clients.json