From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Fri, 3 Apr 2026 21:08:11 +0000 (+0200)
Subject: refactor(ocpp-server): inline _parse_set/get_variable_specs thin wrappers
X-Git-Tag: ocpp-server@v4.3.0~6
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ce3ff21f22960d6d47cf4cfbdfffa190c5657ff3;p=e-mobility-charging-stations-simulator.git

refactor(ocpp-server): inline _parse_set/get_variable_specs thin wrappers

Remove redundant _parse_set_variable_specs and _parse_get_variable_specs
one-liner wrappers — call _parse_variable_specs(specs, require_value=...)
directly at all call sites
---

diff --git a/tests/ocpp-server/server.py b/tests/ocpp-server/server.py
index e8f88bc9..225526e1 100644
--- a/tests/ocpp-server/server.py
+++ b/tests/ocpp-server/server.py
@@ -837,14 +837,6 @@ def _parse_variable_specs(specs_str: str, require_value: bool = False) -> list[d
     return result
 
 
-def _parse_set_variable_specs(specs_str: str) -> list[dict]:
-    return _parse_variable_specs(specs_str, require_value=True)
-
-
-def _parse_get_variable_specs(specs_str: str) -> list[dict]:
-    return _parse_variable_specs(specs_str, require_value=False)
-
-
 async def main():
     parser = argparse.ArgumentParser(description="OCPP2 Server")
     command_group = parser.add_mutually_exclusive_group()
@@ -1002,12 +994,12 @@ async def main():
         if parsed_commands is not None and not parsed_commands:
             parser.error("--commands must contain at least one CMD:DELAY entry")
         parsed_set_variables = (
-            _parse_set_variable_specs(args.set_variables)
+            _parse_variable_specs(args.set_variables, require_value=True)
             if args.set_variables
             else None
         )
         parsed_get_variables = (
-            _parse_get_variable_specs(args.get_variables)
+            _parse_variable_specs(args.get_variables, require_value=False)
             if args.get_variables
             else None
         )
diff --git a/tests/ocpp-server/test_server.py b/tests/ocpp-server/test_server.py
index 2a55cc2b..42f75448 100644
--- a/tests/ocpp-server/test_server.py
+++ b/tests/ocpp-server/test_server.py
@@ -52,8 +52,7 @@ from server import (
     ChargePoint,
     ServerConfig,
     _parse_commands,
-    _parse_get_variable_specs,
-    _parse_set_variable_specs,
+    _parse_variable_specs,
     _random_request_id,
     check_positive_number,
     main,
@@ -1639,8 +1638,9 @@ class TestMultiVariableCommands:
     """Tests for multi-variable SetVariables/GetVariables CLI support."""
 
     def test_parse_set_variable_specs_valid(self):
-        result = _parse_set_variable_specs(
-            "OCPPCommCtrlr.HeartbeatInterval=30,TxCtrlr.EVConnectionTimeOut=60"
+        result = _parse_variable_specs(
+            "OCPPCommCtrlr.HeartbeatInterval=30,TxCtrlr.EVConnectionTimeOut=60",
+            require_value=True,
         )
         assert len(result) == 2
         assert result[0]["component"]["name"] == "OCPPCommCtrlr"
@@ -1651,8 +1651,9 @@ class TestMultiVariableCommands:
         assert result[1]["attribute_value"] == "60"
 
     def test_parse_get_variable_specs_valid(self):
-        result = _parse_get_variable_specs(
-            "ChargingStation.AvailabilityState,OCPPCommCtrlr.HeartbeatInterval"
+        result = _parse_variable_specs(
+            "ChargingStation.AvailabilityState,OCPPCommCtrlr.HeartbeatInterval",
+            require_value=False,
         )
         assert len(result) == 2
         assert result[0]["component"]["name"] == "ChargingStation"
@@ -1665,7 +1666,7 @@ class TestMultiVariableCommands:
             argparse.ArgumentTypeError,
             match=r"expected 'Component\.Variable=Value'",
         ):
-            _parse_set_variable_specs("NoComponentVariable=30")
+            _parse_variable_specs("NoComponentVariable=30", require_value=True)
 
     async def test_send_set_variables_uses_custom_data(self, command_charge_point):
         custom_data = [