Merge pull request #22362 from ericgribkoff/set_bootstrap_network

Set TRAFFICDIRECTOR_NETWORK_NAME in bootstrap
5 years ago · 03d6b4b411
parent 9790435b2f 8ded5ececb
commit 03d6b4b411
1 changed files with 5 additions and 2 deletions
--- a/tools/run_tests/run_xds_tests.py
+++ b/tools/run_tests/run_xds_tests.py
@ -155,7 +155,10 @@ _WAIT_FOR_URL_MAP_PATCH_SEC = 300
 _BOOTSTRAP_TEMPLATE = """
 {{
  "node": {{
-    "id": "{node_id}"
+    "id": "{node_id}",
+    "metadata": {{
+      "TRAFFICDIRECTOR_NETWORK_NAME": "%s"
+    }}
  }},
  "xds_servers": [{{
    "server_uri": "%s",
@ -166,7 +169,7 @@ _BOOTSTRAP_TEMPLATE = """
      }}
    ]
  }}]
-}}""" % args.xds_server
+}}""" % (args.network.split('/')[-1], args.xds_server)
 _PATH_MATCHER_NAME = 'path-matcher'
 _BASE_TEMPLATE_NAME = 'test-template'
 _BASE_INSTANCE_GROUP_NAME = 'test-ig'