add rlqs to bin scripts

Author: sergiitk

bin/lib/common.py

@@ -40,6 +40,7 @@
         "default",
         "secure",
         "app_net",
+        "rlqs",
         "gamma",
     ],
     help="Select server mode",
@@ -206,6 +207,9 @@ def make_server_runner(
         )
         runner_kwargs["route_kind"] = ROUTE_KIND_GAMMA.value
         server_runner = GammaServerRunner
+    elif mode == "rlqs":
+        depl_args = k8s_xds_server_runner.ServerDeploymentArgs(enable_rlqs=True)
+        runner_kwargs["deployment_args"] = depl_args
 
     return server_runner(namespace, **runner_kwargs)
 

bin/run_td_setup.py

@@ -222,6 +222,26 @@ def _setup_td_appnet(
     td.create_grpc_route(server_xds_host, server_xds_port)
 
 
+def _setup_td_rlqs(
+    *,
+    td: traffic_director.TrafficDirectorAppNetManager,
+    server_xds_host,
+    server_xds_port,
+    server_namespace,
+    server_name,
+    server_port,
+):
+    td.create_health_check()
+    td.create_backend_service()
+    td.create_mesh()
+    td.create_grpc_route(server_xds_host, server_xds_port)
+    td.create_endpoint_policy(
+        server_namespace=server_namespace,
+        server_name=server_name,
+        server_port=server_port,
+    )
+
+
 def _cmd_backends_add(td, server_name, server_namespace, server_port):
     logger.info("Adding backends")
     k8s_api_manager = k8s.KubernetesApiManager(xds_k8s_flags.KUBE_CONTEXT.value)
@@ -289,6 +309,10 @@ def main(
     td_attrs = common.td_attrs()
     if mode == "app_net":
         td = traffic_director.TrafficDirectorAppNetManager(**td_attrs)
+    elif mode == "rlqs":
+        td_attrs["netsvc_class"] = traffic_director.NetworkServicesV1Alpha1
+        td_attrs["compute_api_version"] = "v1alpha"
+        td = traffic_director.TrafficDirectorAppNetManager(**td_attrs)
     elif mode == "secure":
         td = traffic_director.TrafficDirectorSecureManager(**td_attrs)
         if server_maintenance_port is None:
@@ -307,6 +331,15 @@ def main(
                     server_xds_host=server_xds_host,
                     server_xds_port=server_xds_port,
                 )
+            elif mode == "rlqs":
+                _setup_td_rlqs(
+                    td=td,
+                    server_xds_host=server_xds_host,
+                    server_xds_port=server_xds_port,
+                    server_namespace=server_namespace_name,
+                    server_name=server_name,
+                    server_port=server_port,
+                )
             elif mode == "secure":
                 _setup_td_secure(
                     security_mode,

bin/run_test_client.py

@@ -90,7 +90,7 @@ def _get_run_kwargs(mode: str):
     if mode == "secure":
         run_kwargs["secure_mode"] = True
 
-    elif mode == "app_net":
+    elif mode in ("app_net", "rlqs"):
         # Minimal appnet td setup so it's possible to generate config mesh name
         td = traffic_director.TrafficDirectorAppNetManager(**common.td_attrs())
         run_kwargs["config_mesh"] = td.make_resource_name(td.MESH_NAME)

bin/run_test_server.py

@@ -45,6 +45,7 @@
 from framework import xds_flags
 from framework import xds_k8s_flags
 from framework.infrastructure import k8s
+from framework.infrastructure import traffic_director
 
 logger = logging.getLogger(__name__)
 # Flags
@@ -94,6 +95,10 @@ def _get_run_kwargs(mode: str):
             run_kwargs["route_template"] = "gamma/route_http.yaml"
         elif common.ROUTE_KIND_GAMMA.value is k8s.RouteKind.GRPC:
             run_kwargs["route_template"] = "gamma/route_grpc.yaml"
+    elif mode == "rlqs":
+        # Minimal appnet td setup so it's possible to generate config mesh name
+        td = traffic_director.TrafficDirectorAppNetManager(**common.td_attrs())
+        run_kwargs["config_mesh"] = td.make_resource_name(td.MESH_NAME)
 
     return run_kwargs