commit c594bb3ce0f0b7ddc16da3f340937ce51c6fe5bd
author Devmalya Paul <Devmalya.Paul@radisys.com> Wed Nov 06 07:34:27 2019 +0000
committer Devmalya Paul <Devmalya.Paul@radisys.com> Thu Dec 05 23:35:59 2019 -0500
tree 527cfa1a3491be65c8045a508de4c696542e939f
parent 2900188e16b17d39b8f8933bd797e47bbe47aaf4

VOL-2224 Event Filter Mechanism

         This commit contains the inital changes required for the event
         filtering so that when the protos get merged the rw and ro core
         could be built without compilation errors

         Note: This patchset and the patchset for voltha-protos needs to be merged
               as close to as possible otherwise there will be compilation errors

Change-Id: Id092fa19a0b302a33176a82e41b92a36ea8ede29

rw_core/core/adapter_proxy.go

diff --git a/rw_core/core/adapter_proxy.go b/rw_core/core/adapter_proxy.go
index c8b28aa..fac9b6d 100755
--- a/rw_core/core/adapter_proxy.go
+++ b/rw_core/core/adapter_proxy.go
@@ -532,15 +532,13 @@
 	return nil
 }
 
-// SuppressAlarm - TODO
-func (ap *AdapterProxy) SuppressAlarm(filter voltha.AlarmFilter) error {
-	log.Debug("SuppressAlarm")
+func (ap *AdapterProxy) SuppressEvent(filter *voltha.EventFilter) error {
+	log.Debug("SuppressEvent")
 	return nil
 }
 
-// UnSuppressAlarm - TODO
-func (ap *AdapterProxy) UnSuppressAlarm(filter voltha.AlarmFilter) error {
-	log.Debug("UnSuppressAlarm")
+func (ap *AdapterProxy) UnSuppressEvent(filter *voltha.EventFilter) error {
+	log.Debug("UnSuppressEvent")
 	return nil
 }
 

rw_core/core/grpc_nbi_api_handler.go

diff --git a/rw_core/core/grpc_nbi_api_handler.go b/rw_core/core/grpc_nbi_api_handler.go
index 7bbf5ee..36cb647 100755
--- a/rw_core/core/grpc_nbi_api_handler.go
+++ b/rw_core/core/grpc_nbi_api_handler.go
@@ -905,48 +905,33 @@
 	return handler.deviceMgr.listPmConfigs(ctx, id.Id)
 }
 
-// CreateAlarmFilter creates alarm filter
-func (handler *APIHandler) CreateAlarmFilter(ctx context.Context, filter *voltha.AlarmFilter) (*voltha.AlarmFilter, error) {
-	log.Debugw("CreateAlarmFilter-request", log.Fields{"filter": *filter})
-	if isTestMode(ctx) {
-		f := &voltha.AlarmFilter{Id: filter.Id}
-		return f, nil
-	}
-	return &voltha.AlarmFilter{}, errors.New("UnImplemented")
+func (handler *APIHandler) CreateEventFilter(ctx context.Context, filter *voltha.EventFilter) (*voltha.EventFilter, error) {
+	log.Debugw("CreateEventFilter-request", log.Fields{"filter": *filter})
+	return nil, errors.New("UnImplemented")
 }
 
-// UpdateAlarmFilter updates alarm filter
-func (handler *APIHandler) UpdateAlarmFilter(ctx context.Context, filter *voltha.AlarmFilter) (*voltha.AlarmFilter, error) {
-	log.Debugw("UpdateAlarmFilter-request", log.Fields{"filter": *filter})
-	if isTestMode(ctx) {
-		f := &voltha.AlarmFilter{Id: filter.Id}
-		return f, nil
-	}
-	return &voltha.AlarmFilter{}, errors.New("UnImplemented")
+func (handler *APIHandler) UpdateEventFilter(ctx context.Context, filter *voltha.EventFilter) (*voltha.EventFilter, error) {
+	log.Debugw("UpdateEventFilter-request", log.Fields{"filter": *filter})
+	return nil, errors.New("UnImplemented")
 }
 
-// DeleteAlarmFilter deletes alarm filter
-func (handler *APIHandler) DeleteAlarmFilter(ctx context.Context, id *voltha.ID) (*empty.Empty, error) {
-	log.Debugw("DeleteAlarmFilter-request", log.Fields{"id": *id})
-	if isTestMode(ctx) {
-		return &empty.Empty{}, nil
-	}
-	return &empty.Empty{}, errors.New("UnImplemented")
+func (handler *APIHandler) DeleteEventFilter(ctx context.Context, filterInfo *voltha.EventFilter) (*empty.Empty, error) {
+	log.Debugw("DeleteEventFilter-request", log.Fields{"device-id": filterInfo.DeviceId, "filter-id": filterInfo.Id})
+	return nil, errors.New("UnImplemented")
 }
 
-// ListAlarmFilters returns alarm filters
-func (handler *APIHandler) ListAlarmFilters(ctx context.Context, empty *empty.Empty) (*voltha.AlarmFilters, error) {
-	log.Debug("ListAlarmFilters")
-	return &voltha.AlarmFilters{}, errors.New("UnImplemented")
+// GetEventFilter returns all the filters present for a device
+func (handler *APIHandler) GetEventFilter(ctx context.Context, id *voltha.ID) (*voltha.EventFilters, error) {
+	log.Debugw("GetEventFilter-request", log.Fields{"device-id": id})
+	return nil, errors.New("UnImplemented")
 }
 
-// GetAlarmFilter returns alarm filter
-func (handler *APIHandler) GetAlarmFilter(ctx context.Context, id *voltha.ID) (*voltha.AlarmFilter, error) {
-	log.Debug("GetAlarmFilter")
-	return &voltha.AlarmFilter{}, errors.New("UnImplemented")
+// ListEventFilters returns all the filters known to the system
+func (handler *APIHandler) ListEventFilters(ctx context.Context, empty *empty.Empty) (*voltha.EventFilters, error) {
+	log.Debug("ListEventFilter-request")
+	return nil, errors.New("UnImplemented")
 }
 
-// SelfTest executes self test
 func (handler *APIHandler) SelfTest(ctx context.Context, id *voltha.ID) (*voltha.SelfTestResponse, error) {
 	log.Debugw("SelfTest-request", log.Fields{"id": id})
 	if isTestMode(ctx) {