Skip to content

Instantly share code, notes, and snippets.

@zdw

zdw/openolt-bal30-dev_voltha-protos-master.diff

Created July 30, 2019 21:06
Show Gist options
  • Save zdw/3413965af0455a21be573f85a4c19b31 to your computer and use it in GitHub Desktop.
Save zdw/3413965af0455a21be573f85a4c19b31 to your computer and use it in GitHub Desktop.
Download ZIP
Diff between .protos in openolt (multiple branches) and voltha-protos (master) repos
Raw
openolt-bal30-dev_voltha-protos-master.diff
--- protos/openolt.proto 2019-07-30 10:46:57.000000000 -0700
+++ ../voltha-protos/protos/voltha_protos/openolt.proto 2019-07-30 10:45:53.000000000 -0700
@@ -13,9 +13,12 @@
// limitations under the License.
syntax = "proto3";
+
+option go_package = "github.com/opencord/voltha-protos/go/openolt";
+
package openolt;
import "google/api/annotations.proto";
-import "tech_profile.proto";
+import public "voltha_protos/tech_profile.proto";
service Openolt {
@@ -269,7 +272,6 @@
message UplinkPacket {
fixed32 intf_id = 1;
bytes pkt = 2;
- fixed32 flow_id = 3;
}
message DeviceInfo {
@@ -375,6 +377,7 @@
sfixed32 priority = 9;
fixed64 cookie = 12; // must be provided for any flow with trap_to_host action. Returned in PacketIndication
fixed32 port_no = 13; // must be provided for any flow with trap_to_host action. Returned in PacketIndication
+ fixed32 group_id = 14;
}
message SerialNumber {
@@ -474,7 +477,6 @@
message OnuActivationFailureIndication {
fixed32 intf_id = 1;
fixed32 onu_id = 2;
- fixed32 fail_reason = 3;
}
message OnuProcessingErrorIndication {
@@ -483,4 +485,3 @@
}
message Empty {}
-
Raw
openolt-master_voltha-protos-master.diff
--- protos/openolt.proto 2019-07-30 10:46:25.000000000 -0700
+++ ../voltha-protos/protos/voltha_protos/openolt.proto 2019-07-30 10:45:53.000000000 -0700
@@ -13,9 +13,12 @@
// limitations under the License.
syntax = "proto3";
+
+option go_package = "github.com/opencord/voltha-protos/go/openolt";
+
package openolt;
import "google/api/annotations.proto";
-import "tech_profile.proto";
+import public "voltha_protos/tech_profile.proto";
service Openolt {
@@ -103,13 +106,6 @@
};
}
- rpc GetPonIf(Interface) returns (IntfIndication) {
- option (google.api.http) = {
- post: "/v1/GetPonIf"
- body: "*"
- };
- }
-
rpc DisablePonIf(Interface) returns (Empty) {
option (google.api.http) = {
post: "/v1/DisablePonIf"
@@ -220,7 +216,6 @@
string oper_state = 3; // up, down
string admin_state = 5; // up, down
SerialNumber serial_number = 4;
- bytes registration_id = 6; // reg_id of onu
}
message IntfOperIndication {
@@ -382,6 +377,7 @@
sfixed32 priority = 9;
fixed64 cookie = 12; // must be provided for any flow with trap_to_host action. Returned in PacketIndication
fixed32 port_no = 13; // must be provided for any flow with trap_to_host action. Returned in PacketIndication
+ fixed32 group_id = 14;
}
message SerialNumber {
@@ -489,4 +485,3 @@
}
message Empty {}
-
Raw
openolt-voltha-1.7_voltha-protos-master.diff
--- protos/openolt.proto 2019-07-30 10:47:57.000000000 -0700
+++ ../voltha-protos/protos/voltha_protos/openolt.proto 2019-07-30 10:45:53.000000000 -0700
@@ -13,9 +13,12 @@
// limitations under the License.
syntax = "proto3";
+
+option go_package = "github.com/opencord/voltha-protos/go/openolt";
+
package openolt;
import "google/api/annotations.proto";
-import "tech_profile.proto";
+import public "voltha_protos/tech_profile.proto";
service Openolt {
@@ -374,6 +377,7 @@
sfixed32 priority = 9;
fixed64 cookie = 12; // must be provided for any flow with trap_to_host action. Returned in PacketIndication
fixed32 port_no = 13; // must be provided for any flow with trap_to_host action. Returned in PacketIndication
+ fixed32 group_id = 14;
}
message SerialNumber {
@@ -481,4 +485,3 @@
}
message Empty {}
-
Raw
tp_openolt-bal30-dev_voltha-protos-master.diff
--- protos/tech_profile.proto 2019-07-30 10:46:25.000000000 -0700
+++ ../voltha-protos/protos/voltha_protos/tech_profile.proto 2019-07-30 10:45:53.000000000 -0700
@@ -13,6 +13,9 @@
// limitations under the License.
syntax = "proto3";
+
+option go_package = "github.com/opencord/voltha-protos/go/tech_profile";
+
package tech_profile;
import "google/api/annotations.proto";
@@ -70,6 +73,7 @@
fixed32 alloc_id = 2; // valid only if “direction == Upstream ”
SchedulerConfig scheduler = 3;
TrafficShapingInfo traffic_shaping_info = 4;
+ fixed32 parent_sched_id = 5; // Used with HQoS, points to interface sched if not present
}
message TrafficSchedulers {
@@ -110,11 +114,13 @@
fixed32 gemport_id = 2;
string pbit_map = 3;
bool aes_encryption = 4;
- SchedulingPolicy sched_policy = 5;
+ SchedulingPolicy sched_policy = 5; // This can be SP or WRR
fixed32 priority = 6;
fixed32 weight = 7;
DiscardPolicy discard_policy = 8;
DiscardConfig discard_config = 9;
+ TrafficShapingInfo shaping_info = 10; // Not used in the current version
+ fixed32 scheduler_id = 11; // Ties the queue to a scheduler
}
message TrafficQueues {
Raw
tp_openolt-master_voltha-protos-master.diff
--- protos/tech_profile.proto 2019-07-30 10:46:25.000000000 -0700
+++ ../voltha-protos/protos/voltha_protos/tech_profile.proto 2019-07-30 10:45:53.000000000 -0700
@@ -13,6 +13,9 @@
// limitations under the License.
syntax = "proto3";
+
+option go_package = "github.com/opencord/voltha-protos/go/tech_profile";
+
package tech_profile;
import "google/api/annotations.proto";
@@ -70,6 +73,7 @@
fixed32 alloc_id = 2; // valid only if “direction == Upstream ”
SchedulerConfig scheduler = 3;
TrafficShapingInfo traffic_shaping_info = 4;
+ fixed32 parent_sched_id = 5; // Used with HQoS, points to interface sched if not present
}
message TrafficSchedulers {
@@ -110,11 +114,13 @@
fixed32 gemport_id = 2;
string pbit_map = 3;
bool aes_encryption = 4;
- SchedulingPolicy sched_policy = 5;
+ SchedulingPolicy sched_policy = 5; // This can be SP or WRR
fixed32 priority = 6;
fixed32 weight = 7;
DiscardPolicy discard_policy = 8;
DiscardConfig discard_config = 9;
+ TrafficShapingInfo shaping_info = 10; // Not used in the current version
+ fixed32 scheduler_id = 11; // Ties the queue to a scheduler
}
message TrafficQueues {
Raw
tp_openolt-voltha-1.7_voltha-protos-master.diff
--- protos/tech_profile.proto 2019-07-30 10:46:25.000000000 -0700
+++ ../voltha-protos/protos/voltha_protos/tech_profile.proto 2019-07-30 10:45:53.000000000 -0700
@@ -13,6 +13,9 @@
// limitations under the License.
syntax = "proto3";
+
+option go_package = "github.com/opencord/voltha-protos/go/tech_profile";
+
package tech_profile;
import "google/api/annotations.proto";
@@ -70,6 +73,7 @@
fixed32 alloc_id = 2; // valid only if “direction == Upstream ”
SchedulerConfig scheduler = 3;
TrafficShapingInfo traffic_shaping_info = 4;
+ fixed32 parent_sched_id = 5; // Used with HQoS, points to interface sched if not present
}
message TrafficSchedulers {
@@ -110,11 +114,13 @@
fixed32 gemport_id = 2;
string pbit_map = 3;
bool aes_encryption = 4;
- SchedulingPolicy sched_policy = 5;
+ SchedulingPolicy sched_policy = 5; // This can be SP or WRR
fixed32 priority = 6;
fixed32 weight = 7;
DiscardPolicy discard_policy = 8;
DiscardConfig discard_config = 9;
+ TrafficShapingInfo shaping_info = 10; // Not used in the current version
+ fixed32 scheduler_id = 11; // Ties the queue to a scheduler
}
message TrafficQueues {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment