|
8 | 8 | delete_items_from_yaml, |
9 | 9 | delete_namespace, |
10 | 10 | wait_before_test, |
11 | | - wait_until_all_pods_are_ready, |
| 11 | + wait_until_all_pods_are_ready, get_first_pod_name, |
12 | 12 | ) |
13 | 13 | from suite.utils.vs_vsr_resources_utils import ( |
14 | 14 | create_v_s_route_from_yaml, |
15 | 15 | create_virtual_server_from_yaml, |
16 | 16 | delete_v_s_route, |
17 | 17 | delete_virtual_server, |
18 | | - patch_virtual_server_from_yaml, |
| 18 | + patch_virtual_server_from_yaml, get_vs_nginx_template_conf, |
19 | 19 | ) |
20 | 20 | from suite.utils.yaml_utils import ( |
21 | 21 | get_first_host_from_yaml, |
@@ -58,14 +58,15 @@ def virtual_server_foreign_upstream_app_setup( |
58 | 58 | else test_namespace |
59 | 59 | ) |
60 | 60 | 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) |
64 | 61 | create_items_from_yaml(kube_apis, f"{TEST_DATA}/common/app/{request.param['app_type']}/backend1.yaml", ns_1) |
65 | 62 | create_items_from_yaml(kube_apis, f"{TEST_DATA}/common/app/{request.param['app_type']}/backend2.yaml", ns_2) |
66 | 63 |
|
67 | 64 | wait_until_all_pods_are_ready(kube_apis.v1, ns_1) |
68 | 65 | 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) |
69 | 70 |
|
70 | 71 | def fin(): |
71 | 72 | if request.config.getoption("--skip-fixture-teardown") == "no": |
@@ -106,8 +107,17 @@ def fin(): |
106 | 107 | indirect=True, |
107 | 108 | ) |
108 | 109 | 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): |
110 | 111 | 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 | + ) |
111 | 121 | wait_before_test() |
112 | 122 | wait_and_assert_status_code( |
113 | 123 | 200, |
|
0 commit comments