@@ -19,19 +19,23 @@ load '../../libs/dataplaneapi'
1919load ' ../../libs/get_json_path'
2020load ' ../../libs/resource_client'
2121load ' ../../libs/version'
22+ load ' ../../libs/haproxy_version'
2223
2324load ' utils/_helpers'
2425
2526@test " rings: Add a ring" {
26- if haproxy_version_ge " 2.1 "
27+ if haproxy_version_ge " 2.2 "
2728 then
2829 resource_post " $_RING_BASE_PATH " " data/post.json" " force_reload=true"
2930 assert_equal " $SC " " 201"
31+
32+ resource_post " $_RING_BASE_PATH " " data/post-ring2.json" " force_reload=true"
33+ assert_equal " $SC " " 201"
3034 fi
3135}
3236
3337@test " rings: Return a ring" {
34- if haproxy_version_ge " 2.1 "
38+ if haproxy_version_ge " 2.2 "
3539 then
3640 resource_get " $_RING_BASE_PATH /test_ring"
3741 assert_equal " $SC " 200
@@ -40,24 +44,25 @@ load 'utils/_helpers'
4044}
4145
4246@test " rings: Replace a ring" {
43- if haproxy_version_ge " 2.1 "
47+ if haproxy_version_ge " 2.2 "
4448 then
4549 resource_put " $_RING_BASE_PATH /test_ring" " data/put.json" " force_reload=true"
4650 assert_equal " $SC " 200
4751 fi
4852}
4953
5054@test " rings: Return an array of rings" {
51- if haproxy_version_ge " 2.1 "
55+ if haproxy_version_ge " 2.2 "
5256 then
5357 resource_get " $_RING_BASE_PATH "
5458 assert_equal " $SC " 200
55- assert_equal " test_ring" " $( get_json_path " $BODY " ' .data[0].name' ) "
59+ assert_equal " $( get_json_path " $BODY " " .data | length" ) " 2
60+ assert_equal " $( get_json_path " $BODY " " .data[] | select(.name | contains(\" test_ring_2\" ) ).name" ) " " test_ring_2"
5661 fi
5762}
5863
5964@test " rings: Delete a ring" {
60- if haproxy_version_ge " 2.1 "
65+ if haproxy_version_ge " 2.2 "
6166 then
6267 resource_delete " $_RING_BASE_PATH /test_ring" " force_reload=true"
6368 assert_equal " $SC " 204
0 commit comments