Fixing small internal naming error.

pull/23065/head
Donna Dionne 5 years ago
parent 71c8056669
commit 666572a050
  1. 2
      src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
  2. 4
      src/core/ext/filters/client_channel/xds/xds_client.cc

@ -712,7 +712,7 @@ class XdsRoutingLbFactory : public LoadBalancingPolicyFactory {
"value should be of type object")); "value should be of type object"));
return error_list; return error_list;
} }
auto it = json.object_value().find("child_policy"); auto it = json.object_value().find("childPolicy");
if (it == json.object_value().end()) { if (it == json.object_value().end()) {
error_list.push_back( error_list.push_back(
GRPC_ERROR_CREATE_FROM_STATIC_STRING("did not find childPolicy")); GRPC_ERROR_CREATE_FROM_STATIC_STRING("did not find childPolicy"));

@ -2043,7 +2043,7 @@ namespace {
std::string CreateServiceConfigActionCluster(const std::string& cluster_name) { std::string CreateServiceConfigActionCluster(const std::string& cluster_name) {
return absl::StrFormat( return absl::StrFormat(
" \"cds:%s\":{\n" " \"cds:%s\":{\n"
" \"child_policy\":[ {\n" " \"childPolicy\":[ {\n"
" \"cds_experimental\":{\n" " \"cds_experimental\":{\n"
" \"cluster\": \"%s\"\n" " \"cluster\": \"%s\"\n"
" }\n" " }\n"
@ -2073,7 +2073,7 @@ std::string CreateServiceConfigActionWeightedCluster(
std::vector<std::string> config_parts; std::vector<std::string> config_parts;
config_parts.push_back( config_parts.push_back(
absl::StrFormat(" \"weighted:%s\":{\n" absl::StrFormat(" \"weighted:%s\":{\n"
" \"child_policy\":[ {\n" " \"childPolicy\":[ {\n"
" \"weighted_target_experimental\":{\n" " \"weighted_target_experimental\":{\n"
" \"targets\":{\n", " \"targets\":{\n",
name)); name));

Loading…
Cancel
Save