@@ -19,19 +19,23 @@ load '../../libs/dataplaneapi'
19
19
load ' ../../libs/get_json_path'
20
20
load ' ../../libs/resource_client'
21
21
load ' ../../libs/version'
22
+ load ' ../../libs/haproxy_version'
22
23
23
24
load ' utils/_helpers'
24
25
25
26
@test " rings: Add a ring" {
26
- if haproxy_version_ge " 2.1 "
27
+ if haproxy_version_ge " 2.2 "
27
28
then
28
29
resource_post " $_RING_BASE_PATH " " data/post.json" " force_reload=true"
29
30
assert_equal " $SC " " 201"
31
+
32
+ resource_post " $_RING_BASE_PATH " " data/post-ring2.json" " force_reload=true"
33
+ assert_equal " $SC " " 201"
30
34
fi
31
35
}
32
36
33
37
@test " rings: Return a ring" {
34
- if haproxy_version_ge " 2.1 "
38
+ if haproxy_version_ge " 2.2 "
35
39
then
36
40
resource_get " $_RING_BASE_PATH /test_ring"
37
41
assert_equal " $SC " 200
@@ -40,24 +44,25 @@ load 'utils/_helpers'
40
44
}
41
45
42
46
@test " rings: Replace a ring" {
43
- if haproxy_version_ge " 2.1 "
47
+ if haproxy_version_ge " 2.2 "
44
48
then
45
49
resource_put " $_RING_BASE_PATH /test_ring" " data/put.json" " force_reload=true"
46
50
assert_equal " $SC " 200
47
51
fi
48
52
}
49
53
50
54
@test " rings: Return an array of rings" {
51
- if haproxy_version_ge " 2.1 "
55
+ if haproxy_version_ge " 2.2 "
52
56
then
53
57
resource_get " $_RING_BASE_PATH "
54
58
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"
56
61
fi
57
62
}
58
63
59
64
@test " rings: Delete a ring" {
60
- if haproxy_version_ge " 2.1 "
65
+ if haproxy_version_ge " 2.2 "
61
66
then
62
67
resource_delete " $_RING_BASE_PATH /test_ring" " force_reload=true"
63
68
assert_equal " $SC " 204
0 commit comments