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

This patch renames the setup command to avoid semantic confusion.

4 files changed, 7 insertions, 7 deletions

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, &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);
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_setup.py
index 3876e230..9d26b85b 100644
--- a/admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_image_setup.py
+++ b/admin/Sources/Services/ogAdmServer/tests/units/test_0018_post_setup.py
@@ -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',
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');