Skip to content

Commit c35b93f

Browse files
lidizhenglidizheng
authored
Revert "Add api listener test for k8s (grpc#27534)" (grpc#28719)
This reverts commit b4b6862.
1 parent ae810df commit c35b93f

6 files changed

Lines changed: 20 additions & 263 deletions

File tree

‎tools/internal_ci/linux/grpc_xds_k8s_lb.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ main() {
155155
cd "${TEST_DRIVER_FULL_DIR}"
156156
local failed_tests=0
157157
run_alpha_test subsetting_test || (( failed_tests++ ))
158-
test_suites=("api_listener_test" "change_backend_service_test" "failover_test" "remove_neg_test" "round_robin_test" "affinity_test")
158+
test_suites=("change_backend_service_test" "failover_test" "remove_neg_test" "round_robin_test" "affinity_test")
159159
for test in "${test_suites[@]}"; do
160160
run_test $test || (( failed_tests++ ))
161161
done

‎tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ main() {
148148
# Run tests
149149
cd "${TEST_DRIVER_FULL_DIR}"
150150
local failed_tests=0
151-
test_suites=("api_listener_test" "change_backend_service_test" "failover_test" "remove_neg_test" "round_robin_test")
151+
test_suites=("change_backend_service_test" "failover_test" "remove_neg_test" "round_robin_test")
152152
for test in "${test_suites[@]}"; do
153153
run_test $test || (( failed_tests++ ))
154154
done

‎tools/run_tests/xds_k8s_test_driver/framework/infrastructure/gcp/compute.py‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -219,14 +219,12 @@ def create_target_grpc_proxy(
219219
self,
220220
name: str,
221221
url_map: GcpResource,
222-
validate_for_proxyless: bool = True,
223222
) -> GcpResource:
224-
return self._insert_resource(
225-
self.api.targetGrpcProxies(), {
226-
'name': name,
227-
'url_map': url_map.url,
228-
'validate_for_proxyless': validate_for_proxyless,
229-
})
223+
return self._insert_resource(self.api.targetGrpcProxies(), {
224+
'name': name,
225+
'url_map': url_map.url,
226+
'validate_for_proxyless': True,
227+
})
230228

231229
def delete_target_grpc_proxy(self, name):
232230
self._delete_resource(self.api.targetGrpcProxies(), 'targetGrpcProxy',
@@ -246,21 +244,21 @@ def delete_target_http_proxy(self, name):
246244
self._delete_resource(self.api.targetHttpProxies(), 'targetHttpProxy',
247245
name)
248246

249-
def create_forwarding_rule(self,
250-
name: str,
251-
src_port: int,
252-
target_proxy: GcpResource,
253-
network_url: str,
254-
*,
255-
ip_address: str = '0.0.0.0') -> GcpResource:
247+
def create_forwarding_rule(
248+
self,
249+
name: str,
250+
src_port: int,
251+
target_proxy: GcpResource,
252+
network_url: str,
253+
) -> GcpResource:
256254
return self._insert_resource(
257255
self.api.globalForwardingRules(),
258256
{
259257
'name': name,
260258
'loadBalancingScheme':
261259
'INTERNAL_SELF_MANAGED', # Traffic Director
262260
'portRange': src_port,
263-
'IPAddress': ip_address,
261+
'IPAddress': '0.0.0.0',
264262
'network': network_url,
265263
'target': target_proxy.url,
266264
})

‎tools/run_tests/xds_k8s_test_driver/framework/infrastructure/traffic_director.py‎

Lines changed: 5 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,9 @@ class TrafficDirectorManager:
5656
AFFINITY_BACKEND_SERVICE_NAME = "backend-service-affinity"
5757
HEALTH_CHECK_NAME = "health-check"
5858
URL_MAP_NAME = "url-map"
59-
ALTERNATIVE_URL_MAP_NAME = "url-map-alt"
6059
URL_MAP_PATH_MATCHER_NAME = "path-matcher"
6160
TARGET_PROXY_NAME = "target-proxy"
62-
ALTERNATIVE_TARGET_PROXY_NAME = "target-proxy-alt"
6361
FORWARDING_RULE_NAME = "forwarding-rule"
64-
ALTERNATIVE_FORWARDING_RULE_NAME = "forwarding-rule-alt"
6562
FIREWALL_RULE_NAME = "allow-health-checks"
6663

6764
def __init__(
@@ -91,14 +88,11 @@ def __init__(
9188
# TODO(sergiitk): remove this flag once backend service resource loaded
9289
self.backend_service_protocol: Optional[BackendServiceProtocol] = None
9390
self.url_map: Optional[GcpResource] = None
94-
self.alternative_url_map: Optional[GcpResource] = None
9591
self.firewall_rule: Optional[GcpResource] = None
9692
self.target_proxy: Optional[GcpResource] = None
9793
# TODO(sergiitk): remove this flag once target proxy resource loaded
9894
self.target_proxy_is_http: bool = False
99-
self.alternative_target_proxy: Optional[GcpResource] = None
10095
self.forwarding_rule: Optional[GcpResource] = None
101-
self.alternative_forwarding_rule: Optional[GcpResource] = None
10296
self.backends: Set[ZonalGcpResource] = set()
10397
self.alternative_backend_service: Optional[GcpResource] = None
10498
# TODO(sergiitk): remove this flag once backend service resource loaded
@@ -142,12 +136,9 @@ def setup_routing_rule_map_for_grpc(self, service_host, service_port):
142136
def cleanup(self, *, force=False):
143137
# Cleanup in the reverse order of creation
144138
self.delete_forwarding_rule(force=force)
145-
self.delete_alternative_forwarding_rule(force=force)
146139
self.delete_target_http_proxy(force=force)
147140
self.delete_target_grpc_proxy(force=force)
148-
self.delete_alternative_target_grpc_proxy(force=force)
149141
self.delete_url_map(force=force)
150-
self.delete_alternative_url_map(force=force)
151142
self.delete_backend_service(force=force)
152143
self.delete_alternative_backend_service(force=force)
153144
self.delete_affinity_backend_service(force=force)
@@ -408,7 +399,11 @@ def _generate_url_map_body(
408399
}],
409400
}
410401

411-
def create_url_map(self, src_host: str, src_port: int) -> GcpResource:
402+
def create_url_map(
403+
self,
404+
src_host: str,
405+
src_port: int,
406+
) -> GcpResource:
412407
src_address = f'{src_host}:{src_port}'
413408
name = self.make_resource_name(self.URL_MAP_NAME)
414409
matcher_name = self.make_resource_name(self.URL_MAP_PATH_MATCHER_NAME)
@@ -449,35 +444,6 @@ def delete_url_map(self, force=False):
449444
self.compute.delete_url_map(name)
450445
self.url_map = None
451446

452-
def create_alternative_url_map(
453-
self,
454-
src_host: str,
455-
src_port: int,
456-
backend_service: Optional[GcpResource] = None) -> GcpResource:
457-
name = self.make_resource_name(self.ALTERNATIVE_URL_MAP_NAME)
458-
src_address = f'{src_host}:{src_port}'
459-
matcher_name = self.make_resource_name(self.URL_MAP_PATH_MATCHER_NAME)
460-
if backend_service is None:
461-
backend_service = self.alternative_backend_service
462-
logger.info('Creating alternative URL map "%s": %s -> %s', name,
463-
src_address, backend_service.name)
464-
resource = self.compute.create_url_map_with_content(
465-
self._generate_url_map_body(name, matcher_name, [src_address],
466-
backend_service))
467-
self.alternative_url_map = resource
468-
return resource
469-
470-
def delete_alternative_url_map(self, force=False):
471-
if force:
472-
name = self.make_resource_name(self.ALTERNATIVE_URL_MAP_NAME)
473-
elif self.alternative_url_map:
474-
name = self.alternative_url_map.name
475-
else:
476-
return
477-
logger.info('Deleting alternative URL Map "%s"', name)
478-
self.compute.delete_url_map(name)
479-
self.url_map = None
480-
481447
def create_target_proxy(self):
482448
name = self.make_resource_name(self.TARGET_PROXY_NAME)
483449
if self.backend_service_protocol is BackendServiceProtocol.GRPC:
@@ -519,28 +485,6 @@ def delete_target_http_proxy(self, force=False):
519485
self.target_proxy = None
520486
self.target_proxy_is_http = False
521487

522-
def create_alternative_target_proxy(self):
523-
name = self.make_resource_name(self.ALTERNATIVE_TARGET_PROXY_NAME)
524-
if self.backend_service_protocol is BackendServiceProtocol.GRPC:
525-
logger.info(
526-
'Creating alternative target GRPC proxy "%s" to URL map %s',
527-
name, self.alternative_url_map.name)
528-
self.alternative_target_proxy = self.compute.create_target_grpc_proxy(
529-
name, self.alternative_url_map, False)
530-
else:
531-
raise TypeError('Unexpected backend service protocol')
532-
533-
def delete_alternative_target_grpc_proxy(self, force=False):
534-
if force:
535-
name = self.make_resource_name(self.ALTERNATIVE_TARGET_PROXY_NAME)
536-
elif self.alternative_target_proxy:
537-
name = self.alternative_target_proxy.name
538-
else:
539-
return
540-
logger.info('Deleting alternative Target GRPC proxy "%s"', name)
541-
self.compute.delete_target_grpc_proxy(name)
542-
self.alternative_target_proxy = None
543-
544488
def find_unused_forwarding_rule_port(
545489
self,
546490
*,
@@ -577,36 +521,6 @@ def delete_forwarding_rule(self, force=False):
577521
self.compute.delete_forwarding_rule(name)
578522
self.forwarding_rule = None
579523

580-
def create_alternative_forwarding_rule(self,
581-
src_port: int,
582-
ip_address='0.0.0.0'):
583-
name = self.make_resource_name(self.ALTERNATIVE_FORWARDING_RULE_NAME)
584-
src_port = int(src_port)
585-
logging.info(
586-
'Creating alternative forwarding rule "%s" in network "%s": %s:%s -> %s',
587-
name, self.network, ip_address, src_port,
588-
self.alternative_target_proxy.url)
589-
resource = self.compute.create_forwarding_rule(
590-
name,
591-
src_port,
592-
self.alternative_target_proxy,
593-
self.network_url,
594-
ip_address=ip_address)
595-
self.alternative_forwarding_rule = resource
596-
return resource
597-
598-
def delete_alternative_forwarding_rule(self, force=False):
599-
if force:
600-
name = self.make_resource_name(
601-
self.ALTERNATIVE_FORWARDING_RULE_NAME)
602-
elif self.alternative_forwarding_rule:
603-
name = self.alternative_forwarding_rule.name
604-
else:
605-
return
606-
logger.info('Deleting alternative Forwarding rule "%s"', name)
607-
self.compute.delete_forwarding_rule(name)
608-
self.alternative_forwarding_rule = None
609-
610524
def create_firewall_rule(self, allowed_ports: List[str]):
611525
name = self.make_resource_name(self.FIREWALL_RULE_NAME)
612526
logging.info(

‎tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -350,55 +350,6 @@ def assertXdsConfigExists(self, test_client: XdsTestClient):
350350
json_format.MessageToJson(config, indent=2))
351351
self.assertSameElements(want, seen)
352352

353-
@staticmethod
354-
def getRouteConfigVersion(test_client: XdsTestClient) -> Optional[str]:
355-
config = test_client.csds.fetch_client_status(log_level=logging.INFO)
356-
route_config_version = None
357-
for xds_config in config.xds_config:
358-
if xds_config.WhichOneof('per_xds_config') == "route_config":
359-
route_config = xds_config.route_config
360-
logger.info('Route config found: %s',
361-
json_format.MessageToJson(route_config, indent=2))
362-
route_config_version = route_config.dynamic_route_configs[
363-
0].version_info
364-
logger.info('found routing config version: %s',
365-
route_config_version)
366-
break
367-
return route_config_version
368-
369-
def assertRouteConfigUpdateTrafficHandoff(
370-
self, test_client: XdsTestClient,
371-
previous_route_config_version: str, retry_wait_second: int,
372-
timeout_second: int):
373-
retryer = retryers.constant_retryer(
374-
wait_fixed=datetime.timedelta(seconds=retry_wait_second),
375-
timeout=datetime.timedelta(seconds=timeout_second),
376-
retry_on_exceptions=(TdPropagationRetryableError,),
377-
logger=logger,
378-
log_level=logging.INFO)
379-
try:
380-
for attempt in retryer:
381-
with attempt:
382-
self.assertSuccessfulRpcs(test_client)
383-
route_config_version = self.getRouteConfigVersion(
384-
test_client)
385-
if previous_route_config_version == route_config_version:
386-
logger.info(
387-
'Routing config not propagated yet. Retrying.')
388-
raise TdPropagationRetryableError(
389-
"CSDS not get updated routing config corresponding"
390-
" to the second set of url maps")
391-
else:
392-
self.assertSuccessfulRpcs(test_client)
393-
logger.info(
394-
'[SUCCESS] Confirmed successful RPC with the updated routing config, version=%s',
395-
route_config_version)
396-
except retryers.RetryError as retry_error:
397-
logger.info(
398-
'Retry exhausted. TD routing config propagation failed after timeout %ds.',
399-
timeout_second)
400-
raise retry_error
401-
402353
def assertFailedRpcs(self,
403354
test_client: XdsTestClient,
404355
num_rpcs: Optional[int] = 100):
@@ -427,10 +378,6 @@ def assertAllBackendsReceivedRpcs(self, lb_stats):
427378
msg=f'Backend {backend} did not receive a single RPC')
428379

429380

430-
class TdPropagationRetryableError(Exception):
431-
pass
432-
433-
434381
class RegularXdsKubernetesTestCase(XdsKubernetesTestCase):
435382

436383
@classmethod

‎tools/run_tests/xds_k8s_test_driver/tests/api_listener_test.py‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

0 commit comments

Comments
 (0)