From e2f5ad81843639a525f0f4ec0eb6a142d0828538 Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Wed, 27 Oct 2021 12:36:38 -0700 Subject: [PATCH] Fix two issues with the test framework and new CSDS (#27840) --- .../xds_k8s_test_driver/framework/xds_k8s_testcase.py | 8 ++++---- .../xds_k8s_test_driver/framework/xds_url_map_testcase.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py b/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py index 153c88df1bc..8c8e83d2676 100644 --- a/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py +++ b/tools/run_tests/xds_k8s_test_driver/framework/xds_k8s_testcase.py @@ -329,15 +329,15 @@ class XdsKubernetesTestCase(absltest.TestCase, metaclass=abc.ABCMeta): for xds_config in config.xds_config: seen.add(xds_config.WhichOneof('per_xds_config')) for generic_xds_config in config.generic_xds_configs: - if re.search(r'\.Listener$', generic_xds_config['typeUrl']): + if re.search(r'\.Listener$', generic_xds_config.type_url): seen.add('listener_config') elif re.search(r'\.RouteConfiguration$', - generic_xds_config['typeUrl']): + generic_xds_config.type_url): seen.add('route_config') - elif re.search(r'\.Cluster$', generic_xds_config['typeUrl']): + elif re.search(r'\.Cluster$', generic_xds_config.type_url): seen.add('cluster_config') elif re.search(r'\.ClusterLoadAssignment$', - generic_xds_config['typeUrl']): + generic_xds_config.type_url): seen.add('endpoint_config') logger.debug('Received xDS config dump: %s', json_format.MessageToJson(config, indent=2)) diff --git a/tools/run_tests/xds_k8s_test_driver/framework/xds_url_map_testcase.py b/tools/run_tests/xds_k8s_test_driver/framework/xds_url_map_testcase.py index 6ee2efc193d..0b02c3e8105 100644 --- a/tools/run_tests/xds_k8s_test_driver/framework/xds_url_map_testcase.py +++ b/tools/run_tests/xds_k8s_test_driver/framework/xds_url_map_testcase.py @@ -115,10 +115,10 @@ class DumpedXdsConfig(dict): generic_xds_config['typeUrl']): self.rds = generic_xds_config["xdsConfig"] elif re.search(r'\.Cluster$', generic_xds_config['typeUrl']): - self.cds = generic_xds_config["xdsConfig"] + self.cds.append(generic_xds_config["xdsConfig"]) elif re.search(r'\.ClusterLoadAssignment$', generic_xds_config['typeUrl']): - self.eds = generic_xds_config["xdsConfig"] + self.eds.append(generic_xds_config["xdsConfig"]) except Exception as e: logging.debug('Parsing dumped xDS config failed with %s: %s', type(e), e)