Kafka Integration Application (Fix Javadoc errors + review comments)
1. Refactored the application into two java projects api and app as per convention
2. Deleted the onos-app-gpb project. The proto files are consolidated in the
incubator-protobuf project as per suggestions.
3. Some code to translate ONOS Event pojo messages to GPB format.
4. Implementation of Subscribe and Unsubscribe APIs.
5. Minor changes due to review comments from 9212 and 9053
6. Refactored the proto fileso that its a 1:1 mapping between the core type to proto message.
Change-Id: I2bcc0de96150f838ccfe9e49293fe61d94062628
diff --git a/incubator/protobuf/src/main/proto/Device.proto b/incubator/protobuf/src/main/proto/Device.proto
index ec138e0..a01790e 100644
--- a/incubator/protobuf/src/main/proto/Device.proto
+++ b/incubator/protobuf/src/main/proto/Device.proto
@@ -3,6 +3,23 @@
package Device;
+message DeviceDescription {
+ string device_Uri = 1;
+ DeviceType type = 2;
+ string manufacturer = 3;
+ string hw_version = 4;
+ string sw_version = 5;
+ string serial_number = 6;
+ string chassis_id = 7;
+ map<string, string> annotations = 8;
+}
+
+enum MastershipRole {
+ NONE = 0;
+ MASTER = 1;
+ STANDBY = 2;
+}
+
enum DeviceType {
OTHER = 0;
SWITCH = 1;
@@ -20,8 +37,9 @@
MICROWAVE = 13;
}
-message DeviceDescription {
- string device_Uri = 1;
+// Corresponds to org.onosproject.net.Device.
+message DeviceCore {
+ string deviceId = 1;
DeviceType type = 2;
string manufacturer = 3;
string hw_version = 4;
@@ -29,10 +47,4 @@
string serial_number = 6;
string chassis_id = 7;
map<string, string> annotations = 8;
-}
-
-enum MastershipRole {
- NONE = 0;
- MASTER = 1;
- STANDBY = 2;
-}
+}
\ No newline at end of file