From 9381fdf5ce30b1c3aaabab6d6296593812dd8433 Mon Sep 17 00:00:00 2001 From: Roberto Hueso Gómez Date: Wed, 13 Nov 2019 12:21:42 +0100 Subject: #915 Rename POST /image/setup for /setup in REST API This patch renames the setup command to avoid semantic confusion. --- .../Services/ogAdmServer/sources/ogAdmServer.cpp | 6 +-- .../Services/ogAdmServer/tests/run-tests.sh | 2 +- .../tests/units/test_0018_post_image_setup.py | 47 ---------------------- .../tests/units/test_0018_post_setup.py | 47 ++++++++++++++++++++++ admin/WebConsole/includes/restfunctions.php | 2 +- 5 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_image_setup.py create mode 100644 admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_setup.py diff --git a/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp b/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp index 9f4c57a0..2a663856 100644 --- a/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp +++ b/admin/Sources/Services/ogAdmServer/sources/ogAdmServer.cpp @@ -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, ¶ms); - } 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, ¶ms); + err = og_cmd_setup(root, ¶ms); } else if (!strncmp(cmd, "run/schedule", strlen("run/schedule"))) { if (method != OG_METHOD_POST) return og_client_method_not_found(cli); diff --git a/admin/Sources/Services/ogAdmServer/tests/run-tests.sh b/admin/Sources/Services/ogAdmServer/tests/run-tests.sh index 519366fb..893e0264 100755 --- a/admin/Sources/Services/ogAdmServer/tests/run-tests.sh +++ b/admin/Sources/Services/ogAdmServer/tests/run-tests.sh @@ -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 diff --git a/admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_image_setup.py b/admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_image_setup.py deleted file mode 100644 index 3876e230..00000000 --- a/admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_image_setup.py +++ /dev/null @@ -1,47 +0,0 @@ -import requests -import unittest - -class TestPostSetupImageMethods(unittest.TestCase): - - def setUp(self): - self.url = 'http://localhost:8888/image/setup' - self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'} - self.json = { 'clients' : [ '192.168.2.1', '192.168.2.2' ], - 'disk' : '1', - 'cache' : '1', - 'cache_size' : '0', - 'partition_setup': [{'partition': '1', - 'code': 'LINUX', - 'filesystem': 'EMPTY', - 'size': '498688', - 'format': '0'}, - {'partition': '2', - 'code': 'LINUX-SWAP', - 'filesystem': 'EMPTY', - 'size': '199987', - 'format': '0'}, - {'partition': '3', - 'code': 'LINUX', - 'filesystem': 'EMPTY', - 'size': '31053824', - 'format': '0'}, - {'partition': '4', - 'code': 'EMPTY', - 'filesystem': 'EMPTY', - 'size': '0', - 'format': '0'}] } - - def test_post(self): - returned = requests.post(self.url, headers=self.headers, json=self.json) - self.assertEqual(returned.status_code, 200) - - def test_no_payload(self): - returned = requests.post(self.url, headers=self.headers, json=None) - self.assertEqual(returned.status_code, 400) - - def test_get(self): - returned = requests.get(self.url, headers=self.headers) - self.assertEqual(returned.status_code, 405) - -if __name__ == '__main__': - unittest.main() diff --git a/admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_setup.py b/admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_setup.py new file mode 100644 index 00000000..9d26b85b --- /dev/null +++ b/admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_setup.py @@ -0,0 +1,47 @@ +import requests +import unittest + +class TestPostSetupMethods(unittest.TestCase): + + def setUp(self): + self.url = 'http://localhost:8888/setup' + self.headers = {'Authorization' : '07b3bfe728954619b58f0107ad73acc1'} + self.json = { 'clients' : [ '192.168.2.1', '192.168.2.2' ], + 'disk' : '1', + 'cache' : '1', + 'cache_size' : '0', + 'partition_setup': [{'partition': '1', + 'code': 'LINUX', + 'filesystem': 'EMPTY', + 'size': '498688', + 'format': '0'}, + {'partition': '2', + 'code': 'LINUX-SWAP', + 'filesystem': 'EMPTY', + 'size': '199987', + 'format': '0'}, + {'partition': '3', + 'code': 'LINUX', + 'filesystem': 'EMPTY', + 'size': '31053824', + 'format': '0'}, + {'partition': '4', + 'code': 'EMPTY', + 'filesystem': 'EMPTY', + 'size': '0', + 'format': '0'}] } + + def test_post(self): + returned = requests.post(self.url, headers=self.headers, json=self.json) + self.assertEqual(returned.status_code, 200) + + def test_no_payload(self): + returned = requests.post(self.url, headers=self.headers, json=None) + self.assertEqual(returned.status_code, 400) + + def test_get(self): + returned = requests.get(self.url, headers=self.headers) + self.assertEqual(returned.status_code, 405) + +if __name__ == '__main__': + unittest.main() diff --git a/admin/WebConsole/includes/restfunctions.php b/admin/WebConsole/includes/restfunctions.php index 486ac682..653fcbf3 100644 --- a/admin/WebConsole/includes/restfunctions.php +++ b/admin/WebConsole/includes/restfunctions.php @@ -20,7 +20,7 @@ define('OG_REST_CMD_HARDWARE', 'hardware'); define('OG_REST_CMD_SOFTWARE', 'software'); define('OG_REST_CMD_CREATE_IMAGE', 'image/create'); define('OG_REST_CMD_RESTORE_IMAGE', 'image/restore'); -define('OG_REST_CMD_SETUP', 'image/setup'); +define('OG_REST_CMD_SETUP', 'setup'); define('OG_REST_CMD_CREATE_BASIC_IMAGE', 'image/create/basic'); define('OG_REST_CMD_CREATE_INCREMENTAL_IMAGE', 'image/create/incremental'); define('OG_REST_CMD_RESTORE_BASIC_IMAGE', 'image/restore/basic'); -- cgit v1.2.3-18-g5258