From 4959720a650ba0f45b31f9f593c2bdf7980184f4 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 8 Oct 2024 18:00:08 +0000
Subject: [PATCH] Device component:
- Improved procedure to update operational status
---
src/device/service/DeviceServiceServicerImpl.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/device/service/DeviceServiceServicerImpl.py b/src/device/service/DeviceServiceServicerImpl.py
index ebbf19607..0596aa76b 100644
--- a/src/device/service/DeviceServiceServicerImpl.py
+++ b/src/device/service/DeviceServiceServicerImpl.py
@@ -251,8 +251,14 @@ class DeviceServiceServicerImpl(DeviceServiceServicer):
device_id = context_client.SetDevice(device)
device = context_client.GetDevice(device_id)
- if request.device_operational_status != DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_UNDEFINED:
- device.device_operational_status = request.device_operational_status
+ ztp_service_host = get_env_var_name(ServiceNameEnum.ZTP, ENVVAR_SUFIX_SERVICE_HOST)
+ environment_variables = set(os.environ.keys())
+ if ztp_service_host in environment_variables:
+ # ZTP component is deployed; accept status updates
+ if request.device_operational_status != DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_UNDEFINED:
+ device.device_operational_status = request.device_operational_status
+ else:
+ # ZTP is not deployed; activated during AddDevice and not modified
t4 = time.time()
# TODO: use of datastores (might be virtual ones) to enable rollbacks
--
GitLab