VOL-1855: Support for techprofile
Also now use voltha-protos repo similar to other 2.x builds
Also a go fmt
Tested with:
voltha-go TP patch: https://gerrit.opencord.org/#/c/14767/
openolt TP patch: https://gerrit.opencord.org/#/c/14771/
Change-Id: I327573af6cd7f54cdfcb9fb4bdbdc24d960f96be
diff --git a/Dockerfile b/Dockerfile
index 61933f8..0c95968 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,9 +41,6 @@
# build the protos
COPY Makefile ./
-COPY openolt.proto ./
-COPY protos/ ./protos
-RUN make protos/openolt.pb.go
COPY api/ ./api
RUN make bbsimapi
diff --git a/Makefile b/Makefile
index 48f408b..3357de7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@
DOCKER_LABEL_COMMIT_DATE ?= $(shell git diff-index --quiet HEAD -- && git show -s --format=%cd --date=iso-strict HEAD || echo "unknown" )
DOCKER_LABEL_BUILD_DATE ?= $(shell date -u "+%Y-%m-%dT%H:%M:%SZ")
-bbsim: dep protos/openolt.pb.go bbsimapi
+bbsim: dep bbsimapi
GO111MODULE=on go build -i -v -o $@
dep:
@@ -37,13 +37,6 @@
GO111MODULE=off go get -v github.com/google/gopacket
GO111MODULE=on go mod download all
-protos/openolt.pb.go: openolt.proto
- @protoc -I . \
- -I${GOPATH}/src \
- -I${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
- --go_out=plugins=grpc:protos/ \
- $<
-
bbsimapi: api/bbsim.proto
@protoc -I ./api \
-I${GOPATH}/src \
@@ -61,7 +54,7 @@
--swagger_out=logtostderr=true,allow_delete_body=true:api/swagger/ \
bbsim.proto
-test: dep protos/openolt.pb.go bbsimapi
+test: dep bbsimapi
GO111MODULE=on go test -v ./...
GO111MODULE=on go test -v ./... -cover
diff --git a/core/alarms.go b/core/alarms.go
index 6296123..2261b55 100644
--- a/core/alarms.go
+++ b/core/alarms.go
@@ -22,7 +22,7 @@
pb "github.com/opencord/voltha-bbsim/api"
"github.com/opencord/voltha-bbsim/common/logger"
"github.com/opencord/voltha-bbsim/device"
- openolt "github.com/opencord/voltha-bbsim/protos"
+ openolt "github.com/opencord/voltha-protos/go/openolt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
diff --git a/core/core_server.go b/core/core_server.go
index 6899d86..a8d9d52 100644
--- a/core/core_server.go
+++ b/core/core_server.go
@@ -33,7 +33,7 @@
"github.com/opencord/voltha-bbsim/common/logger"
"github.com/opencord/voltha-bbsim/device"
flowHandler "github.com/opencord/voltha-bbsim/flow"
- openolt "github.com/opencord/voltha-bbsim/protos"
+ openolt "github.com/opencord/voltha-protos/go/openolt"
log "github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup"
"google.golang.org/grpc"
@@ -331,9 +331,9 @@
return err
}
- if state == onu.GetIntState(){
+ if state == onu.GetIntState() {
logger.WithFields(log.Fields{
- "toState": device.ONUState[state],
+ "toState": device.ONUState[state],
"currentState": device.ONUState[onu.GetIntState()],
}).Warn("Trying to update the state with the same state, ignoring this request")
return nil
diff --git a/core/eapol.go b/core/eapol.go
index c4dfe54..f14256d 100644
--- a/core/eapol.go
+++ b/core/eapol.go
@@ -42,7 +42,7 @@
EAP_SUCCESS
)
-func (eap clientState) String() string {
+func (eap clientState) String() string {
return [...]string{"EAP_START", "EAP_RESPID", "EAP_RESPCHA", "EAP_SUCCESS"}[eap]
}
@@ -152,10 +152,10 @@
return errors.New("Failed to send EAPStart")
}
logger.WithFields(log.Fields{
- "int_id": intfid,
- "onu_id": onuid,
+ "int_id": intfid,
+ "onu_id": onuid,
"eapolIn": eapolIn,
- "bytes": bytes,
+ "bytes": bytes,
}).Debug("EAPStart Sent")
time.Sleep(30 * time.Second)
}
diff --git a/core/grpc_service.go b/core/grpc_service.go
index 8ac0faf..9640458 100644
--- a/core/grpc_service.go
+++ b/core/grpc_service.go
@@ -17,6 +17,7 @@
package core
import (
+ "github.com/opencord/voltha-protos/go/tech_profile"
"net"
"github.com/google/gopacket"
@@ -25,7 +26,7 @@
"github.com/opencord/voltha-bbsim/common/logger"
"github.com/opencord/voltha-bbsim/device"
flowHandler "github.com/opencord/voltha-bbsim/flow"
- openolt "github.com/opencord/voltha-bbsim/protos"
+ openolt "github.com/opencord/voltha-protos/go/openolt"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
"google.golang.org/grpc"
@@ -120,15 +121,27 @@
return new(openolt.Empty), nil
}
-// CreateTconts method should handle Tcont creation
-func (s *Server) CreateTconts(c context.Context, tconts *openolt.Tconts) (*openolt.Empty, error) {
- logger.Debug("OLT receives CreateTconts()")
+// CreateTrafficSchedulers method should handle TrafficScheduler creation
+func (s *Server) CreateTrafficSchedulers(context.Context, *tech_profile.TrafficSchedulers) (*openolt.Empty, error) {
+ logger.Debug("OLT receives CreateTrafficSchedulers()")
return new(openolt.Empty), nil
}
-// RemoveTconts method should handle t-cont removal
-func (s *Server) RemoveTconts(c context.Context, tconts *openolt.Tconts) (*openolt.Empty, error) {
- logger.Debug("OLT receives RemoveTconts()")
+// RemoveTrafficSchedulers method should handle TrafficScheduler removal
+func (s *Server) RemoveTrafficSchedulers(context.Context, *tech_profile.TrafficSchedulers) (*openolt.Empty, error) {
+ logger.Debug("OLT receives RemoveTrafficSchedulers()")
+ return new(openolt.Empty), nil
+}
+
+// CreateTrafficQueues method should handle TrafficQueues creation
+func (s *Server) CreateTrafficQueues(context.Context, *tech_profile.TrafficQueues) (*openolt.Empty, error) {
+ logger.Debug("OLT receives CreateTrafficQueues()")
+ return new(openolt.Empty), nil
+}
+
+// RemoveTrafficQueues method should handle TrafficQueues removal
+func (s *Server) RemoveTrafficQueues(context.Context, *tech_profile.TrafficQueues) (*openolt.Empty, error) {
+ logger.Debug("OLT receives RemoveTrafficQueues()")
return new(openolt.Empty), nil
}
@@ -253,24 +266,23 @@
"c_tag": flow.Action.IVid,
}).Debug("OLT receives FlowAdd().")
-
// EAPOL flow
if flow.Classifier.EthType == uint32(layers.EthernetTypeEAPOL) {
logger.WithFields(log.Fields{
- "Classifier.OVid": flow.Classifier.OVid,
- "Classifier.IVid": flow.Classifier.IVid,
+ "Classifier.OVid": flow.Classifier.OVid,
+ "Classifier.IVid": flow.Classifier.IVid,
"Classifier.EthType": flow.Classifier.EthType,
"Classifier.SrcPort": flow.Classifier.SrcPort,
"Classifier.DstPort": flow.Classifier.DstPort,
- "Action.OVid": flow.Action.OVid,
- "Action.IVid": flow.Action.IVid,
- "IntfID": flow.AccessIntfId,
- "OltID": s.Olt.ID,
- "OnuID": flow.OnuId,
- "FlowId": flow.FlowId,
- "UniID": flow.UniId,
- "PortNo": flow.PortNo,
- "FlowType": flow.FlowType,
+ "Action.OVid": flow.Action.OVid,
+ "Action.IVid": flow.Action.IVid,
+ "IntfID": flow.AccessIntfId,
+ "OltID": s.Olt.ID,
+ "OnuID": flow.OnuId,
+ "FlowId": flow.FlowId,
+ "UniID": flow.UniId,
+ "PortNo": flow.PortNo,
+ "FlowType": flow.FlowType,
}).Debug("OLT receives EAPOL flow")
if flow.Classifier.OVid == 4091 {
diff --git a/core/omci.go b/core/omci.go
index b0e6bbb..857e98e 100644
--- a/core/omci.go
+++ b/core/omci.go
@@ -21,7 +21,7 @@
omci "github.com/opencord/omci-sim"
"github.com/opencord/voltha-bbsim/common/logger"
- openolt "github.com/opencord/voltha-bbsim/protos"
+ openolt "github.com/opencord/voltha-protos/go/openolt"
)
// RunOmciResponder starts a go routine to process/respond to OMCI messages from VOLTHA
diff --git a/core/openolt_service.go b/core/openolt_service.go
index a56b75c..7c7f498 100644
--- a/core/openolt_service.go
+++ b/core/openolt_service.go
@@ -20,7 +20,7 @@
"github.com/opencord/voltha-bbsim/common/logger"
"github.com/opencord/voltha-bbsim/device"
- openolt "github.com/opencord/voltha-bbsim/protos"
+ openolt "github.com/opencord/voltha-protos/go/openolt"
)
func sendOltIndUp(stream openolt.Openolt_EnableIndicationServer, olt *device.Olt) error {
diff --git a/device/device_onu.go b/device/device_onu.go
index 444e953..aafa793 100644
--- a/device/device_onu.go
+++ b/device/device_onu.go
@@ -21,7 +21,7 @@
"sync"
"github.com/opencord/voltha-bbsim/common/logger"
- openolt "github.com/opencord/voltha-bbsim/protos"
+ openolt "github.com/opencord/voltha-protos/go/openolt"
log "github.com/sirupsen/logrus"
)
diff --git a/flow/flow.go b/flow/flow.go
index e86b7b7..f1d6e10 100644
--- a/flow/flow.go
+++ b/flow/flow.go
@@ -18,7 +18,7 @@
import (
"github.com/opencord/voltha-bbsim/common/logger"
- openolt "github.com/opencord/voltha-bbsim/protos"
+ openolt "github.com/opencord/voltha-protos/go/openolt"
log "github.com/sirupsen/logrus"
)
@@ -75,11 +75,11 @@
func (fc *DefaultFlowController) AddFlow(flow *openolt.Flow) error {
logger.WithFields(log.Fields{
"flow_eth_type": flow.Classifier.EthType,
- "ovid": flow.Classifier.OVid,
- "ivid": flow.Classifier.IVid,
- "onu_id": flow.OnuId,
- "flow_id": flow.FlowId,
- "flow_type": flow.FlowType,
+ "ovid": flow.Classifier.OVid,
+ "ivid": flow.Classifier.IVid,
+ "onu_id": flow.OnuId,
+ "flow_id": flow.FlowId,
+ "flow_type": flow.FlowType,
}).Debugf("AddFlow invoked for onu %d", flow.OnuId)
return nil
}
diff --git a/go.mod b/go.mod
index ad2890c..256b8fe 100644
--- a/go.mod
+++ b/go.mod
@@ -9,6 +9,7 @@
github.com/google/gopacket v1.1.17
github.com/grpc-ecosystem/grpc-gateway v1.9.5
github.com/opencord/omci-sim v0.0.0-20190717165025-5ff7bb17f1e9
+ github.com/opencord/voltha-protos v0.0.0-20190802214823-9eceb0155700
github.com/sirupsen/logrus v1.4.2
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
golang.org/x/sync v0.0.0-20190423024810-112230192c58
diff --git a/go.sum b/go.sum
index b137f17..2835e5f 100644
--- a/go.sum
+++ b/go.sum
@@ -40,6 +40,8 @@
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/opencord/omci-sim v0.0.0-20190717165025-5ff7bb17f1e9 h1:qUbCkEFUDEtOBeG6JfI2oMD6dmUa/zJldvBR59RhRdM=
github.com/opencord/omci-sim v0.0.0-20190717165025-5ff7bb17f1e9/go.mod h1:W10NTwE0xK9Kh++wrflXPfkknMCaNKkb7Io/ihO4y3k=
+github.com/opencord/voltha-protos v0.0.0-20190802214823-9eceb0155700 h1:jJ4YJbvaaA3Z6I3X1aTCLlDkp/zPgwyovRXU/uMmEOg=
+github.com/opencord/voltha-protos v0.0.0-20190802214823-9eceb0155700/go.mod h1:MDGL9ai3XOPbiZ0tA8U7k4twK/T/P0Hh4gtjNxNk/qY=
github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41 h1:GeinFsrjWz97fAxVUEd748aV0cYL+I6k44gFJTCVvpU=
github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
diff --git a/openolt.proto b/openolt.proto
deleted file mode 100644
index 86c0027..0000000
--- a/openolt.proto
+++ /dev/null
@@ -1,570 +0,0 @@
-// Copyright (c) 2018 Open Networking Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at:
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-package openolt;
-import "google/api/annotations.proto";
-
-service Openolt {
-
- rpc DisableOlt(Empty) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/Disable"
- body: "*"
- };
- }
-
- rpc ReenableOlt(Empty) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/Reenable"
- body: "*"
- };
- }
-
- rpc ActivateOnu(Onu) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/EnableOnu"
- body: "*"
- };
- }
-
- rpc DeactivateOnu(Onu) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/DisableOnu"
- body: "*"
- };
- }
-
- rpc DeleteOnu(Onu) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/DeleteOnu"
- body: "*"
- };
- }
-
- rpc GetOnuInfo(Onu) returns (OnuIndication) {
- option (google.api.http) = {
- post: "/v1/GetOnuInfo"
- body: "*"
- };
- }
-
- rpc OmciMsgOut(OmciMsg) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/OmciMsgOut"
- body: "*"
- };
- }
-
- rpc OnuPacketOut(OnuPacket) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/OnuPacketOut"
- body: "*"
- };
- }
-
- rpc UplinkPacketOut(UplinkPacket) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/UplinkPacketOut"
- body: "*"
- };
- }
-
- rpc FlowAdd(Flow) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/FlowAdd"
- body: "*"
- };
- }
-
- rpc FlowRemove(Flow) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/FlowRemove"
- body: "*"
- };
- }
-
- rpc HeartbeatCheck(Empty) returns (Heartbeat) {
- option (google.api.http) = {
- post: "/v1/HeartbeatCheck"
- body: "*"
- };
- }
-
- rpc EnablePonIf(Interface) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/EnablePonIf"
- body: "*"
- };
- }
-
- 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"
- body: "*"
- };
- }
-
- rpc GetDeviceInfo(Empty) returns (DeviceInfo) {
- option (google.api.http) = {
- post: "/v1/GetDeviceInfo"
- body: "*"
- };
- }
-
- rpc Reboot(Empty) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/Reboot"
- body: "*"
- };
- }
-
- rpc CollectStatistics(Empty) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/CollectStatistics"
- body: "*"
- };
- }
-
- rpc CreateTconts(Tconts) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/CreateTconts"
- body: "*"
- };
- }
-
- rpc RemoveTconts(Tconts) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/RemoveTconts"
- body: "*"
- };
- }
-
- rpc EnableIndication(Empty) returns (stream Indication) {}
-}
-
-message Indication {
- oneof data {
- OltIndication olt_ind = 1;
- IntfIndication intf_ind = 2;
- IntfOperIndication intf_oper_ind = 3;
- OnuDiscIndication onu_disc_ind = 4;
- OnuIndication onu_ind = 5;
- OmciIndication omci_ind = 6;
- PacketIndication pkt_ind = 7;
- PortStatistics port_stats = 8;
- FlowStatistics flow_stats = 9;
- AlarmIndication alarm_ind= 10;
- }
-}
-
-message AlarmIndication {
- oneof data {
- LosIndication los_ind = 1;
- DyingGaspIndication dying_gasp_ind = 2;
- OnuAlarmIndication onu_alarm_ind = 3;
- OnuStartupFailureIndication onu_startup_fail_ind = 4;
- OnuSignalDegradeIndication onu_signal_degrade_ind = 5;
- OnuDriftOfWindowIndication onu_drift_of_window_ind = 6;
- OnuLossOfOmciChannelIndication onu_loss_omci_ind = 7;
- OnuSignalsFailureIndication onu_signals_fail_ind = 8;
- OnuTransmissionInterferenceWarning onu_tiwi_ind = 9;
- OnuActivationFailureIndication onu_activation_fail_ind = 10;
- OnuProcessingErrorIndication onu_processing_error_ind = 11;
- }
-}
-
-message OltIndication {
- string oper_state = 1; // up, down
-}
-
-message IntfIndication {
- fixed32 intf_id = 1;
- string oper_state = 2; // up, down
-}
-
-message OnuDiscIndication {
- fixed32 intf_id = 1;
- SerialNumber serial_number = 2;
-}
-
-message OnuIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string oper_state = 3; // up, down
- string admin_state = 5; // up, down
- SerialNumber serial_number = 4;
-}
-
-message IntfOperIndication {
- string type = 1; // nni, pon
- fixed32 intf_id = 2;
- string oper_state = 3; // up, down
-}
-
-message OmciIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- bytes pkt = 3;
-}
-
-message PacketIndication {
- string intf_type = 5; // nni, pon, unknown
- fixed32 intf_id = 1;
- fixed32 gemport_id = 2;
- fixed32 flow_id = 3;
- fixed32 port_no = 6;
- fixed64 cookie = 7;
- bytes pkt = 4;
-}
-
-message Interface {
- fixed32 intf_id = 1;
-}
-
-message Heartbeat {
- fixed32 heartbeat_signature = 1;
-}
-
-message Onu {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- SerialNumber serial_number = 3;
- fixed32 pir = 4; // peak information rate assigned to onu
-}
-
-message OmciMsg {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- bytes pkt = 3;
-}
-
-message OnuPacket {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- fixed32 port_no = 4;
- bytes pkt = 3;
-}
-
-message UplinkPacket {
- fixed32 intf_id = 1;
- bytes pkt = 2;
-}
-
-message DeviceInfo {
- string vendor = 1;
- string model = 2;
- string hardware_version = 3;
- string firmware_version = 4;
- string device_id = 16;
- string device_serial_number = 17;
-
- // Total number of pon intf ports on the device
- fixed32 pon_ports = 12;
-
- // If using global per-device technology profile. To be deprecated
- string technology = 5;
- fixed32 onu_id_start = 6;
- fixed32 onu_id_end = 7;
- fixed32 alloc_id_start = 8;
- fixed32 alloc_id_end = 9;
- fixed32 gemport_id_start = 10;
- fixed32 gemport_id_end = 11;
- fixed32 flow_id_start = 13;
- fixed32 flow_id_end = 14;
-
- message DeviceResourceRanges {
-
- // List of 0 or more intf_ids that use the same technology and pools.
- // If 0 intf_ids supplied, it implies ALL interfaces
- repeated fixed32 intf_ids = 1;
-
- // Technology profile for this pool
- string technology = 2;
-
- message Pool {
- enum PoolType {
- ONU_ID = 0;
- ALLOC_ID = 1;
- GEMPORT_ID = 2;
- FLOW_ID = 3;
- }
-
- enum SharingType {
- DEDICATED_PER_INTF = 0;
- SHARED_BY_ALL_INTF_ALL_TECH = 1; // Shared across all interfaces in all technologies in all ranges
- SHARED_BY_ALL_INTF_SAME_TECH = 2; // Shared across all interfaces of the same technology used in this range
- }
-
- PoolType type = 1;
- SharingType sharing = 2;
- fixed32 start = 3; // lower bound on IDs allocated from this pool
- fixed32 end = 4; // upper bound on IDs allocated from this pool
- }
- repeated Pool pools = 3;
- }
- repeated DeviceResourceRanges ranges = 15;
-}
-
-message Classifier {
- fixed32 o_tpid = 1;
- fixed32 o_vid = 2;
- fixed32 i_tpid = 3;
- fixed32 i_vid = 4;
- fixed32 o_pbits = 5;
- fixed32 i_pbits = 6;
- fixed32 eth_type = 7;
- bytes dst_mac = 8;
- bytes src_mac = 9;
- fixed32 ip_proto = 10;
- fixed32 dst_ip = 11;
- fixed32 src_ip = 12;
- fixed32 src_port = 13;
- fixed32 dst_port = 14;
- string pkt_tag_type = 15; // untagged, single_tag, double_tag
-}
-
-message ActionCmd {
- bool add_outer_tag = 1;
- bool remove_outer_tag = 2;
- bool trap_to_host = 3;
-}
-
-message Action {
- ActionCmd cmd = 1;
- fixed32 o_vid = 2;
- fixed32 o_pbits = 3;
- fixed32 o_tpid = 4;
- fixed32 i_vid = 5;
- fixed32 i_pbits = 6;
- fixed32 i_tpid = 7;
-}
-
-message Flow {
- sfixed32 access_intf_id = 1;
- sfixed32 onu_id = 2;
- sfixed32 uni_id = 11;
- fixed32 flow_id = 3;
- string flow_type = 4; // upstream, downstream, broadcast, multicast
- sfixed32 alloc_id = 10;
- sfixed32 network_intf_id = 5;
- sfixed32 gemport_id = 6;
- Classifier classifier = 7;
- Action action = 8;
- 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
-}
-
-message SerialNumber {
- bytes vendor_id = 1;
- bytes vendor_specific = 2;
-}
-
-message PortStatistics {
- fixed32 intf_id = 1;
- fixed64 rx_bytes = 2;
- fixed64 rx_packets = 3;
- fixed64 rx_ucast_packets = 4;
- fixed64 rx_mcast_packets = 5;
- fixed64 rx_bcast_packets = 6;
- fixed64 rx_error_packets = 7;
- fixed64 tx_bytes = 8;
- fixed64 tx_packets = 9;
- fixed64 tx_ucast_packets = 10;
- fixed64 tx_mcast_packets = 11;
- fixed64 tx_bcast_packets = 12;
- fixed64 tx_error_packets = 13;
- fixed64 rx_crc_errors = 14;
- fixed64 bip_errors = 15;
- fixed32 timestamp = 16;
-}
-
-message FlowStatistics {
- fixed32 flow_id = 1;
- fixed64 rx_bytes = 2;
- fixed64 rx_packets = 3;
- fixed64 tx_bytes = 8;
- fixed64 tx_packets = 9;
- fixed32 timestamp = 16;
-}
-
-message LosIndication {
- fixed32 intf_id = 1;
- string status = 2;
-}
-
-message DyingGaspIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
-}
-
-message OnuAlarmIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string los_status = 3;
- string lob_status = 4;
- string lopc_miss_status = 5;
- string lopc_mic_error_status = 6;
-}
-
-message OnuStartupFailureIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
-}
-
-message OnuSignalDegradeIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
- fixed32 inverse_bit_error_rate = 4;
-}
-
-message OnuDriftOfWindowIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
- fixed32 drift = 4;
- fixed32 new_eqd = 5;
-}
-
-message OnuLossOfOmciChannelIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
-}
-
-message OnuSignalsFailureIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
- fixed32 inverse_bit_error_rate = 4;
-}
-
-message OnuTransmissionInterferenceWarning {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
- fixed32 drift = 4;
-}
-
-message OnuActivationFailureIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
-}
-
-message OnuProcessingErrorIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
-}
-
-enum Direction {
- UPSTREAM = 0;
- DOWNSTREAM = 1;
- BIDIRECTIONAL = 2;
-}
-
-enum SchedulingPolicy {
- WRR = 0;
- StrictPriority = 1;
- Hybrid = 2;
-}
-
-enum AdditionalBW {
- AdditionalBW_None = 0;
- AdditionalBW_NA = 1;
- AdditionalBW_BestEffort = 2;
- AdditionalBW_Auto = 3;
-}
-
-enum DiscardPolicy {
- TailDrop = 0;
- WTailDrop = 1;
- Red = 2;
- WRed = 3;
-}
-
-enum InferredAdditionBWIndication {
- InferredAdditionBWIndication_None = 0;
- InferredAdditionBWIndication_Assured = 1;
- InferredAdditionBWIndication_BestEffort = 2;
-}
-
-message Scheduler {
- Direction direction = 1;
- AdditionalBW additional_bw = 2; // Valid on for “direction == Upstream”.
- fixed32 priority = 3;
- fixed32 weight = 4;
- SchedulingPolicy sched_policy = 5;
-}
-
-message TrafficShapingInfo {
- fixed32 cir = 1;
- fixed32 cbs = 2;
- fixed32 pir = 3;
- fixed32 pbs = 4;
- fixed32 gir = 5; // only if “direction == Upstream ”
- InferredAdditionBWIndication add_bw_ind = 6; // only if “direction == Upstream”
-}
-
-message Tcont {
- Direction direction = 1;
- fixed32 alloc_id = 2; // valid only if “direction == Upstream ”
- Scheduler scheduler = 3;
- TrafficShapingInfo traffic_shaping_info = 4;
-}
-
-message Tconts {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- fixed32 uni_id = 4;
- fixed32 port_no = 5;
- repeated Tcont tconts = 3;
-}
-
-message TailDropDiscardConfig {
- fixed32 queue_size = 1;
-}
-
-message RedDiscardConfig {
- fixed32 min_threshold = 1;
- fixed32 max_threshold = 2;
- fixed32 max_probability = 3;
-}
-
-message WRedDiscardConfig {
- RedDiscardConfig green = 1;
- RedDiscardConfig yellow = 2;
- RedDiscardConfig red = 3;
-}
-
-message DiscardConfig {
- DiscardPolicy discard_policy = 1;
- oneof discard_config {
- TailDropDiscardConfig tail_drop_discard_config = 2;
- RedDiscardConfig red_discard_config = 3;
- WRedDiscardConfig wred_discard_config = 4;
- }
-}
-
-message Empty {}
diff --git a/protos/.gitignore b/protos/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/protos/.gitignore
+++ /dev/null