Add test for feat_req__persistency__multiple_kvs (#73)

Author: igorostrowskiq

feature_integration_tests/python_test_cases/BUILD

@@ -28,7 +28,7 @@ score_virtualenv(
 # Tests targets
 score_py_pytest(
     name = "fit",
-    srcs = glob(["tests/**/*.py"]) + ["conftest.py", "fit_scenario.py"],
+    srcs = glob(["tests/**/*.py"]) + ["conftest.py", "fit_scenario.py", "test_properties.py"],
     args = [
         "--traces=all",
         "--rust-target-path=$(rootpath //feature_integration_tests/rust_test_scenarios)",

feature_integration_tests/python_test_cases/fit_scenario.py

@@ -12,6 +12,17 @@
 )
 
 
+class ResultCode:
+    """
+    Test scenario exit codes.
+    """
+
+    SUCCESS = 0
+    PANIC = 101
+    SIGKILL = -9
+    SIGABRT = -6
+
+
 def temp_dir_common(
     tmp_path_factory: pytest.TempPathFactory, base_name: str, *args: str
 ) -> Generator[Path, None, None]:
@@ -63,7 +74,7 @@ def results(
         **kwargs,
     ) -> ScenarioResult:
         result = self._run_command(command, execution_timeout, args, kwargs)
-        success = result.return_code == 0 and not result.hang
+        success = result.return_code == ResultCode.SUCCESS and not result.hang
         if self.expect_command_failure() and success:
             raise RuntimeError(f"Command execution succeeded unexpectedly: {result=}")
         if not self.expect_command_failure() and not success:

feature_integration_tests/python_test_cases/test_properties.py

@@ -0,0 +1,10 @@
+try:
+    from attribute_plugin import add_test_properties  # type: ignore[import-untyped]
+except ImportError:
+    # Define no-op decorator if attribute_plugin is not available (outside bazel)
+    # Keeps IDE debugging functionality
+    def add_test_properties(*args, **kwargs):
+        def decorator(func):
+            return func  # No-op decorator
+
+        return decorator

feature_integration_tests/python_test_cases/tests/basic/test_orchestartion_with_persistency.py

@@ -1,22 +1,11 @@
 import json
+from collections.abc import Generator
 from pathlib import Path
-from typing import Any, Generator
+from typing import Any
 
 import pytest
-
-try:
-    from attribute_plugin import add_test_properties  # type: ignore[import-untyped]
-except ImportError:
-    # Define no-op decorator if attribute_plugin is not available (outside bazel)
-    # Keeps IDE debugging functionality
-    def add_test_properties(*args, **kwargs):
-        def decorator(func):
-            return func  # No-op decorator
-
-        return decorator
-
-
 from fit_scenario import FitScenario, temp_dir_common
+from test_properties import add_test_properties
 from testing_utils import LogContainer
 
 

feature_integration_tests/python_test_cases/tests/persistency/test_multiple_kvs_per_app.py

@@ -0,0 +1,107 @@
+# *******************************************************************************
+# Copyright (c) 2025 Contributors to the Eclipse Foundation
+#
+# See the NOTICE file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Apache License Version 2.0 which is available at
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# SPDX-License-Identifier: Apache-2.0
+# *******************************************************************************
+
+import json
+from pathlib import Path
+from typing import Any, Generator
+
+import pytest
+from fit_scenario import FitScenario, temp_dir_common
+from test_properties import add_test_properties
+from testing_utils import LogContainer
+
+
+@add_test_properties(
+    partially_verifies=["feat_req__persistency__multiple_kvs"],
+    test_type="requirements-based",
+    derivation_technique="requirements-analysis",
+)
+class TestMultipleInstanceIds(FitScenario):
+    """
+    Verifies that multiple KVS instances with different IDs store and retrieve independent values without interference.
+    """
+
+    @pytest.fixture(scope="class")
+    def scenario_name(self) -> str:
+        return "persistency.multiple_kvs_per_app"
+
+    @pytest.fixture(scope="class")
+    def kvs_key(self) -> str:
+        return "number"
+
+    @pytest.fixture(scope="class")
+    def kvs_value_1(self) -> float:
+        return 111.1
+
+    @pytest.fixture(scope="class")
+    def kvs_value_2(self) -> float:
+        return 222.2
+
+    @pytest.fixture(scope="class")
+    def temp_dir(
+        self,
+        tmp_path_factory: pytest.TempPathFactory,
+    ) -> Generator[Path, None, None]:
+        yield from temp_dir_common(tmp_path_factory, self.__class__.__name__)
+
+    @pytest.fixture(scope="class")
+    def test_config(
+        self,
+        temp_dir: Path,
+        kvs_key: str,
+        kvs_value_1: float,
+        kvs_value_2: float,
+    ) -> dict[str, Any]:
+        return {
+            "kvs_parameters_1": {
+                "kvs_parameters": {"instance_id": 1, "dir": str(temp_dir)},
+            },
+            "kvs_parameters_2": {
+                "kvs_parameters": {"instance_id": 2, "dir": str(temp_dir)},
+            },
+            "test": {"key": kvs_key, "value_1": kvs_value_1, "value_2": kvs_value_2},
+        }
+
+    def test_logged_execution(
+        self,
+        kvs_key: str,
+        kvs_value_1: float,
+        kvs_value_2: float,
+        logs_info_level: LogContainer,
+    ):
+        log1 = logs_info_level.find_log("instance", value="InstanceId(1)")
+        assert log1 is not None
+        assert log1.key == kvs_key
+        assert log1.value == kvs_value_1
+
+        log2 = logs_info_level.find_log("instance", value="InstanceId(2)")
+        assert log2 is not None
+        assert log2.key == kvs_key
+        assert log2.value == kvs_value_2
+
+    def test_kvs_write_results(
+        self,
+        temp_dir: Path,
+        kvs_key: str,
+        kvs_value_1: float,
+        kvs_value_2: float,
+    ):
+        # Verify KVS Instance(1)
+        kvs1_file = temp_dir / "kvs_1_0.json"
+        data1 = json.loads(kvs1_file.read_text())
+        assert data1["v"][kvs_key]["v"] == kvs_value_1
+
+        # Verify KVS Instance(2)
+        kvs2_file = temp_dir / "kvs_2_0.json"
+        data2 = json.loads(kvs2_file.read_text())
+        assert data2["v"][kvs_key]["v"] == kvs_value_2

feature_integration_tests/rust_test_scenarios/src/internals/kyron/mod.rs

@@ -0,0 +1,13 @@
+//
+// Copyright (c) 2025 Contributors to the Eclipse Foundation
+//
+// See the NOTICE file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Apache License Version 2.0 which is available at
+// <https://www.apache.org/licenses/LICENSE-2.0>
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+pub mod runtime_helper;

…cenarios/src/internals/runtime_helper.rs …os/src/internals/kyron/runtime_helper.rsfeature_integration_tests/rust_test_scenarios/src/internals/runtime_helper.rs renamed to feature_integration_tests/rust_test_scenarios/src/internals/kyron/runtime_helper.rs feature_integration_tests/rust_test_scenarios/src/internals/runtime_helper.rs renamed to feature_integration_tests/rust_test_scenarios/src/internals/kyron/runtime_helper.rs

@@ -10,4 +10,5 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 //
-pub mod runtime_helper;
+pub mod kyron;
+pub mod persistency;

feature_integration_tests/rust_test_scenarios/src/internals/mod.rs

@@ -0,0 +1,29 @@
+//! KVS instance test helpers.
+
+use crate::internals::persistency::kvs_parameters::KvsParameters;
+use rust_kvs::prelude::{ErrorCode, Kvs, KvsBuilder};
+
+/// Create KVS instance based on provided parameters.
+pub fn kvs_instance(kvs_parameters: KvsParameters) -> Result<Kvs, ErrorCode> {
+    let mut builder = KvsBuilder::new(kvs_parameters.instance_id);
+
+    if let Some(flag) = kvs_parameters.defaults {
+        builder = builder.defaults(flag);
+    }
+
+    if let Some(flag) = kvs_parameters.kvs_load {
+        builder = builder.kvs_load(flag);
+    }
+
+    if let Some(dir) = kvs_parameters.dir {
+        builder = builder.dir(dir.to_string_lossy().to_string());
+    }
+
+    if let Some(snapshot_max_count) = kvs_parameters.snapshot_max_count {
+        builder = builder.snapshot_max_count(snapshot_max_count);
+    }
+
+    let kvs: Kvs = builder.build()?;
+
+    Ok(kvs)
+}

feature_integration_tests/rust_test_scenarios/src/internals/persistency/kvs_instance.rs

@@ -0,0 +1,71 @@
+//! KVS parameters test helpers.
+
+use rust_kvs::prelude::{InstanceId, KvsDefaults, KvsLoad};
+use serde::{de, Deserialize, Deserializer};
+use std::path::PathBuf;
+
+/// KVS parameters in serde-compatible format.
+#[derive(Deserialize, Debug, Clone)]
+#[serde(deny_unknown_fields)]
+pub struct KvsParameters {
+    #[serde(deserialize_with = "deserialize_instance_id")]
+    pub instance_id: InstanceId,
+    #[serde(default, deserialize_with = "deserialize_defaults")]
+    pub defaults: Option<KvsDefaults>,
+    #[serde(default, deserialize_with = "deserialize_kvs_load")]
+    pub kvs_load: Option<KvsLoad>,
+    pub dir: Option<PathBuf>,
+    pub snapshot_max_count: Option<usize>,
+}
+
+impl KvsParameters {
+    /// Parse `KvsParameters` from `Value`.
+    /// `Value` is expected to contain `kvs_parameters` field.
+    pub fn from_value(value: &serde_json::Value) -> Result<Self, serde_json::Error> {
+        serde_json::from_value(value["kvs_parameters"].clone())
+    }
+}
+
+fn deserialize_instance_id<'de, D>(deserializer: D) -> Result<InstanceId, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let value = usize::deserialize(deserializer)?;
+    Ok(InstanceId(value))
+}
+
+fn deserialize_defaults<'de, D>(deserializer: D) -> Result<Option<KvsDefaults>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let value_opt: Option<String> = Option::deserialize(deserializer)?;
+    if let Some(value_str) = value_opt {
+        let value = match value_str.as_str() {
+            "ignored" => KvsDefaults::Ignored,
+            "optional" => KvsDefaults::Optional,
+            "required" => KvsDefaults::Required,
+            _ => return Err(de::Error::custom("Invalid \"defaults\" mode")),
+        };
+        return Ok(Some(value));
+    }
+
+    Ok(None)
+}
+
+fn deserialize_kvs_load<'de, D>(deserializer: D) -> Result<Option<KvsLoad>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let value_opt: Option<String> = Option::deserialize(deserializer)?;
+    if let Some(value_str) = value_opt {
+        let value = match value_str.as_str() {
+            "ignored" => KvsLoad::Ignored,
+            "optional" => KvsLoad::Optional,
+            "required" => KvsLoad::Required,
+            _ => return Err(de::Error::custom("Invalid \"kvs_load\" mode")),
+        };
+        return Ok(Some(value));
+    }
+
+    Ok(None)
+}