Skip to content

Commit 411486b

Browse files
committed
create backend service before VS, log VS conf
Signed-off-by: Haywood Shannon <[email protected]> Signed-off-by: Haywood Shannon <[email protected]>
1 parent 206edbc commit 411486b

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

tests/suite/test_virtual_server_foreign_upstream.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
delete_items_from_yaml,
99
delete_namespace,
1010
wait_before_test,
11-
wait_until_all_pods_are_ready,
11+
wait_until_all_pods_are_ready, get_first_pod_name,
1212
)
1313
from suite.utils.vs_vsr_resources_utils import (
1414
create_v_s_route_from_yaml,
1515
create_virtual_server_from_yaml,
1616
delete_v_s_route,
1717
delete_virtual_server,
18-
patch_virtual_server_from_yaml,
18+
patch_virtual_server_from_yaml, get_vs_nginx_template_conf,
1919
)
2020
from suite.utils.yaml_utils import (
2121
get_first_host_from_yaml,
@@ -58,14 +58,15 @@ def virtual_server_foreign_upstream_app_setup(
5858
else test_namespace
5959
)
6060
print("------------------------- Deploy Virtual Server Example -----------------------------------")
61-
vs_name = create_virtual_server_from_yaml(kube_apis.custom_objects, vs_source, test_namespace)
62-
vs_host = get_first_host_from_yaml(vs_source)
63-
vs_paths = get_paths_from_vs_yaml(vs_source)
6461
create_items_from_yaml(kube_apis, f"{TEST_DATA}/common/app/{request.param['app_type']}/backend1.yaml", ns_1)
6562
create_items_from_yaml(kube_apis, f"{TEST_DATA}/common/app/{request.param['app_type']}/backend2.yaml", ns_2)
6663

6764
wait_until_all_pods_are_ready(kube_apis.v1, ns_1)
6865
wait_until_all_pods_are_ready(kube_apis.v1, ns_2)
66+
67+
vs_name = create_virtual_server_from_yaml(kube_apis.custom_objects, vs_source, test_namespace)
68+
vs_host = get_first_host_from_yaml(vs_source)
69+
vs_paths = get_paths_from_vs_yaml(vs_source)
6970

7071
def fin():
7172
if request.config.getoption("--skip-fixture-teardown") == "no":
@@ -106,8 +107,17 @@ def fin():
106107
indirect=True,
107108
)
108109
class TestVirtualServerForeignUpstream:
109-
def test_responses_after_setup(self, kube_apis, crd_ingress_controller, virtual_server_foreign_upstream_app_setup):
110+
def test_responses_after_setup(self, kube_apis,ingress_controller_prerequisites, crd_ingress_controller, virtual_server_foreign_upstream_app_setup):
110111
print(f"\nStep 1: initial check")
112+
ic_pod_name = get_first_pod_name(kube_apis.v1, ingress_controller_prerequisites.namespace)
113+
# log VS conf
114+
get_vs_nginx_template_conf(
115+
kube_apis.v1,
116+
virtual_server_foreign_upstream_app_setup.namespace,
117+
virtual_server_foreign_upstream_app_setup.vs_name,
118+
ic_pod_name,
119+
ingress_controller_prerequisites.namespace,
120+
)
111121
wait_before_test()
112122
wait_and_assert_status_code(
113123
200,

0 commit comments

Comments
 (0)