Merge pull request #23091 from menghanl/xds_interop_disable_validation

xds interop: disable validateForProxyless for traffic splitting test

tools/run_tests/run_xds_tests.py

@@ -52,7 +52,7 @@ _TEST_CASES = [
     'round_robin',
     'secondary_locality_gets_no_requests_on_partial_primary_failure',
     'secondary_locality_gets_requests_on_primary_failure',
-    # 'traffic_splitting',
+    'traffic_splitting',
 ]
 
 
@@ -545,6 +545,14 @@ def test_traffic_splitting(gcp, original_backend_service, instance_group,
     # receive traffic, then verifies that weights are expected.
     logger.info('Running test_traffic_splitting')
 
+    # The config validation for proxyless doesn't allow setting
+    # default_route_action. To test traffic splitting, we need to set the
+    # route action to weighted clusters. Disable validate
+    # validate_for_proxyless for this test. This can be removed when
+    # validation accepts default_route_action.
+    logger.info('disabling validate_for_proxyless in target proxy')
+    set_validate_for_proxyless(gcp, False)
+
     logger.info('waiting for original backends to become healthy')
     wait_for_healthy_backends(gcp, original_backend_service, instance_group)
 
@@ -625,6 +633,7 @@ def test_traffic_splitting(gcp, original_backend_service, instance_group,
     finally:
         patch_url_map_backend_service(gcp, original_backend_service)
         patch_backend_instances(gcp, alternate_backend_service, [])
+        set_validate_for_proxyless(gcp, True)
 
 
 def get_startup_script(path_to_server_binary, service_port):
@@ -816,12 +825,27 @@ def patch_url_map_host_rule_with_port(gcp, name, backend_service, host_name):
     wait_for_global_operation(gcp, result['name'])
 
 
-def create_target_proxy(gcp, name):
+def set_validate_for_proxyless(gcp, validate_for_proxyless):
+    if not gcp.alpha_compute:
+        logger.debug(
+            'Not setting validateForProxy because alpha is not enabled')
+        return
+    # This function deletes global_forwarding_rule and target_proxy, then
+    # recreate target_proxy with validateForProxyless=False. This is necessary
+    # because patching target_grpc_proxy isn't supported.
+    delete_global_forwarding_rule(gcp)
+    delete_target_proxy(gcp)
+    create_target_proxy(gcp, gcp.target_proxy.name, validate_for_proxyless)
+    create_global_forwarding_rule(gcp, gcp.global_forwarding_rule.name,
+                                  [gcp.service_port])
+
+
+def create_target_proxy(gcp, name, validate_for_proxyless=True):
     if gcp.alpha_compute:
         config = {
             'name': name,
             'url_map': gcp.url_map.url,
-            'validate_for_proxyless': True,
+            'validate_for_proxyless': validate_for_proxyless,
         }
         logger.debug('Sending GCP request with body=%s', config)
         result = gcp.alpha_compute.targetGrpcProxies().insert(