Client side implementation of creating channel with credentials.
The old test_ssl_channel related code is deleted and the new create channel
call is used for interop tests.
Change on 2014/12/19 by yangg <yangg@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=82540921
diff --git a/test/cpp/qps/client.cc b/test/cpp/qps/client.cc
index e0f13a8..287cef8 100644
--- a/test/cpp/qps/client.cc
+++ b/test/cpp/qps/client.cc
@@ -43,11 +43,9 @@
#include <grpc/support/histogram.h>
#include <grpc/support/log.h>
#include <google/gflags.h>
-#include <grpc++/channel_interface.h>
#include <grpc++/client_context.h>
-#include <grpc++/create_channel.h>
#include <grpc++/status.h>
-#include "test/cpp/util/test_ssl_channel.h"
+#include "test/cpp/util/create_test_channel.h"
#include "test/cpp/interop/test.pb.h"
DEFINE_bool(enable_ssl, false, "Whether to use ssl/tls.");
@@ -75,23 +73,11 @@
DEFINE_string(workload, "", "Workload parameters");
using grpc::ChannelInterface;
-using grpc::CreateChannel;
-using grpc::TestSslChannel;
+using grpc::CreateTestChannel;
using grpc::testing::SimpleRequest;
using grpc::testing::SimpleResponse;
using grpc::testing::TestService;
-std::shared_ptr<ChannelInterface> CreateTestChannel(
- const grpc::string& server) {
- std::shared_ptr<ChannelInterface> channel;
- if (FLAGS_enable_ssl) {
- channel.reset(new TestSslChannel(server));
- } else {
- channel = CreateChannel(server);
- }
- return channel;
-}
-
static double now() {
gpr_timespec tv = gpr_now();
return 1e9 * tv.tv_sec + tv.tv_nsec;
@@ -116,7 +102,7 @@
class ClientChannelInfo {
public:
explicit ClientChannelInfo(const grpc::string &server)
- : channel_(CreateTestChannel(server)),
+ : channel_(CreateTestChannel(server, FLAGS_enable_ssl)),
stub_(TestService::NewStub(channel_)) {}
ChannelInterface *get_channel() { return channel_.get(); }
TestService::Stub *get_stub() { return stub_.get(); }