[VOL-4111] Moving Services under the UNI struct
Controlling the UNI state via OMCI Set Messages
Upgraded APIs to reflect the new format

Change-Id: I3a6c166205fad4a381e562ab3b873d03b633303e
diff --git a/api/bbsim/bbsim.proto b/api/bbsim/bbsim.proto
index 8f01dc6..086057f 100644
--- a/api/bbsim/bbsim.proto
+++ b/api/bbsim/bbsim.proto
@@ -82,9 +82,9 @@
     string OperState = 3;
     string InternalState = 4;
     int32 PonPortID = 5;
-    string HwAddress = 8;
-    int32 PortNo = 9;
-    repeated Service services = 10;
+    string HwAddress = 8 [deprecated = true];
+    int32 PortNo = 9 [deprecated = true];
+    repeated Service services = 10 [deprecated = true];
     int32 ImageSoftwareExpectedSections = 11;
     int32 ImageSoftwareReceivedSections = 12;
     int32 ActiveImageEntityId = 13;
@@ -98,6 +98,8 @@
     string OnuSn = 3;
     uint32 MeID = 4;
     string OperState = 5;
+    int32 PortNo = 6;
+    repeated Service services = 7;
 }
 
 message Service {
@@ -114,6 +116,7 @@
     string DhcpState = 11;
     string InternalState = 12;
     string IGMPState = 13;
+    uint32 UniId = 14;
 }
 
 message ONUTrafficSchedulers {
@@ -283,10 +286,6 @@
     rpc GetServices (Empty) returns (Services) {
     }
 
-    // Get all the Services of an ONU by serial number
-    rpc GetOnuServices (ONURequest) returns (Services) {
-    }
-
     // Get all the UNIs of an ONU by serial number
     rpc GetOnuUnis (ONURequest) returns (UNIs) {
     }