Skip to content

Keep ErrOperationOnFunctionNotSupported matchable and stop logging it as an error #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andig wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Keep ErrOperationOnFunctionNotSupported matchable and stop logging it as an error #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions features/client/feature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,7 @@ func (f *Feature) requestData(function model.FunctionType, selectors any, elemen
fTypes := f.featureRemote.Operations()
op, exists := fTypes[function]
if !exists || !op.Read() {
errWithFunction := fmt.Sprintf("%s %s", api.ErrOperationOnFunctionNotSupported.Error(), function)
return nil, errors.New(errWithFunction)
return nil, fmt.Errorf("%w %s", api.ErrOperationOnFunctionNotSupported, function)
}

// remove the selectors if the remote does not allow partial reads
Expand Down
4 changes: 3 additions & 1 deletion features/client/feature_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package client
import (
"testing"

"github.com/enbility/eebus-go/api"
shipapi "github.com/enbility/ship-go/api"
spineapi "github.com/enbility/spine-go/api"
"github.com/enbility/spine-go/model"
Expand Down Expand Up @@ -161,8 +162,9 @@ func (s *FeatureSuite) Test_requestData() {
assert.Nil(s.T(), err)
assert.NotNil(s.T(), counter)

// the remote does not support this function, the sentinel must stay matchable
counter, err = s.testFeature2.requestData(model.FunctionTypeMeasurementDescriptionListData, nil, nil)
assert.NotNil(s.T(), err)
assert.ErrorIs(s.T(), err, api.ErrOperationOnFunctionNotSupported)
assert.Nil(s.T(), counter)

counter, err = s.testFeature2.requestData(model.FunctionTypeLoadControlLimitListData, nil, nil)
Expand Down
4 changes: 2 additions & 2 deletions usecases/cem/evcc/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func (e *EVCC) evConfigurationDescriptionDataUpdate(entity spineapi.EntityRemote
if evDeviceConfiguration, err := client.NewDeviceConfiguration(e.LocalEntity, entity); err == nil {
// key value descriptions received, now get the data
if _, err := evDeviceConfiguration.RequestKeyValues(nil, nil); err != nil {
logging.Log().Error("Error getting configuration key values:", err)
logging.Log().Debug("Error getting configuration key values:", err)
}
}
}
Expand Down Expand Up @@ -201,7 +201,7 @@ func (e *EVCC) evManufacturerDataUpdate(payload spineapi.EventPayload) {
func (e *EVCC) evElectricalParamerDescriptionUpdate(entity spineapi.EntityRemoteInterface) {
if evElectricalConnection, err := client.NewElectricalConnection(e.LocalEntity, entity); err == nil {
if _, err := evElectricalConnection.RequestPermittedValueSets(nil, nil); err != nil {
logging.Log().Error("Error getting electrical permitted values:", err)
logging.Log().Debug("Error getting electrical permitted values:", err)
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions usecases/cem/vabd/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ func (e *VABD) inverterConnected(entity spineapi.EntityRemoteInterface) {

// get electrical connection parameter
if _, err := electricalConnection.RequestDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}

if _, err := electricalConnection.RequestParameterDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}

Expand All @@ -64,11 +64,11 @@ func (e *VABD) inverterConnected(entity spineapi.EntityRemoteInterface) {

// get measurement parameters
if _, err := measurement.RequestDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}

if _, err := measurement.RequestConstraints(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}
}
Expand All @@ -78,7 +78,7 @@ func (e *VABD) inverterMeasurementDescriptionDataUpdate(entity spineapi.EntityRe
if measurement, err := client.NewMeasurement(e.LocalEntity, entity); err == nil {
// measurement descriptions received, now get the data
if _, err := measurement.RequestData(nil, nil); err != nil {
logging.Log().Error("Error getting measurement list values:", err)
logging.Log().Debug("Error getting measurement list values:", err)
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions usecases/cem/vapd/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (e *VAPD) inverterConnected(entity spineapi.EntityRemoteInterface) {

// get configuration data
if _, err := deviceConfiguration.RequestKeyValueDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}

Expand All @@ -66,11 +66,11 @@ func (e *VAPD) inverterConnected(entity spineapi.EntityRemoteInterface) {

// get electrical connection parameter
if _, err := electricalConnection.RequestDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}

if _, err := electricalConnection.RequestParameterDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}

Expand All @@ -83,11 +83,11 @@ func (e *VAPD) inverterConnected(entity spineapi.EntityRemoteInterface) {

// get measurement parameters
if _, err := measurement.RequestDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}

if _, err := measurement.RequestConstraints(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}
}
Expand All @@ -97,7 +97,7 @@ func (e *VAPD) inverterConfigurationDescriptionDataUpdate(entity spineapi.Entity
if deviceConfiguration, err := client.NewDeviceConfiguration(e.LocalEntity, entity); err == nil {
// key value descriptions received, now get the data
if _, err := deviceConfiguration.RequestKeyValues(nil, nil); err != nil {
logging.Log().Error("Error getting configuration key values:", err)
logging.Log().Debug("Error getting configuration key values:", err)
}
}
}
Expand All @@ -121,7 +121,7 @@ func (e *VAPD) inverterMeasurementDescriptionDataUpdate(entity spineapi.EntityRe
if measurement, err := client.NewMeasurement(e.LocalEntity, entity); err == nil {
// measurement descriptions received, now get the data
if _, err := measurement.RequestData(nil, nil); err != nil {
logging.Log().Error("Error getting measurement list values:", err)
logging.Log().Debug("Error getting measurement list values:", err)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion usecases/eg/lpc/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (e *LPC) configurationDescriptionDataUpdate(entity spineapi.EntityRemoteInt
if deviceConfiguration, err := client.NewDeviceConfiguration(e.LocalEntity, entity); err == nil {
// key value descriptions received, now get the data
if _, err := deviceConfiguration.RequestKeyValues(nil, nil); err != nil {
logging.Log().Error("Error getting configuration key values:", err)
logging.Log().Debug("Error getting configuration key values:", err)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion usecases/eg/lpp/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func (e *LPP) configurationDescriptionDataUpdate(entity spineapi.EntityRemoteInt
if deviceConfiguration, err := client.NewDeviceConfiguration(e.LocalEntity, entity); err == nil {
// key value descriptions received, now get the data
if _, err := deviceConfiguration.RequestKeyValues(nil, nil); err != nil {
logging.Log().Error("Error getting configuration key values:", err)
logging.Log().Debug("Error getting configuration key values:", err)
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions usecases/ma/mdt/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ func (e *MDT) deviceConnected(entity spineapi.EntityRemoteInterface) {

// get measurement parameters
if _, err := measurement.RequestDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}

if _, err := measurement.RequestConstraints(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}
}
Expand All @@ -59,7 +59,7 @@ func (e *MDT) deviceMeasurementDescriptionDataUpdate(entity spineapi.EntityRemot
if measurement, err := client.NewMeasurement(e.LocalEntity, entity); err == nil {
// measurement descriptions received, now get the data
if _, err := measurement.RequestData(nil, nil); err != nil {
logging.Log().Error("Error getting measurement list values:", err)
logging.Log().Debug("Error getting measurement list values:", err)
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions usecases/ma/mgcp/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (e *MGCP) gridConnected(entity spineapi.EntityRemoteInterface) {

// get configuration data
if _, err := deviceConfiguration.RequestKeyValueDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}

Expand All @@ -66,11 +66,11 @@ func (e *MGCP) gridConnected(entity spineapi.EntityRemoteInterface) {

// get electrical connection parameter
if _, err := electricalConnection.RequestDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}

if _, err := electricalConnection.RequestParameterDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}

Expand All @@ -83,11 +83,11 @@ func (e *MGCP) gridConnected(entity spineapi.EntityRemoteInterface) {

// get measurement parameters
if _, err := measurement.RequestDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}

if _, err := measurement.RequestConstraints(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}
}
Expand All @@ -97,7 +97,7 @@ func (e *MGCP) gridConfigurationDescriptionDataUpdate(entity spineapi.EntityRemo
if deviceConfiguration, err := client.NewDeviceConfiguration(e.LocalEntity, entity); err == nil {
// key value descriptions received, now get the data
if _, err := deviceConfiguration.RequestKeyValues(nil, nil); err != nil {
logging.Log().Error("Error getting configuration key values:", err)
logging.Log().Debug("Error getting configuration key values:", err)
}
}
}
Expand All @@ -119,7 +119,7 @@ func (e *MGCP) gridMeasurementDescriptionDataUpdate(entity spineapi.EntityRemote
if measurement, err := client.NewMeasurement(e.LocalEntity, entity); err == nil {
// measurement descriptions received, now get the data
if _, err := measurement.RequestData(nil, nil); err != nil {
logging.Log().Error("Error getting measurement list values:", err)
logging.Log().Debug("Error getting measurement list values:", err)
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions usecases/ma/mpc/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ func (e *MPC) deviceConnected(entity spineapi.EntityRemoteInterface) {

// get electrical connection parameter
if _, err := electricalConnection.RequestDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}

if _, err := electricalConnection.RequestParameterDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}

Expand All @@ -64,11 +64,11 @@ func (e *MPC) deviceConnected(entity spineapi.EntityRemoteInterface) {

// get measurement parameters
if _, err := measurement.RequestDescriptions(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}

if _, err := measurement.RequestConstraints(nil, nil); err != nil {
logging.Log().Error(err)
logging.Log().Debug(err)
}
}
}
Expand All @@ -78,7 +78,7 @@ func (e *MPC) deviceMeasurementDescriptionDataUpdate(entity spineapi.EntityRemot
if measurement, err := client.NewMeasurement(e.LocalEntity, entity); err == nil {
// measurement descriptions received, now get the data
if _, err := measurement.RequestData(nil, nil); err != nil {
logging.Log().Error("Error getting measurement list values:", err)
logging.Log().Debug("Error getting measurement list values:", err)
}
}
}
Expand Down
Loading