Merge branch 'release/v0.6.1'

Author: DerAndereAndi

api/configuration.go

@@ -64,11 +64,6 @@ type Configuration struct {
 	// The certificate used for the service and its connections, required
 	certificate tls.Certificate
 
-	// The sites grid voltage
-	// This is useful when e.g. power values are not available and therefor
-	// need to be calculated using the current values
-	voltage float64
-
 	// The timeout to be used for sending heartbeats
 	heartbeatTimeout time.Duration
 
@@ -86,13 +81,11 @@ func NewConfiguration(
 	entityTypes []model.EntityTypeType,
 	port int,
 	certificate tls.Certificate,
-	voltage float64,
 	heartbeatTimeout time.Duration,
 ) (*Configuration, error) {
 	configuration := &Configuration{
 		certificate:           certificate,
 		port:                  port,
-		voltage:               voltage,
 		heartbeatTimeout:      heartbeatTimeout,
 		mdnsProviderSelection: mdns.MdnsProviderSelectionGoZeroConfOnly,
 	}
@@ -242,11 +235,6 @@ func (s *Configuration) SetCertificate(cert tls.Certificate) {
 	s.certificate = cert
 }
 
-// return the sites predefined grid voltage
-func (s *Configuration) Voltage() float64 {
-	return s.voltage
-}
-
 func (s *Configuration) HeartbeatTimeout() time.Duration {
 	return s.heartbeatTimeout
 }

api/configuration_test.go

@@ -27,54 +27,53 @@ func (s *ConfigurationSuite) Test_Configuration() {
 	model := "model"
 	serial := "serial"
 	port := 4567
-	volt := 230.0
 	heartbeatTimeout := time.Second * 4
 	entityTypes := []spinemodel.EntityTypeType{spinemodel.EntityTypeTypeCEM}
 
 	config, err := NewConfiguration("", brand, model, serial, spinemodel.DeviceTypeTypeEnergyManagementSystem,
-		entityTypes, 0, certificate, volt, heartbeatTimeout)
+		entityTypes, 0, certificate, heartbeatTimeout)
 
 	assert.Nil(s.T(), config)
 	assert.NotNil(s.T(), err)
 
 	config, err = NewConfiguration("", brand, model, serial, spinemodel.DeviceTypeTypeEnergyManagementSystem,
-		entityTypes, port, certificate, volt, heartbeatTimeout)
+		entityTypes, port, certificate, heartbeatTimeout)
 
 	assert.Nil(s.T(), config)
 	assert.NotNil(s.T(), err)
 
 	config, err = NewConfiguration(vendor, "", model, serial, spinemodel.DeviceTypeTypeEnergyManagementSystem,
-		entityTypes, port, certificate, 230, heartbeatTimeout)
+		entityTypes, port, certificate, heartbeatTimeout)
 
 	assert.Nil(s.T(), config)
 	assert.NotNil(s.T(), err)
 
 	config, err = NewConfiguration(vendor, brand, "", serial, spinemodel.DeviceTypeTypeEnergyManagementSystem,
-		entityTypes, port, certificate, 230, heartbeatTimeout)
+		entityTypes, port, certificate, heartbeatTimeout)
 
 	assert.Nil(s.T(), config)
 	assert.NotNil(s.T(), err)
 
 	config, err = NewConfiguration(vendor, brand, model, "", spinemodel.DeviceTypeTypeEnergyManagementSystem,
-		entityTypes, port, certificate, 230, heartbeatTimeout)
+		entityTypes, port, certificate, heartbeatTimeout)
 
 	assert.Nil(s.T(), config)
 	assert.NotNil(s.T(), err)
 
 	config, err = NewConfiguration(vendor, brand, model, serial, "",
-		entityTypes, port, certificate, 230, heartbeatTimeout)
+		entityTypes, port, certificate, heartbeatTimeout)
 
 	assert.Nil(s.T(), config)
 	assert.NotNil(s.T(), err)
 
 	config, err = NewConfiguration(vendor, brand, model, serial, spinemodel.DeviceTypeTypeEnergyManagementSystem,
-		[]spinemodel.EntityTypeType{}, port, certificate, 230, heartbeatTimeout)
+		[]spinemodel.EntityTypeType{}, port, certificate, heartbeatTimeout)
 
 	assert.Nil(s.T(), config)
 	assert.NotNil(s.T(), err)
 
 	config, err = NewConfiguration(vendor, brand, model, serial, spinemodel.DeviceTypeTypeEnergyManagementSystem,
-		entityTypes, port, certificate, 230, heartbeatTimeout)
+		entityTypes, port, certificate, heartbeatTimeout)
 
 	assert.NotNil(s.T(), config)
 	assert.Nil(s.T(), err)
@@ -110,9 +109,6 @@ func (s *ConfigurationSuite) Test_Configuration() {
 	id = config.MdnsServiceName()
 	assert.Equal(s.T(), alternate, id)
 
-	voltage := config.Voltage()
-	assert.Equal(s.T(), volt, voltage)
-
 	portValue := config.Port()
 	assert.Equal(s.T(), port, portValue)
 

cmd/controlbox/main.go

@@ -78,7 +78,7 @@ func (h *controlbox) run() {
 		"Demo", "Demo", "ControlBox", "123456789",
 		model.DeviceTypeTypeElectricitySupplySystem,
 		[]model.EntityTypeType{model.EntityTypeTypeGridGuard},
-		port, certificate, 230, time.Second*60)
+		port, certificate, time.Second*60)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/evse/main.go

@@ -74,7 +74,7 @@ func (h *evse) run() {
 		"Demo", "Demo", "EVSE", "234567890",
 		model.DeviceTypeTypeChargingStation,
 		[]model.EntityTypeType{model.EntityTypeTypeEVSE},
-		port, certificate, 230, time.Second*4)
+		port, certificate, time.Second*4)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/hems/main.go

@@ -80,7 +80,7 @@ func (h *hems) run() {
 		"Demo", "Demo", "HEMS", "123456789",
 		model.DeviceTypeTypeEnergyManagementSystem,
 		[]model.EntityTypeType{model.EntityTypeTypeCEM},
-		port, certificate, 230, time.Second*4)
+		port, certificate, time.Second*4)
 	if err != nil {
 		log.Fatal(err)
 	}

features/client/feature.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/enbility/eebus-go/api"
 	spineapi "github.com/enbility/spine-go/api"
@@ -135,7 +136,8 @@ func (f *Feature) requestData(function model.FunctionType, selectors any, elemen
 	fTypes := f.featureRemote.Operations()
 	op, exists := fTypes[function]
 	if !exists || !op.Read() {
-		return nil, api.ErrOperationOnFunctionNotSupported
+		errWithFunction := fmt.Sprintf("%s %s", api.ErrOperationOnFunctionNotSupported.Error(), function)
+		return nil, errors.New(errWithFunction)
 	}
 
 	// remove the selectors if the remote does not allow partial reads

features/client/feature_test.go

@@ -155,6 +155,14 @@ func (s *FeatureSuite) Test_requestData() {
 	assert.Nil(s.T(), err)
 	assert.NotNil(s.T(), counter)
 
+	counter, err = s.testFeature2.requestData(model.FunctionTypeMeasurementDescriptionListData, nil, nil)
+	assert.NotNil(s.T(), err)
+	assert.Nil(s.T(), counter)
+
+	counter, err = s.testFeature2.requestData(model.FunctionTypeLoadControlLimitListData, nil, nil)
+	assert.Nil(s.T(), err)
+	assert.NotNil(s.T(), counter)
+
 	selectors2 := &model.LoadControlLimitListDataSelectorsType{
 		LimitId: util.Ptr(model.LoadControlLimitIdType(0)),
 	}

features/server/deviceconfiguration_test.go

@@ -42,7 +42,7 @@ func (s *DeviceConfigurationSuite) BeforeTest(suiteName, testName string) {
 		"test", "test", "test", "test",
 		model.DeviceTypeTypeEnergyManagementSystem,
 		[]model.EntityTypeType{model.EntityTypeTypeCEM},
-		9999, cert, 230.0, time.Second*4)
+		9999, cert, time.Second*4)
 
 	serviceHandler := mocks.NewServiceReaderInterface(s.T())
 	serviceHandler.EXPECT().ServicePairingDetailUpdate(mock.Anything, mock.Anything).Return().Maybe()

features/server/devicediagnosis_test.go

@@ -42,7 +42,7 @@ func (s *DeviceDiagnosisSuite) BeforeTest(suiteName, testName string) {
 		"test", "test", "test", "test",
 		model.DeviceTypeTypeEnergyManagementSystem,
 		[]model.EntityTypeType{model.EntityTypeTypeCEM},
-		9999, cert, 230.0, time.Second*4)
+		9999, cert, time.Second*4)
 
 	serviceHandler := mocks.NewServiceReaderInterface(s.T())
 	serviceHandler.EXPECT().ServicePairingDetailUpdate(mock.Anything, mock.Anything).Return().Maybe()

features/server/electricalconnection_test.go

@@ -42,7 +42,7 @@ func (s *ElectricalConnectionSuite) BeforeTest(suiteName, testName string) {
 		"test", "test", "test", "test",
 		model.DeviceTypeTypeEnergyManagementSystem,
 		[]model.EntityTypeType{model.EntityTypeTypeCEM},
-		9999, cert, 230.0, time.Second*4)
+		9999, cert, time.Second*4)
 
 	serviceHandler := mocks.NewServiceReaderInterface(s.T())
 	serviceHandler.EXPECT().ServicePairingDetailUpdate(mock.Anything, mock.Anything).Return().Maybe()