usov_i-org/bec
1
0
Fork 0
mirror of https://github.com/ivan-usov-org/bec.git synced 2025-04-21 10:10:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: removed redundant name in config output

Browse Source
This commit is contained in:
wakonig_k 2023-11-17 10:08:22 +01:00
parent 087c5a3098
commit 5a81c21345
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bec_lib/bec_lib/config_helper.py
View File

@ -9,9 +9,9 @@ import msgpack
import yaml import yaml
from bec_lib.bec_errors import DeviceConfigError from bec_lib.bec_errors import DeviceConfigError
from bec_lib.messages import DeviceConfigMessage, RequestResponseMessage
from bec_lib.endpoints import MessageEndpoints from bec_lib.endpoints import MessageEndpoints
from bec_lib.logger import bec_logger from bec_lib.logger import bec_logger
from bec_lib.messages import DeviceConfigMessage, RequestResponseMessage
if TYPE_CHECKING: if TYPE_CHECKING:
from bec_lib.redis_connector import RedisConnector from bec_lib.redis_connector import RedisConnector
@ -64,6 +64,7 @@ class ConfigHelper:
dev.pop("createdAt", None) dev.pop("createdAt", None)
dev.pop("createdBy", None) dev.pop("createdBy", None)
dev.pop("sessionId", None) dev.pop("sessionId", None)
name = dev.pop("name")
enabled = dev.pop("enabled", None) enabled = dev.pop("enabled", None)
config = {"status": {"enabled": enabled}} config = {"status": {"enabled": enabled}}
@ -71,7 +72,7 @@ class ConfigHelper:
if enabled_set is not None: if enabled_set is not None:
config["status"]["enabled_set"] = enabled_set config["status"]["enabled_set"] = enabled_set
config.update(dev) config.update(dev)
out[dev["name"]] = config out[name] = config
with open(file_path, "w") as file: with open(file_path, "w") as file:
file.write(yaml.dump(out)) file.write(yaml.dump(out))

2
bec_lib/tests/test_config_helper.py
View File

@ -87,7 +87,6 @@ def test_config_helper_save_current_session():
config_helper.save_current_session("test.yaml") config_helper.save_current_session("test.yaml")
out_data = { out_data = {
"pinz": { "pinz": {
"name": "pinz",
"deviceClass": "SynAxisOPAAS", "deviceClass": "SynAxisOPAAS",
"deviceTags": ["user motors"], "deviceTags": ["user motors"],
"status": {"enabled": True, "enabled_set": True}, "status": {"enabled": True, "enabled_set": True},
@ -108,7 +107,6 @@ def test_config_helper_save_current_session():
"onFailure": "retry", "onFailure": "retry",
}, },
"transd": { "transd": {
"name": "transd",
"deviceClass": "SynAxisMonitor", "deviceClass": "SynAxisMonitor",
"deviceTags": ["beamline"], "deviceTags": ["beamline"],
"status": {"enabled": True, "enabled_set": True}, "status": {"enabled": True, "enabled_set": True},