From a67281a5e2d45a7798531cf130cee774f82c5842 Mon Sep 17 00:00:00 2001 From: "Georgios P. Katsikas" Date: Mon, 1 Dec 2025 16:39:42 +0000 Subject: [PATCH] fix: upload services and devices with config --- src/nbi/service/tfs_api/Resources.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/nbi/service/tfs_api/Resources.py b/src/nbi/service/tfs_api/Resources.py index 8e41c6009..c0ce6cb40 100644 --- a/src/nbi/service/tfs_api/Resources.py +++ b/src/nbi/service/tfs_api/Resources.py @@ -19,6 +19,7 @@ from flask.json import jsonify from flask_restful import Resource, request from werkzeug.exceptions import BadRequest from common.proto.context_pb2 import Empty, LinkTypeEnum +from common.tools.descriptor.Tools import format_device_custom_config_rules, format_service_custom_config_rules from common.tools.grpc.Tools import grpc_message_to_json from context.client.ContextClient import ContextClient from device.client.DeviceClient import DeviceClient @@ -215,7 +216,8 @@ class Service(_Resource): raise BadRequest('Mismatching context_uuid') if service_uuid != service['service_id']['service_uuid']['uuid']: raise BadRequest('Mismatching service_uuid') - return format_grpc_to_json(self.service_client.UpdateService(grpc_service(service))) + svc = format_service_custom_config_rules(service) + return format_grpc_to_json(self.service_client.UpdateService(grpc_service(svc))) def delete(self, context_uuid : str, service_uuid : str): return format_grpc_to_json(self.service_client.DeleteService(grpc_service_id(context_uuid, service_uuid))) @@ -267,9 +269,15 @@ class Devices(_Resource): json_requests = request.get_json() if 'devices' in json_requests: json_requests = json_requests['devices'] + + dev_list = [] + for device in json_requests: + dev = format_device_custom_config_rules(device) + dev_list.append(dev) + return jsonify([ grpc_message_to_json(self.device_client.AddDevice(grpc_device(device))) - for device in json_requests + for device in dev_list ]) class Device(_Resource): -- GitLab