commit c9b4bf1f617f3823da6240eed9b88d59f086901c
author Jian Li <pyguni@gmail.com> Mon Jun 26 23:50:32 2017 +0900
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Tue Jul 11 23:18:30 2017 +0000
tree 4b483f9e251f0d5c10a0a731d67a554be70fa066
parent db3be6f6362a2af6b80a3af9ea36902b8fad8db5

Refactor protocol buffer to split models into different packages

Change-Id: I26152ba227ebe9afd871c6e501ccca17c49e1e4e

incubator/rpc-grpc/src/main/proto/DeviceService.proto

diff --git a/incubator/rpc-grpc/src/main/proto/DeviceService.proto b/incubator/rpc-grpc/src/main/proto/DeviceService.proto
index 5ae7cd6..9ff86c5 100644
--- a/incubator/rpc-grpc/src/main/proto/DeviceService.proto
+++ b/incubator/rpc-grpc/src/main/proto/DeviceService.proto
@@ -1,15 +1,17 @@
 syntax = "proto3";
 option java_package = "org.onosproject.grpc.net.device";
 
-import "models/Device.proto";
-import "models/Port.proto";
+import "net/device/DeviceDescriptionProto.proto";
+import "net/device/PortDescriptionProto.proto";
+import "net/device/PortStatisticsProto.proto";
+import "net/device/DeviceEnumsProto.proto";
 
 package Device;
 
 message DeviceConnected {
   // DeviceID as String DeviceId#toString
   string device_id = 1;
-  DeviceDescription device_description = 2;
+  net.device.DeviceDescriptionProto device_description = 2;
 }
 
 message DeviceDisconnected {
@@ -20,26 +22,26 @@
 message UpdatePorts {
   // DeviceID as String DeviceId#toString
   string device_id = 1;
-  repeated Port.PortDescription port_descriptions= 2;
+  repeated net.device.PortDescriptionProto port_descriptions= 2;
 }
 
 message PortStatusChanged {
   // DeviceID as String DeviceId#toString
   string device_id = 1;
-  Port.PortDescription port_description= 2;
+  net.device.PortDescriptionProto port_description= 2;
 }
 
 message ReceivedRoleReply {
   // DeviceID as String DeviceId#toString
   string device_id = 1;
-  MastershipRole requested = 2;
-  MastershipRole response = 3;
+  net.device.MastershipRoleProto requested = 2;
+  net.device.MastershipRoleProto response = 3;
 }
 
 message UpdatePortStatistics {
   // DeviceID as String DeviceId#toString
   string device_id = 1;
-  repeated Port.PortStatistics port_statistics = 2;
+  repeated net.device.PortStatisticsProto port_statistics = 2;
 }
 
 message RegisterProvider {
@@ -72,7 +74,7 @@
 message RoleChanged {
   // DeviceID as String DeviceId#toString
   string device_id = 1;
-  MastershipRole new_role = 2;
+  net.device.MastershipRoleProto new_role = 2;
 }
 
 message IsReachableRequest {

incubator/rpc-grpc/src/main/proto/LinkService.proto

diff --git a/incubator/rpc-grpc/src/main/proto/LinkService.proto b/incubator/rpc-grpc/src/main/proto/LinkService.proto
index ee32453..e211e11 100644
--- a/incubator/rpc-grpc/src/main/proto/LinkService.proto
+++ b/incubator/rpc-grpc/src/main/proto/LinkService.proto
@@ -1,7 +1,8 @@
 syntax = "proto3";
 option java_package = "org.onosproject.grpc.net.link";
 
-import "models/Link.proto";
+import "net/link/LinkDescriptionProto.proto";
+import "net/ConnectPointProto.proto";
 
 package Link;
 
@@ -11,15 +12,15 @@
 message LinkDetectedMsg {
   // ProviderId scheme only
   string provider_id = 1;
-  LinkDescription link_description = 2;
+  net.link.LinkDescriptionProto link_description = 2;
 }
 
 message LinkVanishedMsg {
   // ProviderId scheme only
   string provider_id = 1;
   oneof subject {
-    LinkDescription link_description = 2;
-    ConnectPoint connect_point = 3;
+    net.link.LinkDescriptionProto link_description = 2;
+    net.ConnectPointProto connect_point = 3;
     string device_id = 4;
   }
 }