VOL-1643 Unsuitable attribute names are renamed for gRPC Java support
- proto files are modified to support compilation of generated Java code
- schema.proto and yang_options.proto files are deleted since there is no need for netconf in Voltha.
Change-Id: I6d8796d74a284529e5bc5926762e77ceaa31638b
diff --git a/protos/voltha_protos/common.proto b/protos/voltha_protos/common.proto
index fb74a30..b6a2000 100644
--- a/protos/voltha_protos/common.proto
+++ b/protos/voltha_protos/common.proto
@@ -1,10 +1,10 @@
syntax = "proto3";
-option go_package = "github.com/opencord/voltha-protos/v2/go/common";
+option go_package = "github.com/opencord/voltha-protos/v3/go/common";
package common;
-import "voltha_protos/yang_options.proto";
+option java_package = "org.opencord.voltha";
// Convey a resource identifier
message ID {
@@ -21,10 +21,8 @@
}
message LogLevel {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
// Logging verbosity level
- enum LogLevel {
+ enum Types {
DEBUG = 0;
INFO = 1;
WARNING = 2;
@@ -35,7 +33,7 @@
}
message Logging {
- common.LogLevel.LogLevel level = 1;
+ common.LogLevel.Types level = 1;
string package_name = 2;
string component_name = 3;
}
@@ -51,10 +49,8 @@
}
message AdminState {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
// Administrative State
- enum AdminState {
+ enum Types {
// The administrative state of the device is unknown
UNKNOWN = 0;
@@ -78,10 +74,8 @@
}
message OperStatus {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
// Operational Status
- enum OperStatus {
+ enum Types {
// The status of the device is unknown at this point
UNKNOWN = 0;
@@ -104,10 +98,8 @@
}
message ConnectStatus {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
// Connectivity Status
- enum ConnectStatus {
+ enum Types {
// The device connectivity status is unknown
UNKNOWN = 0;
@@ -121,8 +113,6 @@
}
message OperationResp {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
enum OperationReturnCode {
OPERATION_SUCCESS = 0;
OPERATION_FAILURE = 1;
@@ -133,6 +123,4 @@
// Additional Info
string additional_info = 2;
-}
-
-
+}
\ No newline at end of file