Skip to content

Commit 99d7254

Browse files
oliweroliwer
committed
MINOR: runtime: fix the POST request to create a sever
This method should not require the name of the new server in the URL, but only in the payload.
1 parent 9534882 commit 99d7254

10 files changed

Lines changed: 117 additions & 159 deletions

File tree

‎e2e/tests/servers/data/runtime_add_server.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"name": "rt_server",
23
"address": "10.11.12.13",
34
"port": 8088,
45
"check": "disabled",

‎e2e/tests/servers/runtime.bats‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ load 'utils/_helpers'
4848
@test "servers: Add a server via runtime" {
4949
haproxy_version_ge 2.6 || skip "requires HAProxy 2.6+"
5050

51-
resource_post "$_RUNTIME_SERVER_BASE_PATH/rt_server" "data/runtime_add_server.json" "backend=test_backend"
51+
resource_post "$_RUNTIME_SERVER_BASE_PATH" "data/runtime_add_server.json" "backend=test_backend"
5252
assert_equal "$SC" 201
5353
assert_equal "$(get_json_path "$BODY" '.name')" "rt_server"
5454

@@ -62,28 +62,24 @@ load 'utils/_helpers'
6262
@test "servers: Add an existing server via runtime" {
6363
haproxy_version_ge 2.6 || skip "requires HAProxy 2.6+"
6464

65-
resource_post "$_RUNTIME_SERVER_BASE_PATH/rt_server" "data/runtime_add_server.json" "backend=test_backend"
65+
resource_post "$_RUNTIME_SERVER_BASE_PATH" "data/runtime_add_server.json" "backend=test_backend"
6666
assert_equal "$SC" 201
6767

68-
resource_post "$_RUNTIME_SERVER_BASE_PATH/rt_server" "data/runtime_add_server.json" "backend=test_backend"
69-
assert_equal "$SC" 409
70-
71-
# exists in configuration
72-
resource_post "$_RUNTIME_SERVER_BASE_PATH/server_ipv6" "data/runtime_add_server.json" "backend=test_backend"
68+
resource_post "$_RUNTIME_SERVER_BASE_PATH" "data/runtime_add_server.json" "backend=test_backend"
7369
assert_equal "$SC" 409
7470
}
7571

7672
@test "servers: Add a server to a wrong backend via runtime" {
7773
haproxy_version_ge 2.6 || skip "requires HAProxy 2.6+"
7874

79-
resource_post "$_RUNTIME_SERVER_BASE_PATH/rt_server" "data/runtime_add_server.json" "backend=does_not_exist"
75+
resource_post "$_RUNTIME_SERVER_BASE_PATH" "data/runtime_add_server.json" "backend=does_not_exist"
8076
assert_equal "$SC" 404
8177
}
8278

8379
@test "servers: Delete a server via runtime" {
8480
haproxy_version_ge 2.6 || skip "requires HAProxy 2.6+"
8581

86-
resource_post "$_RUNTIME_SERVER_BASE_PATH/rt_server" "data/runtime_add_server.json" "backend=test_backend"
82+
resource_post "$_RUNTIME_SERVER_BASE_PATH" "data/runtime_add_server.json" "backend=test_backend"
8783
assert_equal "$SC" 201
8884

8985
resource_delete "$_RUNTIME_SERVER_BASE_PATH/rt_server" "backend=test_backend"

0 commit comments

Comments
 (0)