diff --git a/manifests/nbiservice.yaml b/manifests/nbiservice.yaml index de97ba364d71d2b5a7f55211867a0a5062c521a4..f5477aeb40582717aa6477ef0baad0de4f51b297 100644 --- a/manifests/nbiservice.yaml +++ b/manifests/nbiservice.yaml @@ -37,7 +37,7 @@ spec: - containerPort: 9192 env: - name: LOG_LEVEL - value: "INFO" + value: "DEBUG" readinessProbe: exec: command: ["/bin/grpc_health_probe", "-addr=:9090"] diff --git a/src/nbi/service/rest_server/nbi_plugins/ietf_acl/__init__.py b/src/nbi/service/rest_server/nbi_plugins/ietf_acl/__init__.py index 6c1353bff1ee848a176106c698c5d42d90806d56..3d6ed94c8fc0bc11618dcc8af30180e8d11c677c 100644 --- a/src/nbi/service/rest_server/nbi_plugins/ietf_acl/__init__.py +++ b/src/nbi/service/rest_server/nbi_plugins/ietf_acl/__init__.py @@ -30,13 +30,13 @@ def register_ietf_acl(rest_server: RestServer): __add_resource( rest_server, ACLs, - "/device=<device_uuid>/ietf-access-control-list:acls", - "/device=<device_uuid>/ietf-access-control-list:acls", + "/device=<path:device_uuid>/ietf-access-control-list:acls", + "/device=<path:device_uuid>/ietf-access-control-list:acls", ) __add_resource( rest_server, ACL, - "/device=<device_uuid>/ietf-access-control-list:acl=<acl_name>", - "/device=<device_uuid>/ietf-access-control-list:acl=<acl_name>/", + "/device=<path:device_uuid>/ietf-access-control-list:acl=<path:acl_name>", + "/device=<path:device_uuid>/ietf-access-control-list:acl=<path:acl_name>/", ) diff --git a/src/nbi/service/rest_server/nbi_plugins/ietf_acl/acl_services.py b/src/nbi/service/rest_server/nbi_plugins/ietf_acl/acl_services.py index 2d03e61b6ebb518d661e0e6147e84a4d16b99a17..1ed7893b4cc12658e74b03ca28ff9b9f3373afa8 100644 --- a/src/nbi/service/rest_server/nbi_plugins/ietf_acl/acl_services.py +++ b/src/nbi/service/rest_server/nbi_plugins/ietf_acl/acl_services.py @@ -14,19 +14,15 @@ import logging from typing import Dict - from flask import request from flask_restful import Resource -from werkzeug.exceptions import NotFound - +from werkzeug.exceptions import NotFound, UnsupportedMediaType from common.proto.context_pb2 import Device, DeviceId from common.tools.grpc.Tools import grpc_message_to_json_string from common.tools.object_factory.Device import json_device_id from context.client.ContextClient import ContextClient from device.client.DeviceClient import DeviceClient - -from nbi.service.rest_server.nbi_plugins.tools.Authentication import HTTP_AUTH - +#from nbi.service.rest_server.nbi_plugins.tools.Authentication import HTTP_AUTH from .ietf_acl_parser import config_rule_from_ietf_acl LOGGER = logging.getLogger(__name__)