From fcca47e652760f7eef1f74865bb7ee51cd88f707 Mon Sep 17 00:00:00 2001
From: Srivats P <pstavirs@users.noreply.github.com>
Date: Sat, 16 Feb 2019 20:54:11 +0530
Subject: [PATCH] Rename kRpcFail as kRpcError

Distinguish RPC Failure and RPC Error - the latter is in case of partial
failures

Also make Ack.status required - missed out in last commit
---
 common/protocol.proto |  4 ++--
 server/myservice.cpp  | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/protocol.proto b/common/protocol.proto
index f3f3640..5bf1534 100644
--- a/common/protocol.proto
+++ b/common/protocol.proto
@@ -177,9 +177,9 @@ message Void {
 message Ack {
     enum RpcStatus {
         kRpcSuccess = 0;
-        kRpcFail = 1;
+        kRpcError = 1;
     }
-    optional RpcStatus status = 1; // FIXME: make required
+    required RpcStatus status = 1;
     optional string notes = 2;
 }
 
diff --git a/server/myservice.cpp b/server/myservice.cpp
index c0c4d1e..683d253 100644
--- a/server/myservice.cpp
+++ b/server/myservice.cpp
@@ -166,7 +166,7 @@ void MyService::modifyPort(::google::protobuf::RpcController* /*controller*/,
     }
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -295,7 +295,7 @@ void MyService::addStream(::google::protobuf::RpcController* controller,
     portLock[portId]->unlock();
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -346,7 +346,7 @@ void MyService::deleteStream(::google::protobuf::RpcController* controller,
     portLock[portId]->unlock();
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -407,7 +407,7 @@ void MyService::modifyStream(::google::protobuf::RpcController* controller,
 
     if (fail || err) {
         notes += frameValueErrorNotes(portId, err);
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -461,7 +461,7 @@ void MyService::startTransmit(::google::protobuf::RpcController* /*controller*/,
     }
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -498,7 +498,7 @@ void MyService::stopTransmit(::google::protobuf::RpcController* /*controller*/,
     }
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -534,7 +534,7 @@ void MyService::startCapture(::google::protobuf::RpcController* /*controller*/,
     }
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -569,7 +569,7 @@ void MyService::stopCapture(::google::protobuf::RpcController* /*controller*/,
     }
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -688,7 +688,7 @@ void MyService::clearStats(::google::protobuf::RpcController* /*controller*/,
     }
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -759,7 +759,7 @@ void MyService::clearStreamStats(
     }
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -942,7 +942,7 @@ void MyService::addDeviceGroup(
     portLock[portId]->unlock();
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -998,7 +998,7 @@ void MyService::deleteDeviceGroup(
     portLock[portId]->unlock();
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -1052,7 +1052,7 @@ void MyService::modifyDeviceGroup(
     portLock[portId]->unlock();
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -1132,7 +1132,7 @@ void MyService::resolveDeviceNeighbors(
     }
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else
@@ -1169,7 +1169,7 @@ void MyService::clearDeviceNeighbors(
     }
 
     if (fail) {
-        response->set_status(OstProto::Ack::kRpcFail);
+        response->set_status(OstProto::Ack::kRpcError);
         response->set_notes(notes.toStdString());
     }
     else