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

Merge branch 'config_updates' into 'master'

Browse Source 
bug fixes for config updates

See merge request bec/bec!3
This commit is contained in:
wakonig_k 2022-07-01 10:48:43 +00:00
commit c0986dc221
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
opaas/opaas/devices/devicemanageropaas.py
View File

@ -199,7 +199,7 @@ class DeviceManagerOPAAS(DeviceManagerBase):
# self._device_instructions_connector.signal_event.set() # self._device_instructions_connector.signal_event.set()
# self._device_instructions_connector.join() # self._device_instructions_connector.join()
def send_config_request_reply(self): def send_config_request_reply(self, error_msg):
pass pass
@staticmethod @staticmethod
@ -215,10 +215,10 @@ class DeviceManagerOPAAS(DeviceManagerBase):
try: try:
self._check_request_validity(msg) self._check_request_validity(msg)
if msg.content["action"] == "update": if msg.content["action"] == "update":
updated = False
for dev in msg.content["config"]: for dev in msg.content["config"]:
dev_config = msg.content["config"][dev] dev_config = msg.content["config"][dev]
if "deviceConfig" in dev: if "deviceConfig" in dev_config:
# store old config # store old config
old_config = self.devices[dev].config["deviceConfig"].copy() old_config = self.devices[dev].config["deviceConfig"].copy()
@ -229,22 +229,25 @@ class DeviceManagerOPAAS(DeviceManagerBase):
self.update_config(self.devices[dev].obj, old_config) self.update_config(self.devices[dev].obj, old_config)
raise DeviceConfigError(f"Error during object update. {e}") raise DeviceConfigError(f"Error during object update. {e}")
self.devices[dev].deviceConfig.update(dev_config["deviceConfig"]) self.devices[dev].config["deviceConfig"].update(dev_config["deviceConfig"])
# update config in DB # update config in DB
print("updating in DB") print("updating in DB")
success = self._scibec.patch_device_config( success = self._scibec.patch_device_config(
self.devices[dev].id, self.devices[dev].config["id"],
{"deviceConfig": self.devices[dev].config["deviceConfig"]}, {"deviceConfig": self.devices[dev].config["deviceConfig"]},
) )
if not success: if not success:
raise DeviceConfigError("Error during database update.") raise DeviceConfigError("Error during database update.")
updated = True
if "enabled" in dev_config: if "enabled" in dev_config:
self.devices[dev].config["enabled"] = dev_config["enabled"] self.devices[dev].config["enabled"] = dev_config["enabled"]
updated = True
# send updates to services # send updates to services
self.send_config(msg) if updated:
self.send_config(msg)
except DeviceConfigError as dev_conf_error: except DeviceConfigError as dev_conf_error:
self.send_config_request_reply(dev_conf_error) self.send_config_request_reply(dev_conf_error)