Commit 6c8ec04f authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'pr_nbi' into 'develop' 

Resolve "[UBI] NBI to format config rules for services and devices"

See merge request !413
parents e9ab7c48 a67281a5

src/nbi/service/tfs_api/Resources.py

+10 −2
Original line number Diff line number Diff line
@@ -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):