Add composed device model storage and everest device model storage. #846

maaikez · 2024-09-03T16:34:44Z

Describe your changes

Created composed device model storage and everest device model storage like stated in https://github.com/EVerest/everest-core/tree/doc/config-service/doc/config_service#next-steps-to-adjust-ocpp201-and-libocpp

Issue ticket number and link

#844

Checklist before requesting a review

I have performed a self-review of my code
I have made corresponding changes to the documentation
I read the contribution documentation and made sure that my changes meet its requirements

Pietfried

This looks good!

I would like to see at least some parts of this documented here as part of the OCPP201 module documentation:

Class diagram + explaination
Variable attributes and variable characteristics for externally managed variables
Sequence of variable access for internally and externally managed variables

maaikez · 2024-09-05T14:53:53Z

This looks good!

I would like to see at least some parts of this documented here as part of the OCPP201 module documentation:
* Class diagram + explaination

* Variable attributes and variable characteristics for externally managed variables

* Sequence of variable access for internally and externally managed variables

ok, in doc.rst? Or where else?

Pietfried · 2024-09-05T15:05:47Z

This looks good!
I would like to see at least some parts of this documented here as part of the OCPP201 module documentation:
* Class diagram + explaination

* Variable attributes and variable characteristics for externally managed variables

* Sequence of variable access for internally and externally managed variables
ok, in doc.rst? Or where else?

Yep 👍

maaikez · 2024-09-05T16:15:03Z

This looks good!
I would like to see at least some parts of this documented here as part of the OCPP201 module documentation:
* Class diagram + explaination

* Variable attributes and variable characteristics for externally managed variables

* Sequence of variable access for internally and externally managed variables
ok, in doc.rst? Or where else?
Yep 👍

Ok, added!

maaikez · 2024-09-12T15:48:11Z

Is there still a change requested?

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

…ariables will throw. Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

… some further explainations Signed-off-by: pietfried <[email protected]>

Signed-off-by: Piet Gömpel <[email protected]>

…leton-for-device-model-storage

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

…leton-for-device-model-storage

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Pietfried

lgtm! Requested some documentation changes partially caused by the renaming to DeviceModelStorageInterface

Pietfried · 2024-10-29T12:25:35Z

modules/OCPP201/device_model/composed_device_model_storage.cpp

+ComposedDeviceModelStorage::get_variable_attribute(const ocpp::v201::Component& component_id,
+                                                   const ocpp::v201::Variable& variable_id,
+                                                   const ocpp::v201::AttributeEnum& attribute_enum) {
+    if (get_variable_source(component_id, variable_id) == "OCPP") {


"OCPP" can be defined as a constant

Pietfried · 2024-11-11T15:30:26Z

modules/OCPP201/doc/device_model_class_diagram.puml

+}
+
+class DeviceModel {
+  - device_model: DeviceModelInterface


This now became DeviceModelStorageInterface right? Must therefore be changed at these places.

Pietfried · 2024-11-11T16:03:52Z

modules/OCPP201/doc.rst

+Note that the EVerest config service is not yet implemented. Currently all components and variables are controlled
+by the libocpp device model storage implementation.
+
+Device Model Implementation this module


Suggested change

Device Model Implementation this module

Device Model Implementation of this module

Pietfried · 2024-11-11T16:05:17Z

modules/OCPP201/doc.rst

+  * Contains device model representation and business logic to prevalidate requests to the device model variables
+  * Contains reference to device model interface implementation
+
+* DeviceModelInterface:


DeviceModelStorageInterface

Pietfried · 2024-11-11T16:08:02Z

modules/OCPP201/doc/sequence_config_service_and_ocpp.puml

+database InternalStorage order 40
+database ExternalStorage order 50


Looks like

Suggested change

database InternalStorage order 40

database ExternalStorage order 50

database DeviceModelStorageSqlite order 40

database EverestDeviceModelStorage order 50

would be more appropriate

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

…leton-for-device-model-storage

Pietfried · 2024-11-12T11:11:33Z

modules/OCPP201/device_model/composed_device_model_storage.cpp

@@ -3,6 +3,8 @@

 #include <device_model/composed_device_model_storage.hpp>

+#define VARIABLE_SOURCE_OCPP "OCPP"


Suggested change

#define VARIABLE_SOURCE_OCPP "OCPP"

static constexpr auto VARIABLE_SOURCE_OCPP = "OCPP";

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

…leton-for-device-model-storage

Pietfried · 2024-11-13T19:01:34Z

👍

please merge EVerest/libocpp#768 and update the dependencies.yaml in this PR afterwards

…leton-for-device-model-storage

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

maaikez linked an issue Sep 3, 2024 that may be closed by this pull request

Configuration Service: create skeleton for device model storage #844

Closed

Pietfried requested changes Sep 5, 2024

View reviewed changes

Pietfried self-assigned this Sep 8, 2024

Pietfried force-pushed the feature/844-configuration-service-create-skeleton-for-device-model-storage branch from fa45d41 to 15e70bf Compare September 8, 2024 12:43

maaikez marked this pull request as ready for review September 23, 2024 12:57

maaikez requested a review from hikinggrass as a code owner September 23, 2024 12:57

maaikez and others added 8 commits October 29, 2024 12:17

Add composed device model storage and everest device model storage.

36ded3b

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Distinguish between ocpp and external variables. Currently external v…

2a29cb6

…ariables will throw. Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Change variable source to use a string instead of enum.

62bf085

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Add documentation

7d308a1

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Fix documentation.

7c2474c

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Formatting...

b11871f

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Harmonized naming within written documentation and diagrams and added…

4f8a49a

… some further explainations Signed-off-by: pietfried <[email protected]>

Restructured device model content of doc.rst of OCPP201 module

473c2b8

Signed-off-by: Piet Gömpel <[email protected]>

Pietfried force-pushed the feature/844-configuration-service-create-skeleton-for-device-model-storage branch from 9eff3af to 473c2b8 Compare October 29, 2024 13:12

maaikez added 2 commits November 1, 2024 11:43

Merge branch 'main' into feature/844-configuration-service-create-ske…

5e73a4b

…leton-for-device-model-storage

Add correct libocpp dependency

df45027

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

maaikez requested a review from corneliusclaussen as a code owner November 1, 2024 10:50

maaikez added 3 commits November 1, 2024 11:54

formatting...

f932eee

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Merge branch 'main' into feature/844-configuration-service-create-ske…

41103e0

…leton-for-device-model-storage

Rename device model interface to device model storage interface.

d8ee1bc

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Pietfried requested changes Nov 11, 2024

View reviewed changes

maaikez added 2 commits November 12, 2024 11:55

Review comments (some changes after renaming)

f2278ef

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Merge branch 'main' into feature/844-configuration-service-create-ske…

b4688e9

…leton-for-device-model-storage

Pietfried reviewed Nov 12, 2024

View reviewed changes

Pietfried self-requested a review November 12, 2024 12:32

maaikez and others added 3 commits November 12, 2024 15:44

Change define to static constexpr

f541bf7

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

Merge branch 'main' into feature/844-configuration-service-create-ske…

8dd2017

…leton-for-device-model-storage

Merge branch 'main' into feature/844-configuration-service-create-ske…

d0a91f5

…leton-for-device-model-storage

Pietfried approved these changes Nov 13, 2024

View reviewed changes

maaikez added 2 commits November 14, 2024 09:54

Merge branch 'main' into feature/844-configuration-service-create-ske…

79844b4

…leton-for-device-model-storage

Change libocpp version.

c837010

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>

maaikez merged commit e786c57 into main Nov 14, 2024
11 checks passed

maaikez deleted the feature/844-configuration-service-create-skeleton-for-device-model-storage branch November 14, 2024 14:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add composed device model storage and everest device model storage. #846

Add composed device model storage and everest device model storage. #846

maaikez commented Sep 3, 2024 •

edited

Loading

Pietfried left a comment

maaikez commented Sep 5, 2024

Pietfried commented Sep 5, 2024

maaikez commented Sep 5, 2024

maaikez commented Sep 12, 2024

Pietfried left a comment

Pietfried Oct 29, 2024

Pietfried Nov 11, 2024

Pietfried Nov 11, 2024

Pietfried Nov 11, 2024

Pietfried Nov 11, 2024

Pietfried Nov 12, 2024

Pietfried commented Nov 13, 2024

	Device Model Implementation this module
	Device Model Implementation of this module

		database InternalStorage order 40
		database ExternalStorage order 50

		@@ -3,6 +3,8 @@

		#include <device_model/composed_device_model_storage.hpp>

		#define VARIABLE_SOURCE_OCPP "OCPP"

	#define VARIABLE_SOURCE_OCPP "OCPP"
	static constexpr auto VARIABLE_SOURCE_OCPP = "OCPP";

Add composed device model storage and everest device model storage. #846

Add composed device model storage and everest device model storage. #846

Conversation

maaikez commented Sep 3, 2024 • edited Loading

Describe your changes

Issue ticket number and link

Checklist before requesting a review

Pietfried left a comment

Choose a reason for hiding this comment

maaikez commented Sep 5, 2024

Pietfried commented Sep 5, 2024

maaikez commented Sep 5, 2024

maaikez commented Sep 12, 2024

Pietfried left a comment

Choose a reason for hiding this comment

Pietfried Oct 29, 2024

Choose a reason for hiding this comment

Pietfried Nov 11, 2024

Choose a reason for hiding this comment

Pietfried Nov 11, 2024

Choose a reason for hiding this comment

Pietfried Nov 11, 2024

Choose a reason for hiding this comment

Pietfried Nov 11, 2024

Choose a reason for hiding this comment

Pietfried Nov 12, 2024

Choose a reason for hiding this comment

Pietfried commented Nov 13, 2024

maaikez commented Sep 3, 2024 •

edited

Loading