Feature/656 device model initialization in cpp

config/v201/CMakeLists.txt

@@ -1,5 +1,6 @@
 # find all migration files, store only the filenames by showing relative to the folder
 set(MIGRATION_FILES_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/core_migrations")
+set(MIGRATION_FILES_DEVICE_MODEL_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/device_model_migrations")
 
 include(../CollectMigrationFiles.cmake)
 
@@ -9,7 +10,15 @@ collect_migration_files(
      )
 
 set(MIGRATION_FILE_VERSION_V201 ${TARGET_MIGRATION_FILE_VERSION} PARENT_SCOPE)
+
+collect_migration_files(
+     LOCATION ${MIGRATION_FILES_DEVICE_MODEL_LOCATION}
+     INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/everest/modules/OCPP201/device_model_migrations
+     )
+
+set(MIGRATION_DEVICE_MODEL_FILE_VERSION_V201 ${TARGET_MIGRATION_FILE_VERSION} PARENT_SCOPE)
 set(MIGRATION_FILES_SOURCE_DIR_V201 ${MIGRATION_FILES_LOCATION} PARENT_SCOPE)
+set(MIGRATION_FILES_DEVICE_MODEL_SOURCE_DIR_V201 ${MIGRATION_FILES_DEVICE_MODEL_LOCATION} PARENT_SCOPE)
 
 option(LIBOCPP_INSTALL_DEVICE_MODEL_DATABASE "Install device model database for OCPP201" ON)
 
@@ -26,15 +35,6 @@ install(
 if (LIBOCPP_INSTALL_DEVICE_MODEL_DATABASE)
      set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/config.json)
 
-     find_program(
-          PYTHON_EXECUTABLE
-          python3
-          REQUIRED
-     )
-
-     set(INIT_DEVICE_MODULE_DB_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/init_device_model_db.py")
-     set(DEVICE_MODEL_DATABASE_FILE "device_model_storage.db")
-
      if(NOT LIBOCPP_V201_CONFIG_FILE)
           set(LIBOCPP_V201_CONFIG_FILE "${CMAKE_CURRENT_SOURCE_DIR}/config.json")
      endif()
@@ -46,19 +46,6 @@ if (LIBOCPP_INSTALL_DEVICE_MODEL_DATABASE)
 
      message(STATUS "Using ocpp v201 config file path: ${LIBOCPP_V201_CONFIG_FILE}")
 
-     execute_process(
-             COMMAND
-             ${PYTHON_EXECUTABLE} ${INIT_DEVICE_MODULE_DB_SCRIPT} init --db ${CMAKE_CURRENT_BINARY_DIR}/${DEVICE_MODEL_DATABASE_FILE} --schemas ${LIBOCPP_COMPONENT_SCHEMAS_PATH}
-          WORKING_DIRECTORY 
-               ${CMAKE_CURRENT_SOURCE_DIR}
-     )
-
-     execute_process(
-             COMMAND
-             ${PYTHON_EXECUTABLE} ${INIT_DEVICE_MODULE_DB_SCRIPT} insert --db ${CMAKE_CURRENT_BINARY_DIR}/${DEVICE_MODEL_DATABASE_FILE} --schemas ${LIBOCPP_COMPONENT_SCHEMAS_PATH} --config ${LIBOCPP_V201_CONFIG_FILE}
-          WORKING_DIRECTORY 
-               ${CMAKE_CURRENT_SOURCE_DIR}
-     )
-
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DEVICE_MODEL_DATABASE_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/everest/modules/OCPP201)
+     install(FILES ${LIBOCPP_V201_CONFIG_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/everest/modules/OCPP201)
+     install(DIRECTORY ${LIBOCPP_COMPONENT_SCHEMAS_PATH} DESTINATION ${CMAKE_INSTALL_DATADIR}/everest/modules/OCPP201)
 endif()

config/v201/init_device_model.sql → config/v201/device_model_migrations/1_up-initial.sql

@@ -17,50 +17,50 @@ CREATE TABLE IF NOT EXISTS COMPONENT (
 );
 CREATE TABLE IF NOT EXISTS VARIABLE_ATTRIBUTE (
   ID INTEGER PRIMARY KEY AUTOINCREMENT,
-  VARIABLE_ID INTEGER,
+  VARIABLE_ID INTEGER NOT NULL,
   MUTABILITY_ID INTEGER,
   PERSISTENT INTEGER,
   CONSTANT INTEGER,
   TYPE_ID INTEGER,
+  VALUE_SOURCE TEXT DEFAULT "default",
   "VALUE" TEXT,
-  FOREIGN KEY (VARIABLE_ID) REFERENCES VARIABLE (ID),
-  FOREIGN KEY (TYPE_ID) REFERENCES VARIABLE_ATTRIBUTE_TYPE (ID),
-  FOREIGN KEY (MUTABILITY_ID) REFERENCES MUTABILITY (ID)
+  FOREIGN KEY (VARIABLE_ID) REFERENCES VARIABLE (ID) ON DELETE CASCADE,
+  FOREIGN KEY (TYPE_ID) REFERENCES VARIABLE_ATTRIBUTE_TYPE (ID) ON DELETE RESTRICT,
+  FOREIGN KEY (MUTABILITY_ID) REFERENCES MUTABILITY (ID) ON DELETE RESTRICT
 );
 CREATE TABLE IF NOT EXISTS VARIABLE_CHARACTERISTICS (
   ID INTEGER PRIMARY KEY AUTOINCREMENT,
-  DATATYPE_ID INTEGER,
+  DATATYPE_ID INTEGER NOT NULL,
+  VARIABLE_ID INTEGER NOT NULL,
   MAX_LIMIT REAL,
   MIN_LIMIT REAL,
   SUPPORTS_MONITORING INTEGER,
   UNIT TEXT,
   VALUES_LIST TEXT,
-  FOREIGN KEY (DATATYPE_ID) REFERENCES DATATYPE (ID)
+  FOREIGN KEY (DATATYPE_ID) REFERENCES DATATYPE (ID) ON DELETE RESTRICT
+  FOREIGN KEY (VARIABLE_ID) REFERENCES VARIABLE (ID) ON DELETE CASCADE
 );
 CREATE TABLE IF NOT EXISTS VARIABLE_MONITORING (
   ID INTEGER PRIMARY KEY AUTOINCREMENT,
-  VARIABLE_ID INTEGER,
+  VARIABLE_ID INTEGER NOT NULL,
   SEVERITY INTEGER,
   "TRANSACTION" INTEGER,
-  TYPE_ID INTEGER,
+  TYPE_ID INTEGER NOT NULL,
   CONFIG_TYPE_ID INTEGER,
   "VALUE" DECIMAL,
   REFERENCE_VALUE TEXT,
-  FOREIGN KEY (VARIABLE_ID) REFERENCES VARIABLE (ID),
-  FOREIGN KEY (TYPE_ID) REFERENCES MONITOR (ID),
-  FOREIGN KEY (CONFIG_TYPE_ID) REFERENCES MONITOR_CONFIG_TYPE(ID)
+  FOREIGN KEY (VARIABLE_ID) REFERENCES VARIABLE (ID) ON DELETE CASCADE,
+  FOREIGN KEY (TYPE_ID) REFERENCES MONITOR (ID) ON DELETE RESTRICT,
+  FOREIGN KEY (CONFIG_TYPE_ID) REFERENCES MONITOR_CONFIG_TYPE(ID) ON DELETE RESTRICT
 );
 CREATE TABLE IF NOT EXISTS VARIABLE (
   ID INTEGER PRIMARY KEY AUTOINCREMENT,
   NAME TEXT,
   INSTANCE TEXT,
-  COMPONENT_ID INTEGER,
-  VARIABLE_CHARACTERISTICS_ID INTEGER,
+  COMPONENT_ID INTEGER NOT NULL,
   REQUIRED INTEGER DEFAULT FALSE,
-  FOREIGN KEY (COMPONENT_ID) REFERENCES COMPONENT (ID),
-  FOREIGN KEY (VARIABLE_CHARACTERISTICS_ID) REFERENCES VARIABLE_CHARACTERISTICS (ID)
+  FOREIGN KEY (COMPONENT_ID) REFERENCES COMPONENT (ID) ON DELETE CASCADE
 );
-BEGIN TRANSACTION;
 INSERT
   OR REPLACE INTO MUTABILITY
 VALUES (0, "ReadOnly");
@@ -160,4 +160,3 @@ VALUES (2, "MinSet");
 INSERT
   OR REPLACE INTO VARIABLE_ATTRIBUTE_TYPE
 VALUES (3, "MaxSet");
-COMMIT;