48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#915 Rename POST /image/setup for /setup in REST API 

This patch renames the setup command to avoid semantic confusion.
master
Roberto Hueso Gómez 2019-11-13 12:21:42 +01:00 committed by OpenGnSys Support Team
parent ee2e16ac96
commit 6c91d147c1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sources/ogAdmServer.cpp
View File

@ -4228,7 +4228,7 @@ static int og_cmd_restore_image(json_t *element, struct og_msg_params *params)
return 0;
}
static int og_cmd_setup_image(json_t *element, struct og_msg_params *params)
static int og_cmd_setup(json_t *element, struct og_msg_params *params)
{
char buf[4096] = {};
int err = 0, len;
@ -4933,7 +4933,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli)
return og_client_bad_request(cli);
}
err = og_cmd_restore_image(root, &params);
} else if (!strncmp(cmd, "image/setup", strlen("image/setup"))) {
} else if (!strncmp(cmd, "setup", strlen("setup"))) {
if (method != OG_METHOD_POST)
return og_client_method_not_found(cli);
@ -4941,7 +4941,7 @@ static int og_client_state_process_payload_rest(struct og_client *cli)
syslog(LOG_ERR, "command create with no payload\n");
return og_client_bad_request(cli);
}
err = og_cmd_setup_image(root, &params);
err = og_cmd_setup(root, &params);
} else if (!strncmp(cmd, "run/schedule", strlen("run/schedule"))) {
if (method != OG_METHOD_POST)
return og_client_method_not_found(cli);

2
tests/run-tests.sh
View File

@ -14,7 +14,7 @@ curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/hardware -d @pos
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/software -d @post_clients.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/image/create -d @create_image.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/image/restore -d @restore_image.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/image/setup -d @setup_image.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/setup -d @setup_image.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/image/create/basic -d @create_basic_image.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/image/create/incremental -d @create_incremental_image.json
curl -X POST -H "Authorization: $API_KEY" http://127.0.0.1:8888/image/restore/basic -d @restore_basic_image.json

4
tests/units/test_0018_post_image_setup.py → tests/units/test_0018_post_setup.py
View File

@ -1,10 +1,10 @@
import requests
import unittest
class TestPostSetupImageMethods(unittest.TestCase):
class TestPostSetupMethods(unittest.TestCase):
def setUp(self):
self.url = 'http://localhost:8888/image/setup'
self.url = 'http://localhost:8888/setup'
self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'}
self.json = { 'clients' : [ '192.168.2.1', '192.168.2.2' ],
'disk' : '1',