Revert "Revert "Proto API for LB request/responses""

.gitmodules

@@ -14,3 +14,6 @@
 [submodule "third_party/boringssl"]
  path = third_party/boringssl
  url = https://boringssl.googlesource.com/boringssl
+[submodule "third_party/nanopb"]
+ path = third_party/nanopb
+ url = https://github.com/nanopb/nanopb.git

BUILD

@@ -182,6 +182,7 @@ cc_library(
  "src/core/client_config/client_config.h",
  "src/core/client_config/connector.h",
  "src/core/client_config/initial_connect_string.h",
+ "src/core/client_config/lb_policies/load_balancer_api.h",
  "src/core/client_config/lb_policies/pick_first.h",
  "src/core/client_config/lb_policies/round_robin.h",
  "src/core/client_config/lb_policy.h",
@@ -242,6 +243,7 @@ cc_library(
  "src/core/json/json_common.h",
  "src/core/json/json_reader.h",
  "src/core/json/json_writer.h",
+ "src/core/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/statistics/census_interface.h",
  "src/core/statistics/census_rpc_stats.h",
  "src/core/surface/api_trace.h",
@@ -283,6 +285,10 @@ cc_library(
  "src/core/transport/transport_impl.h",
  "src/core/census/aggregation.h",
  "src/core/census/rpc_metric_id.h",
+ "third_party/nanopb/pb.h",
+ "third_party/nanopb/pb_common.h",
+ "third_party/nanopb/pb_decode.h",
+ "third_party/nanopb/pb_encode.h",
  "src/core/httpcli/httpcli_security_connector.c",
  "src/core/security/base64.c",
  "src/core/security/client_auth_filter.c",
@@ -319,6 +325,7 @@ cc_library(
  "src/core/client_config/connector.c",
  "src/core/client_config/default_initial_connect_string.c",
  "src/core/client_config/initial_connect_string.c",
+ "src/core/client_config/lb_policies/load_balancer_api.c",
  "src/core/client_config/lb_policies/pick_first.c",
  "src/core/client_config/lb_policies/round_robin.c",
  "src/core/client_config/lb_policy.c",
@@ -382,6 +389,7 @@ cc_library(
  "src/core/json/json_reader.c",
  "src/core/json/json_string.c",
  "src/core/json/json_writer.c",
+ "src/core/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/surface/alarm.c",
  "src/core/surface/api_trace.c",
  "src/core/surface/byte_buffer.c",
@@ -436,6 +444,9 @@ cc_library(
  "src/core/census/operation.c",
  "src/core/census/placeholders.c",
  "src/core/census/tracing.c",
+ "third_party/nanopb/pb_common.c",
+ "third_party/nanopb/pb_decode.c",
+ "third_party/nanopb/pb_encode.c",
  ],
  hdrs = [
  "include/grpc/grpc_security.h",
@@ -484,6 +495,7 @@ cc_library(
  "src/core/client_config/client_config.h",
  "src/core/client_config/connector.h",
  "src/core/client_config/initial_connect_string.h",
+ "src/core/client_config/lb_policies/load_balancer_api.h",
  "src/core/client_config/lb_policies/pick_first.h",
  "src/core/client_config/lb_policies/round_robin.h",
  "src/core/client_config/lb_policy.h",
@@ -544,6 +556,7 @@ cc_library(
  "src/core/json/json_common.h",
  "src/core/json/json_reader.h",
  "src/core/json/json_writer.h",
+ "src/core/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/statistics/census_interface.h",
  "src/core/statistics/census_rpc_stats.h",
  "src/core/surface/api_trace.h",
@@ -585,6 +598,10 @@ cc_library(
  "src/core/transport/transport_impl.h",
  "src/core/census/aggregation.h",
  "src/core/census/rpc_metric_id.h",
+ "third_party/nanopb/pb.h",
+ "third_party/nanopb/pb_common.h",
+ "third_party/nanopb/pb_decode.h",
+ "third_party/nanopb/pb_encode.h",
  "src/core/surface/init_unsecure.c",
  "src/core/census/grpc_context.c",
  "src/core/census/grpc_filter.c",
@@ -601,6 +618,7 @@ cc_library(
  "src/core/client_config/connector.c",
  "src/core/client_config/default_initial_connect_string.c",
  "src/core/client_config/initial_connect_string.c",
+ "src/core/client_config/lb_policies/load_balancer_api.c",
  "src/core/client_config/lb_policies/pick_first.c",
  "src/core/client_config/lb_policies/round_robin.c",
  "src/core/client_config/lb_policy.c",
@@ -664,6 +682,7 @@ cc_library(
  "src/core/json/json_reader.c",
  "src/core/json/json_string.c",
  "src/core/json/json_writer.c",
+ "src/core/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/surface/alarm.c",
  "src/core/surface/api_trace.c",
  "src/core/surface/byte_buffer.c",
@@ -718,6 +737,9 @@ cc_library(
  "src/core/census/operation.c",
  "src/core/census/placeholders.c",
  "src/core/census/tracing.c",
+ "third_party/nanopb/pb_common.c",
+ "third_party/nanopb/pb_decode.c",
+ "third_party/nanopb/pb_encode.c",
  ],
  hdrs = [
  "include/grpc/byte_buffer.h",
@@ -1281,6 +1303,7 @@ objc_library(
  "src/core/client_config/connector.c",
  "src/core/client_config/default_initial_connect_string.c",
  "src/core/client_config/initial_connect_string.c",
+ "src/core/client_config/lb_policies/load_balancer_api.c",
  "src/core/client_config/lb_policies/pick_first.c",
  "src/core/client_config/lb_policies/round_robin.c",
  "src/core/client_config/lb_policy.c",
@@ -1344,6 +1367,7 @@ objc_library(
  "src/core/json/json_reader.c",
  "src/core/json/json_string.c",
  "src/core/json/json_writer.c",
+ "src/core/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/surface/alarm.c",
  "src/core/surface/api_trace.c",
  "src/core/surface/byte_buffer.c",
@@ -1398,6 +1422,9 @@ objc_library(
  "src/core/census/operation.c",
  "src/core/census/placeholders.c",
  "src/core/census/tracing.c",
+ "third_party/nanopb/pb_common.c",
+ "third_party/nanopb/pb_decode.c",
+ "third_party/nanopb/pb_encode.c",
  ],
  hdrs = [
  "include/grpc/grpc_security.h",
@@ -1441,6 +1468,7 @@ objc_library(
  "src/core/client_config/client_config.h",
  "src/core/client_config/connector.h",
  "src/core/client_config/initial_connect_string.h",
+ "src/core/client_config/lb_policies/load_balancer_api.h",
  "src/core/client_config/lb_policies/pick_first.h",
  "src/core/client_config/lb_policies/round_robin.h",
  "src/core/client_config/lb_policy.h",
@@ -1501,6 +1529,7 @@ objc_library(
  "src/core/json/json_common.h",
  "src/core/json/json_reader.h",
  "src/core/json/json_writer.h",
+ "src/core/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/statistics/census_interface.h",
  "src/core/statistics/census_rpc_stats.h",
  "src/core/surface/api_trace.h",
@@ -1542,6 +1571,10 @@ objc_library(
  "src/core/transport/transport_impl.h",
  "src/core/census/aggregation.h",
  "src/core/census/rpc_metric_id.h",
+ "third_party/nanopb/pb.h",
+ "third_party/nanopb/pb_common.h",
+ "third_party/nanopb/pb_decode.h",
+ "third_party/nanopb/pb_encode.h",
  ],
  includes = [
  "include",

Makefile

@@ -940,6 +940,7 @@ grpc_csharp_plugin: $(BINDIR)/$(CONFIG)/grpc_csharp_plugin
 grpc_objective_c_plugin: $(BINDIR)/$(CONFIG)/grpc_objective_c_plugin
 grpc_python_plugin: $(BINDIR)/$(CONFIG)/grpc_python_plugin
 grpc_ruby_plugin: $(BINDIR)/$(CONFIG)/grpc_ruby_plugin
+grpclb_api_test: $(BINDIR)/$(CONFIG)/grpclb_api_test
 hybrid_end2end_test: $(BINDIR)/$(CONFIG)/hybrid_end2end_test
 interop_client: $(BINDIR)/$(CONFIG)/interop_client
 interop_server: $(BINDIR)/$(CONFIG)/interop_server
@@ -1283,6 +1284,7 @@ buildtests_cxx: buildtests_zookeeper privatelibs_cxx \
  $(BINDIR)/$(CONFIG)/generic_async_streaming_ping_pong_test \
  $(BINDIR)/$(CONFIG)/generic_end2end_test \
  $(BINDIR)/$(CONFIG)/grpc_cli \
+ $(BINDIR)/$(CONFIG)/grpclb_api_test \
  $(BINDIR)/$(CONFIG)/hybrid_end2end_test \
  $(BINDIR)/$(CONFIG)/interop_client \
  $(BINDIR)/$(CONFIG)/interop_server \
@@ -1591,6 +1593,8 @@ test_cxx: test_zookeeper buildtests_cxx
  $(Q) $(BINDIR)/$(CONFIG)/generic_async_streaming_ping_pong_test || ( echo test generic_async_streaming_ping_pong_test failed ; exit 1 )
  $(E) "[RUN] Testing generic_end2end_test"
  $(Q) $(BINDIR)/$(CONFIG)/generic_end2end_test || ( echo test generic_end2end_test failed ; exit 1 )
+ $(E) "[RUN] Testing grpclb_api_test"
+ $(Q) $(BINDIR)/$(CONFIG)/grpclb_api_test || ( echo test grpclb_api_test failed ; exit 1 )
  $(E) "[RUN] Testing hybrid_end2end_test"
  $(Q) $(BINDIR)/$(CONFIG)/hybrid_end2end_test || ( echo test hybrid_end2end_test failed ; exit 1 )
  $(E) "[RUN] Testing interop_test"
@@ -1740,6 +1744,21 @@ $(LIBDIR)/$(CONFIG)/pkgconfig/grpc++_unsecure.pc:
  $(Q) mkdir -p $(@D)
  $(Q) echo "$(GRPCXX_UNSECURE_PC_FILE)" | tr , '\n' >$@
 
+ifeq ($(NO_PROTOC),true)
+$(GENDIR)/src/proto/grpc/lb/v0/load_balancer.pb.cc: protoc_dep_error
+$(GENDIR)/src/proto/grpc/lb/v0/load_balancer.grpc.pb.cc: protoc_dep_error
+else
+$(GENDIR)/src/proto/grpc/lb/v0/load_balancer.pb.cc: src/proto/grpc/lb/v0/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
+ $(E) "[PROTOC] Generating protobuf CC file from $<"
+ $(Q) mkdir -p `dirname $@`
+ $(Q) $(PROTOC) --cpp_out=$(GENDIR) $<
+
+$(GENDIR)/src/proto/grpc/lb/v0/load_balancer.grpc.pb.cc: src/proto/grpc/lb/v0/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
+ $(E) "[GRPC] Generating gRPC's protobuf service CC file from $<"
+ $(Q) mkdir -p `dirname $@`
+ $(Q) $(PROTOC) --grpc_out=$(GENDIR) --plugin=protoc-gen-grpc=$(BINDIR)/$(CONFIG)/grpc_cpp_plugin $<
+endif
+
 ifeq ($(NO_PROTOC),true)
 $(GENDIR)/src/proto/grpc/testing/control.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc: protoc_dep_error
@@ -2348,6 +2367,7 @@ LIBGRPC_SRC = \
  src/core/client_config/connector.c \
  src/core/client_config/default_initial_connect_string.c \
  src/core/client_config/initial_connect_string.c \
+ src/core/client_config/lb_policies/load_balancer_api.c \
  src/core/client_config/lb_policies/pick_first.c \
  src/core/client_config/lb_policies/round_robin.c \
  src/core/client_config/lb_policy.c \
@@ -2411,6 +2431,7 @@ LIBGRPC_SRC = \
  src/core/json/json_reader.c \
  src/core/json/json_string.c \
  src/core/json/json_writer.c \
+ src/core/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/surface/alarm.c \
  src/core/surface/api_trace.c \
  src/core/surface/byte_buffer.c \
@@ -2465,6 +2486,9 @@ LIBGRPC_SRC = \
  src/core/census/operation.c \
  src/core/census/placeholders.c \
  src/core/census/tracing.c \
+ third_party/nanopb/pb_common.c \
+ third_party/nanopb/pb_decode.c \
+ third_party/nanopb/pb_encode.c \
 
 PUBLIC_HEADERS_C += \
  include/grpc/grpc_security.h \
@@ -2632,6 +2656,7 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/client_config/connector.c \
  src/core/client_config/default_initial_connect_string.c \
  src/core/client_config/initial_connect_string.c \
+ src/core/client_config/lb_policies/load_balancer_api.c \
  src/core/client_config/lb_policies/pick_first.c \
  src/core/client_config/lb_policies/round_robin.c \
  src/core/client_config/lb_policy.c \
@@ -2695,6 +2720,7 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/json/json_reader.c \
  src/core/json/json_string.c \
  src/core/json/json_writer.c \
+ src/core/proto/grpc/lb/v0/load_balancer.pb.c \
  src/core/surface/alarm.c \
  src/core/surface/api_trace.c \
  src/core/surface/byte_buffer.c \
@@ -2749,6 +2775,9 @@ LIBGRPC_UNSECURE_SRC = \
  src/core/census/operation.c \
  src/core/census/placeholders.c \
  src/core/census/tracing.c \
+ third_party/nanopb/pb_common.c \
+ third_party/nanopb/pb_decode.c \
+ third_party/nanopb/pb_encode.c \
 
 PUBLIC_HEADERS_C += \
  include/grpc/byte_buffer.h \
@@ -9670,6 +9699,53 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
+GRPCLB_API_TEST_SRC = \
+ $(GENDIR)/src/proto/grpc/lb/v0/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v0/load_balancer.grpc.pb.cc \
+ test/cpp/grpclb/grpclb_api_test.cc \
+
+GRPCLB_API_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GRPCLB_API_TEST_SRC))))
+ifeq ($(NO_SECURE),true)
+
+# You can't build secure targets if you don't have OpenSSL.
+
+$(BINDIR)/$(CONFIG)/grpclb_api_test: openssl_dep_error
+
+else
+
+
+
+
+ifeq ($(NO_PROTOBUF),true)
+
+# You can't build the protoc plugins or protobuf-enabled targets if you don't have protobuf 3.0.0+.
+
+$(BINDIR)/$(CONFIG)/grpclb_api_test: protobuf_dep_error
+
+else
+
+$(BINDIR)/$(CONFIG)/grpclb_api_test: $(PROTOBUF_DEP) $(GRPCLB_API_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
+ $(E) "[LD] Linking $@"
+ $(Q) mkdir -p `dirname $@`
+ $(Q) $(LDXX) $(LDFLAGS) $(GRPCLB_API_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBSXX) $(LDLIBS_PROTOBUF) $(LDLIBS) $(LDLIBS_SECURE) $(GTEST_LIB) -o $(BINDIR)/$(CONFIG)/grpclb_api_test
+
+endif
+
+endif
+
+$(OBJDIR)/$(CONFIG)/src/proto/grpc/lb/v0/load_balancer.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
+
+$(OBJDIR)/$(CONFIG)/test/cpp/grpclb/grpclb_api_test.o: $(LIBDIR)/$(CONFIG)/libgrpc++_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a
+
+deps_grpclb_api_test: $(GRPCLB_API_TEST_OBJS:.o=.dep)
+
+ifneq ($(NO_SECURE),true)
+ifneq ($(NO_DEPS),true)
+-include $(GRPCLB_API_TEST_OBJS:.o=.dep)
+endif
+endif
+$(OBJDIR)/$(CONFIG)/test/cpp/grpclb/grpclb_api_test.o: $(GENDIR)/src/proto/grpc/lb/v0/load_balancer.pb.cc $(GENDIR)/src/proto/grpc/lb/v0/load_balancer.grpc.pb.cc
+
+
 HYBRID_END2END_TEST_SRC = \
  test/cpp/end2end/hybrid_end2end_test.cc \
 

binding.gyp

@@ -591,6 +591,7 @@
  'src/core/client_config/connector.c',
  'src/core/client_config/default_initial_connect_string.c',
  'src/core/client_config/initial_connect_string.c',
+ 'src/core/client_config/lb_policies/load_balancer_api.c',
  'src/core/client_config/lb_policies/pick_first.c',
  'src/core/client_config/lb_policies/round_robin.c',
  'src/core/client_config/lb_policy.c',
@@ -654,6 +655,7 @@
  'src/core/json/json_reader.c',
  'src/core/json/json_string.c',
  'src/core/json/json_writer.c',
+ 'src/core/proto/grpc/lb/v0/load_balancer.pb.c',
  'src/core/surface/alarm.c',
  'src/core/surface/api_trace.c',
  'src/core/surface/byte_buffer.c',
@@ -708,6 +710,9 @@
  'src/core/census/operation.c',
  'src/core/census/placeholders.c',
  'src/core/census/tracing.c',
+ 'third_party/nanopb/pb_common.c',
+ 'third_party/nanopb/pb_decode.c',
+ 'third_party/nanopb/pb_encode.c',
  ],
  "conditions": [
  ['OS == "mac"', {