From cf36f858d671f30e8ac03378f482c8712ae441e7 Mon Sep 17 00:00:00 2001
From: vjpai <vpai@google.com>
Date: Wed, 30 Mar 2016 12:35:34 -0700
Subject: [PATCH] Support server-side secure test.
---
src/ruby/qps/client.rb | 5 ++---
src/ruby/qps/server.rb | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ruby/qps/client.rb b/src/ruby/qps/client.rb
index a12fd57f09..db9ff8053d 100644
--- a/src/ruby/qps/client.rb
+++ b/src/ruby/qps/client.rb
@@ -60,13 +60,13 @@ class BenchmarkClient
if config.security_params
if config.security_params.use_test_ca
certs = load_test_certs
- cred = GRPC::Core::Credentials.new(certs[0])
+ cred = GRPC::Core::ChannelCredentials.new(certs[0])
else
p 'Unsupported to use non-test CA (TBD)'
exit
end
if config.security_params.server_host_override
- p 'Unsupported to use severt host override (TBD)'
+ p 'Unsupported to use server host override (TBD)'
exit
end
else
@@ -79,7 +79,6 @@ class BenchmarkClient
@done = false
(0..config.client_channels-1).each do |i|
Thread.new {
- stub = ''
gtsr = Grpc::Testing::SimpleRequest
gtpt = Grpc::Testing::PayloadType
gtp = Grpc::Testing::Payload
diff --git a/src/ruby/qps/server.rb b/src/ruby/qps/server.rb
index 9fce56813e..26f46a3140 100644
--- a/src/ruby/qps/server.rb
+++ b/src/ruby/qps/server.rb
@@ -66,7 +66,8 @@ class BenchmarkServer
def initialize(config, port)
if config.security_params
certs = load_test_certs
- cred = GRPC::Core::Credentials.new(certs[0])
+ cred = GRPC::Core::ServerCredentials.new(
+ nil, [{private_key: certs[1], cert_chain: certs[2]}], false)
else
cred = :this_port_is_insecure
end
--
GitLab