From 01835c07a5d453deea8cf8a2c4af82bbe258555d Mon Sep 17 00:00:00 2001 From: Jae Kim Date: Tue, 21 Feb 2017 14:05:39 -0800 Subject: [PATCH 1/2] Added AllocateQuotaRequest/Response support --- src/tools/service_control_json_gen.cc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/tools/service_control_json_gen.cc b/src/tools/service_control_json_gen.cc index de7f2594f..dbf2adfea 100644 --- a/src/tools/service_control_json_gen.cc +++ b/src/tools/service_control_json_gen.cc @@ -46,6 +46,8 @@ enum OutputType { BINARY, TEXT, JSON }; enum ProtoMessageType { CHECK_REQUEST, CHECK_RESPONSE, + QUOTA_REQUEST, + QUOTA_RESPONSE, REPORT_REQUEST, REPORT_RESPONSE }; @@ -69,12 +71,16 @@ const int kTextOutput = 4; const int kBinaryOutput = 5; const int kCheckRequstProto = 6; const int kCheckResponseProto = 7; +const int kAllocateQuotaRequstProto = 11; +const int kAllocateQuotaResponseProto = 12; const int kReportRequstProto = 8; const int kReportResponseProto = 9; const int kReportRequestSize = 10; ::google::api::servicecontrol::v1::CheckRequest check_request; ::google::api::servicecontrol::v1::CheckResponse check_response; +::google::api::servicecontrol::v1::AllocateQuotaRequest quota_request; +::google::api::servicecontrol::v1::AllocateQuotaResponse quota_response; ::google::api::servicecontrol::v1::ReportRequest report_request; ::google::api::servicecontrol::v1::ReportResponse report_response; @@ -94,6 +100,8 @@ void ProcessCmdLine(int argc, char** argv) { {"binary", no_argument, nullptr, kBinaryOutput}, {"check_request", no_argument, nullptr, kCheckRequstProto}, {"check_response", no_argument, nullptr, kCheckResponseProto}, + {"quota_request", no_argument, nullptr, kAllocateQuotaRequstProto}, + {"quota_response", no_argument, nullptr, kAllocateQuotaResponseProto}, {"report_request", no_argument, nullptr, kReportRequstProto}, {"report_response", no_argument, nullptr, kReportResponseProto}, {"report_request_size", required_argument, nullptr, kReportRequestSize}, @@ -133,6 +141,12 @@ void ProcessCmdLine(int argc, char** argv) { case kCheckResponseProto: proto_type = CHECK_RESPONSE; break; + case kAllocateQuotaRequstProto: + proto_type = QUOTA_REQUEST; + break; + case kAllocateQuotaResponseProto: + proto_type = QUOTA_RESPONSE; + break; case kReportRequstProto: proto_type = REPORT_REQUEST; break; @@ -163,6 +177,8 @@ void ProcessCmdLine(int argc, char** argv) { "Protobuf message type:\n" " --check_request: CheckRequest protobuf message.\n" " --check_response: CheckResponse protobuf message.\n" + " --quota_request: AllocateQuotaRequest protobuf message.\n" + " --quota_response: AllocateQuotaResponse protobuf message.\n" " --report_request: ReportRequest protobuf message.\n" " --report_response: ReportResponse protobuf message.\n" "Input:\n" @@ -316,6 +332,12 @@ int main(int argc, char** argv) { case CHECK_RESPONSE: request = &check_response; break; + case QUOTA_REQUEST: + request = "a_request; + break; + case QUOTA_RESPONSE: + request = "a_response; + break; case REPORT_REQUEST: request = &report_request; break; From 6cb7e2fb730c4a9e2f1e95adbd03a72e3a0ea3bc Mon Sep 17 00:00:00 2001 From: Jae Kim Date: Tue, 21 Feb 2017 14:09:23 -0800 Subject: [PATCH 2/2] Added AllocateQuotaRequest/Response support --- src/tools/service_control_json_gen.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tools/service_control_json_gen.cc b/src/tools/service_control_json_gen.cc index dbf2adfea..f63e557ec 100644 --- a/src/tools/service_control_json_gen.cc +++ b/src/tools/service_control_json_gen.cc @@ -71,11 +71,11 @@ const int kTextOutput = 4; const int kBinaryOutput = 5; const int kCheckRequstProto = 6; const int kCheckResponseProto = 7; -const int kAllocateQuotaRequstProto = 11; -const int kAllocateQuotaResponseProto = 12; -const int kReportRequstProto = 8; -const int kReportResponseProto = 9; -const int kReportRequestSize = 10; +const int kAllocateQuotaRequstProto = 8; +const int kAllocateQuotaResponseProto = 9; +const int kReportRequstProto = 10; +const int kReportResponseProto = 11; +const int kReportRequestSize = 12; ::google::api::servicecontrol::v1::CheckRequest check_request; ::google::api::servicecontrol::v1::CheckResponse check_response;