CEM shall not support this in UCLPC

A consumable device not being a CEM may not support `ContractualConsumptionNominalMax `, this is restricted to consumable devices being a CEM. This is defined in UC LPC 1.0 Spec, chapter 2.6.4.1

Author: DerAndereAndi

uclpc/api.go

@@ -84,11 +84,4 @@ type UCLCPInterface interface {
 	// parameters:
 	//   - entity: the entity of the e.g. EVSE
 	PowerConsumptionNominalMax(entity spineapi.EntityRemoteInterface) (float64, error)
-
-	// return nominal maximum active (real) power the Controllable System is
-	// allowed to consume due to the customer's contract.
-	//
-	// parameters:
-	//   - entity: the entity of the e.g. EVSE
-	ContractualConsumptionNominalMax(entity spineapi.EntityRemoteInterface) (float64, error)
 }

uclpc/public.go

@@ -302,26 +302,3 @@ func (e *UCLPC) PowerConsumptionNominalMax(entity spineapi.EntityRemoteInterface
 
 	return data.Value.GetValue(), nil
 }
-
-// return nominal maximum active (real) power the Controllable System is
-// allowed to consume due to the customer's contract.
-func (e *UCLPC) ContractualConsumptionNominalMax(entity spineapi.EntityRemoteInterface) (float64, error) {
-	if entity == nil || !util.IsCompatibleEntity(entity, e.validEntityTypes) {
-		return 0, api.ErrNoCompatibleEntity
-	}
-
-	electricalConnection, err := util.ElectricalConnection(e.service, entity)
-	if err != nil || electricalConnection == nil {
-		return 0, err
-	}
-
-	data, err := electricalConnection.GetCharacteristicForContextType(
-		model.ElectricalConnectionCharacteristicContextTypeEntity,
-		model.ElectricalConnectionCharacteristicTypeTypeContractualConsumptionNominalMax,
-	)
-	if err != nil || data.Value == nil {
-		return 0, err
-	}
-
-	return data.Value.GetValue(), nil
-}

uclpc/public_test.go

@@ -353,33 +353,3 @@ func (s *UCLPCSuite) Test_PowerConsumptionNominalMax() {
 	assert.Nil(s.T(), err)
 	assert.Equal(s.T(), 8000.0, data)
 }
-
-func (s *UCLPCSuite) Test_ContractualConsumptionNominalMax() {
-	data, err := s.sut.ContractualConsumptionNominalMax(s.mockRemoteEntity)
-	assert.NotNil(s.T(), err)
-	assert.Equal(s.T(), 0.0, data)
-
-	data, err = s.sut.ContractualConsumptionNominalMax(s.monitoredEntity)
-	assert.NotNil(s.T(), err)
-	assert.Equal(s.T(), 0.0, data)
-
-	charData := &model.ElectricalConnectionCharacteristicListDataType{
-		ElectricalConnectionCharacteristicListData: []model.ElectricalConnectionCharacteristicDataType{
-			{
-				ElectricalConnectionId: eebusutil.Ptr(model.ElectricalConnectionIdType(0)),
-				CharacteristicId:       eebusutil.Ptr(model.ElectricalConnectionCharacteristicIdType(0)),
-				CharacteristicContext:  eebusutil.Ptr(model.ElectricalConnectionCharacteristicContextTypeEntity),
-				CharacteristicType:     eebusutil.Ptr(model.ElectricalConnectionCharacteristicTypeTypeContractualConsumptionNominalMax),
-				Value:                  model.NewScaledNumberType(7000),
-			},
-		},
-	}
-
-	rFeature := s.remoteDevice.FeatureByEntityTypeAndRole(s.monitoredEntity, model.FeatureTypeTypeElectricalConnection, model.RoleTypeServer)
-	fErr := rFeature.UpdateData(model.FunctionTypeElectricalConnectionCharacteristicListData, charData, nil, nil)
-	assert.Nil(s.T(), fErr)
-
-	data, err = s.sut.ContractualConsumptionNominalMax(s.monitoredEntity)
-	assert.Nil(s.T(), err)
-	assert.Equal(s.T(), 7000.0, data)
-}