Skip to content

Commit d4475ab

Browse files
author
Pratik Mohanty
committed
BUG/MINOR: resolve-net, resolve_opt: e2e tests to allow comma separated list of arguments
1 parent 866fa44 commit d4475ab

File tree

9 files changed

+24
-12
lines changed

9 files changed

+24
-12
lines changed

‎e2e/tests/servers/data/haproxy.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ backend test_backend
3333
server server_02 10.1.1.2:8080 check weight 80
3434
server server_03 10.1.1.2:8080 check weight 80
3535
server server_ipv6 [fd00:6:48:c85:deb:f:62:4]:80 check
36+
server server_04 192.168.1.1:80 check resolve-opts allow-dup-ip,ignore-weight resolve-net 10.0.0.0/8,10.200.200.0/12

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
"check": "enabled",
44
"name": "test_server",
55
"port": 8080,
6-
"weight": 80
6+
"weight": 80,
7+
"resolve-net": "10.0.0.0/8,10.200.200.0/12",
8+
"resolve_opts": "allow-dup-ip,ignore-weight"
79
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"check": "enabled",
3+
"resolve-net": "10.0.0.0/8",
4+
"resolve_opts": "allow-dup-ip",
35
"weight": 10,
46
"address": "10.1.1.2",
57
"name": "server_01",

‎e2e/tests/servers/delete.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ load '../../libs/version'
2424
load 'utils/_helpers'
2525

2626
@test "servers: Delete a server" {
27-
for name in "server_01" "server_02" "server_03"; do
27+
for name in "server_01" "server_02" "server_03" "server_04"; do
2828
resource_delete "$_SERVER_BASE_PATH/$name" "backend=test_backend&force_reload=true"
2929
assert_equal "$SC" 204
3030
done

‎e2e/tests/servers/list.bats

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,16 @@ load 'utils/_helpers'
2727
resource_get "$_SERVER_BASE_PATH" "backend=test_backend"
2828
assert_equal "$SC" 200
2929

30-
assert_equal "$(get_json_path "$BODY" ".data | length")" "4"
30+
assert_equal "$(get_json_path "$BODY" ".data | length")" "5"
3131

32-
for name in "server_01" "server_02" "server_03" "server_ipv6"; do
32+
INDEX=0
33+
for name in "server_01" "server_02" "server_03" "server_ipv6" "server_04"; do
3334
assert_equal "$(get_json_path "$BODY" ".data[] | select(.name | contains(\"$name\") ).name")" "$name"
35+
if [[ "$(get_json_path "$BODY" ".data[] | select(.name | contains(\"$name\") ).name")" == "server_04" ]]; then
36+
assert_equal "$(get_json_path "$BODY" ".data[${INDEX}].check")" "enabled"
37+
assert_equal "$(get_json_path "$BODY" ".data[${INDEX}].resolve_opts")" "allow-dup-ip,ignore-weight"
38+
assert_equal "$(get_json_path "$BODY" ".data[${INDEX}].\"resolve-net\"")" "10.0.0.0/8,10.200.200.0/12"
39+
fi
40+
let INDEX=${INDEX}+1
3441
done
3542
}

‎e2e/tests/servers/runtime.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ load 'utils/_helpers'
2828
resource_get "$_RUNTIME_SERVER_BASE_PATH" "backend=test_backend"
2929
assert_equal "$SC" 200
3030

31-
for name in "server_01" "server_02" "server_03"; do
31+
for name in "server_01" "server_02" "server_03" "server_04"; do
3232
assert_equal "$(get_json_path "$BODY" ".[] | select(.name | contains(\"$name\") ).name")" "$name"
3333
done
3434
}

‎embedded_spec.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/go-openapi/validate v0.22.1
2323
github.com/google/renameio v1.0.1
2424
github.com/google/uuid v1.3.0
25-
github.com/haproxytech/client-native/v4 v4.0.1-0.20230327132034-ce7b07121ce1
25+
github.com/haproxytech/client-native/v4 v4.0.1-0.20230404170020-c8efd6bfd251
2626
github.com/haproxytech/config-parser/v4 v4.1.1-0.20230323005458-ade5d7ce668f
2727
github.com/hashicorp/hcl v1.0.0
2828
github.com/jessevdk/go-flags v1.5.0

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
131131
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
132132
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
133133
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
134-
github.com/haproxytech/client-native/v4 v4.0.1-0.20230327132034-ce7b07121ce1 h1:UJFsa6gx4pH2nSvdijuRrisX/J5Jlk1qT/foyi0+FZQ=
135-
github.com/haproxytech/client-native/v4 v4.0.1-0.20230327132034-ce7b07121ce1/go.mod h1:jD5RNvC81D3t45c489/uhyMJzZi5FgRlXI0l8BUC370=
134+
github.com/haproxytech/client-native/v4 v4.0.1-0.20230404170020-c8efd6bfd251 h1:fZnUtMJYi7mxOAIDM7EpAbUG429QtqnZuPaLUDqZw6g=
135+
github.com/haproxytech/client-native/v4 v4.0.1-0.20230404170020-c8efd6bfd251/go.mod h1:v2Iw0UG41orqpjrAGMIhjt5iRkaWOCGFfcO+E1cwJpE=
136136
github.com/haproxytech/config-parser/v4 v4.1.1-0.20230323005458-ade5d7ce668f h1:xYqVabNdwLs210sqVKio01tj6n8ZoeZmqgalHvkRyb8=
137137
github.com/haproxytech/config-parser/v4 v4.1.1-0.20230323005458-ade5d7ce668f/go.mod h1:jAm9BC3F7BUveSA2lcQUkUe9tj75N0CmKRNeRvM97uo=
138138
github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=

0 commit comments

Comments
 (0)