diff --git a/framework/test_app/runners/k8s/k8s_xds_server_runner.py b/framework/test_app/runners/k8s/k8s_xds_server_runner.py index 30cb0cf1..9b492d6e 100644 --- a/framework/test_app/runners/k8s/k8s_xds_server_runner.py +++ b/framework/test_app/runners/k8s/k8s_xds_server_runner.py @@ -37,6 +37,7 @@ class ServerDeploymentArgs: enable_csm_observability: bool = False csm_workload_name: str = "" csm_canonical_service_name: str = "" + enable_dualstack: bool = False def as_dict(self): return { @@ -47,6 +48,7 @@ def as_dict(self): "enable_csm_observability": self.enable_csm_observability, "csm_workload_name": self.csm_workload_name, "csm_canonical_service_name": self.csm_canonical_service_name, + "enable_dualstack": self.enable_dualstack, } @@ -109,7 +111,6 @@ def __init__( # pylint: disable=too-many-locals debug_use_port_forwarding: bool = False, enable_workload_identity: bool = True, deployment_args: Optional[ServerDeploymentArgs] = None, - enable_dualstack: bool = False, ): super().__init__( k8s_namespace, @@ -145,7 +146,6 @@ def __init__( # pylint: disable=too-many-locals self.td_bootstrap_image = td_bootstrap_image self.network = network self.xds_server_uri = xds_server_uri - self.enable_dualstack = enable_dualstack # Workload identity settings: if self.enable_workload_identity: @@ -228,7 +228,7 @@ def run( # pylint: disable=arguments-differ,too-many-branches app_label=self.app_label, neg_name=self.gcp_neg_name, test_port=test_port, - enable_dualstack=self.enable_dualstack, + enable_dualstack=self.deployment_args.enable_dualstack, ) self._wait_service_neg_status_annotation(self.service_name, test_port) diff --git a/framework/xds_k8s_testcase.py b/framework/xds_k8s_testcase.py index f80c8e9d..c302af89 100644 --- a/framework/xds_k8s_testcase.py +++ b/framework/xds_k8s_testcase.py @@ -967,7 +967,6 @@ def initKubernetesServerRunner(self, **kwargs) -> KubernetesServerRunner: network=self.network, debug_use_port_forwarding=self.debug_use_port_forwarding, enable_workload_identity=self.enable_workload_identity, - enable_dualstack=self.enable_dualstack, **kwargs, ) @@ -1081,7 +1080,6 @@ def initKubernetesServerRunner(self, **kwargs) -> KubernetesServerRunner: xds_server_uri=self.xds_server_uri, deployment_template="server-secure.deployment.yaml", debug_use_port_forwarding=self.debug_use_port_forwarding, - enable_dualstack=self.enable_dualstack, **kwargs, ) diff --git a/tests/dualstack_test.py b/tests/dualstack_test.py index 29ae5bdd..8b72099c 100644 --- a/tests/dualstack_test.py +++ b/tests/dualstack_test.py @@ -35,6 +35,8 @@ _SERVERS_APP_LABEL: Final[str] = "psm-interop-dualstack" +ServerDeploymentArgs = k8s_xds_server_runner.ServerDeploymentArgs + class DualStackTest(xds_k8s_testcase.RegularXdsKubernetesTestCase): v4_server_runner: _KubernetesServerRunner = None @@ -72,8 +74,8 @@ def setUp(self): debug_use_port_forwarding=self.debug_use_port_forwarding, reuse_namespace=True, reuse_service=True, - enable_dualstack=True, enable_workload_identity=self.enable_workload_identity, + deployment_args=ServerDeploymentArgs(enable_dualstack=True), ) k8s_namespace = self.server_runner.k8s_namespace