Skip to content

Commit 41e123e

Browse files
hdurand0710oktalz
hdurand0710
authored and
oktalz
committed
CLEANUP/MINOR: in all integration test, backend expectations are named yaml files, but the content was json
Fix this to set a proper content as yaml.
1 parent a7d0654 commit 41e123e

25 files changed

Lines changed: 500 additions & 694 deletions

File tree

‎test/integration/httproute/manifests/backend-crd/basic/expectations/backends/hug_e2e-tests-httproute_http-echo_80_ef84fba452b3f62faf235c47b46c1e54.yaml‎

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,28 @@
1-
{
2-
"abortonclose": "disabled",
3-
"balance": {
4-
"algorithm": "roundrobin"
5-
},
6-
"default_server": {
7-
"check": "enabled"
8-
},
9-
"forwardfor": {
10-
"enabled": "enabled"
11-
},
12-
"from": "haproxytech",
13-
"metadata": {
14-
"hug": {
15-
"HTTPRoute": {
16-
"e2e-tests-httproute/route-echo-backend-cr-basic": {
17-
"Generation": 1,
18-
"LinkID": "hug"
19-
}
20-
}
21-
}
22-
},
23-
"mode": "http",
24-
"name": "hug_e2e-tests-httproute_http-echo_80_ef84fba452b3f62faf235c47b46c1e54",
25-
"server_timeout": 70000,
26-
"http_request_rule_list": [
27-
{
28-
"cond": "unless",
29-
"cond_test": "{ src 192.168.1.0/16 }",
30-
"hdr_format": "%T",
31-
"hdr_name": "X-Haproxy-Current-Date",
32-
"type": "add-header"
33-
},
34-
{
35-
"cond": "unless",
36-
"cond_test": "{ src 192.168.1.0/16 }",
37-
"hdr_format": "%[ssl_fc]",
38-
"hdr_name": "X_Is_Secure",
39-
"type": "add-header"
40-
}
41-
]
42-
}
1+
abortonclose: disabled
2+
balance:
3+
algorithm: roundrobin
4+
default_server:
5+
check: enabled
6+
forwardfor:
7+
enabled: enabled
8+
from: haproxytech
9+
metadata:
10+
hug:
11+
HTTPRoute:
12+
e2e-tests-httproute/route-echo-backend-cr-basic:
13+
Generation: 1
14+
LinkID: hug
15+
mode: http
16+
name: hug_e2e-tests-httproute_http-echo_80_ef84fba452b3f62faf235c47b46c1e54
17+
server_timeout: 70000
18+
http_request_rule_list:
19+
- cond: unless
20+
cond_test: '{ src 192.168.1.0/16 }'
21+
hdr_format: '%T'
22+
hdr_name: X-Haproxy-Current-Date
23+
type: add-header
24+
- cond: unless
25+
cond_test: '{ src 192.168.1.0/16 }'
26+
hdr_format: '%[ssl_fc]'
27+
hdr_name: X_Is_Secure
28+
type: add-header

‎test/integration/httproute/manifests/backend-crd/extended/expectations/backends/hug_e2e-tests-httproute_http-echo_80_870306e1a7d334a1eceb23475e6075aa.yaml‎

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,21 @@
1-
{
2-
"abortonclose": "disabled",
3-
"balance": {
4-
"algorithm": "roundrobin"
5-
},
6-
"default_server": {
7-
"check": "enabled"
8-
},
9-
"forwardfor": {
10-
"enabled": "enabled"
11-
},
12-
"from": "haproxytech",
13-
"metadata": {
14-
"hug": {
15-
"HTTPRoute": {
16-
"e2e-tests-httproute/route-echo-backend-cr-basic": {
17-
"Generation": 1,
18-
"LinkID": "hug"
19-
}
20-
}
21-
}
22-
},
23-
"mode": "http",
24-
"name": "hug_e2e-tests-httproute_http-echo_80_870306e1a7d334a1eceb23475e6075aa",
25-
"server_timeout": 70000,
26-
"http_request_rule_list": [
27-
{
28-
"hdr_format": "Staging",
29-
"hdr_name": "X-Environment",
30-
"type": "add-header"
31-
}
32-
]
33-
}
1+
abortonclose: disabled
2+
balance:
3+
algorithm: roundrobin
4+
default_server:
5+
check: enabled
6+
forwardfor:
7+
enabled: enabled
8+
from: haproxytech
9+
metadata:
10+
hug:
11+
HTTPRoute:
12+
e2e-tests-httproute/route-echo-backend-cr-basic:
13+
Generation: 1
14+
LinkID: hug
15+
mode: http
16+
name: hug_e2e-tests-httproute_http-echo_80_870306e1a7d334a1eceb23475e6075aa
17+
server_timeout: 70000
18+
http_request_rule_list:
19+
- hdr_format: Staging
20+
hdr_name: X-Environment
21+
type: add-header

‎test/integration/httproute/manifests/backends/1_route/expectations/backends/hug_e2e-tests-httproute_http-echo-1_80__.yaml‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
1-
{
2-
"from": "haproxytech",
3-
"metadata": {
4-
"hug": {
5-
"HTTPRoute": {
6-
"e2e-tests-httproute/route-echo-1": {
7-
"Generation": 1,
8-
"LinkID": "hug"
9-
}
10-
}
11-
}
12-
},
13-
"mode": "http",
14-
"name": "hug_e2e-tests-httproute_http-echo-1_80__",
15-
"abortonclose": "disabled",
16-
"balance": {
17-
"algorithm": "roundrobin"
18-
},
19-
"default_server": {
20-
"check": "enabled"
21-
},
22-
"forwardfor": {
23-
"enabled": "enabled"
24-
},
25-
"server_timeout": 50000
26-
}
1+
from: haproxytech
2+
metadata:
3+
hug:
4+
HTTPRoute:
5+
e2e-tests-httproute/route-echo-1:
6+
Generation: 1
7+
LinkID: hug
8+
mode: http
9+
name: hug_e2e-tests-httproute_http-echo-1_80__
10+
abortonclose: disabled
11+
balance:
12+
algorithm: roundrobin
13+
default_server:
14+
check: enabled
15+
forwardfor:
16+
enabled: enabled
17+
server_timeout: 50000

‎test/integration/httproute/manifests/backends/1_route/expectations/backends/hug_e2e-tests-httproute_http-echo-2_80__.yaml‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
1-
{
2-
"from": "haproxytech",
3-
"metadata": {
4-
"hug": {
5-
"HTTPRoute": {
6-
"e2e-tests-httproute/route-echo-1": {
7-
"Generation": 1,
8-
"LinkID": "hug"
9-
}
10-
}
11-
}
12-
},
13-
"mode": "http",
14-
"name": "hug_e2e-tests-httproute_http-echo-2_80__",
15-
"abortonclose": "disabled",
16-
"balance": {
17-
"algorithm": "roundrobin"
18-
},
19-
"default_server": {
20-
"check": "enabled"
21-
},
22-
"forwardfor": {
23-
"enabled": "enabled"
24-
},
25-
"server_timeout": 50000
26-
}
1+
from: haproxytech
2+
metadata:
3+
hug:
4+
HTTPRoute:
5+
e2e-tests-httproute/route-echo-1:
6+
Generation: 1
7+
LinkID: hug
8+
mode: http
9+
name: hug_e2e-tests-httproute_http-echo-2_80__
10+
abortonclose: disabled
11+
balance:
12+
algorithm: roundrobin
13+
default_server:
14+
check: enabled
15+
forwardfor:
16+
enabled: enabled
17+
server_timeout: 50000

‎test/integration/httproute/manifests/backends/1_route/expectations/backends/hug_e2e-tests-httproute_http-echo-3_80__.yaml‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
1-
{
2-
"from": "haproxytech",
3-
"metadata": {
4-
"hug": {
5-
"HTTPRoute": {
6-
"e2e-tests-httproute/route-echo-1": {
7-
"Generation": 1,
8-
"LinkID": "hug"
9-
}
10-
}
11-
}
12-
},
13-
"mode": "http",
14-
"name": "hug_e2e-tests-httproute_http-echo-3_80__",
15-
"abortonclose": "disabled",
16-
"balance": {
17-
"algorithm": "roundrobin"
18-
},
19-
"default_server": {
20-
"check": "enabled"
21-
},
22-
"forwardfor": {
23-
"enabled": "enabled"
24-
},
25-
"server_timeout": 50000
26-
}
1+
from: haproxytech
2+
metadata:
3+
hug:
4+
HTTPRoute:
5+
e2e-tests-httproute/route-echo-1:
6+
Generation: 1
7+
LinkID: hug
8+
mode: http
9+
name: hug_e2e-tests-httproute_http-echo-3_80__
10+
abortonclose: disabled
11+
balance:
12+
algorithm: roundrobin
13+
default_server:
14+
check: enabled
15+
forwardfor:
16+
enabled: enabled
17+
server_timeout: 50000

‎test/integration/httproute/manifests/backends/1_route/expectations/backends/v2/hug_e2e-tests-httproute_http-echo-1_80__.yaml‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
1-
{
2-
"from": "haproxytech",
3-
"metadata": {
4-
"hug": {
5-
"HTTPRoute": {
6-
"e2e-tests-httproute/route-echo-1": {
7-
"Generation": 2,
8-
"LinkID": "hug"
9-
}
10-
}
11-
}
12-
},
13-
"mode": "http",
14-
"name": "hug_e2e-tests-httproute_http-echo-1_80__",
15-
"abortonclose": "disabled",
16-
"balance": {
17-
"algorithm": "roundrobin"
18-
},
19-
"default_server": {
20-
"check": "enabled"
21-
},
22-
"forwardfor": {
23-
"enabled": "enabled"
24-
},
25-
"server_timeout": 50000
26-
}
1+
from: haproxytech
2+
metadata:
3+
hug:
4+
HTTPRoute:
5+
e2e-tests-httproute/route-echo-1:
6+
Generation: 2
7+
LinkID: hug
8+
mode: http
9+
name: hug_e2e-tests-httproute_http-echo-1_80__
10+
abortonclose: disabled
11+
balance:
12+
algorithm: roundrobin
13+
default_server:
14+
check: enabled
15+
forwardfor:
16+
enabled: enabled
17+
server_timeout: 50000

‎test/integration/httproute/manifests/backends/1_route/expectations/backends/v2/hug_e2e-tests-httproute_http-echo-3_80__.yaml‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
1-
{
2-
"from": "haproxytech",
3-
"metadata": {
4-
"hug": {
5-
"HTTPRoute": {
6-
"e2e-tests-httproute/route-echo-1": {
7-
"Generation": 2,
8-
"LinkID": "hug"
9-
}
10-
}
11-
}
12-
},
13-
"mode": "http",
14-
"name": "hug_e2e-tests-httproute_http-echo-3_80__",
15-
"abortonclose": "disabled",
16-
"balance": {
17-
"algorithm": "roundrobin"
18-
},
19-
"default_server": {
20-
"check": "enabled"
21-
},
22-
"forwardfor": {
23-
"enabled": "enabled"
24-
},
25-
"server_timeout": 50000
26-
}
1+
from: haproxytech
2+
metadata:
3+
hug:
4+
HTTPRoute:
5+
e2e-tests-httproute/route-echo-1:
6+
Generation: 2
7+
LinkID: hug
8+
mode: http
9+
name: hug_e2e-tests-httproute_http-echo-3_80__
10+
abortonclose: disabled
11+
balance:
12+
algorithm: roundrobin
13+
default_server:
14+
check: enabled
15+
forwardfor:
16+
enabled: enabled
17+
server_timeout: 50000

‎test/integration/httproute/manifests/backends/1_route_1_backend/expectations/backends/hug_e2e-tests-httproute_http-echo-1_80__.yaml‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
1-
{
2-
"from": "haproxytech",
3-
"metadata": {
4-
"hug": {
5-
"HTTPRoute": {
6-
"e2e-tests-httproute/route-echo-1": {
7-
"Generation": 1,
8-
"LinkID": "hug"
9-
}
10-
}
11-
}
12-
},
13-
"mode": "http",
14-
"name": "hug_e2e-tests-httproute_http-echo-1_80__",
15-
"abortonclose": "disabled",
16-
"balance": {
17-
"algorithm": "roundrobin"
18-
},
19-
"default_server": {
20-
"check": "enabled"
21-
},
22-
"forwardfor": {
23-
"enabled": "enabled"
24-
},
25-
"server_timeout": 50000
26-
}
1+
from: haproxytech
2+
metadata:
3+
hug:
4+
HTTPRoute:
5+
e2e-tests-httproute/route-echo-1:
6+
Generation: 1
7+
LinkID: hug
8+
mode: http
9+
name: hug_e2e-tests-httproute_http-echo-1_80__
10+
abortonclose: disabled
11+
balance:
12+
algorithm: roundrobin
13+
default_server:
14+
check: enabled
15+
forwardfor:
16+
enabled: enabled
17+
server_timeout: 50000

0 commit comments

Comments
 (0)