REL18 Auditing Service

Pelayo Torresrequested to merge
REL18-Auditing into OCF64-rel17-to-rel18

Merge request reports

services/TS29222_CAPIF_Auditing_API/.openapi-generator/FILES

+6 −5
Changes for services/TS29222_CAPIF_Auditing_API/.openapi-generator/FILES: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line 
.dockerignore

.gitignore

.openapi-generator-ignore

.travis.yml

Dockerfile

README.md
@@ -8,23 +9,23 @@ logs/__init__.py 
logs/__main__.py

logs/controllers/__init__.py

logs/controllers/default_controller.py

logs/controllers/security_controller_.py

logs/controllers/security_controller.py

logs/encoder.py

logs/models/__init__.py

logs/models/base_model_.py

logs/models/base_model.py

logs/models/interface_description.py

logs/models/invalid_param.py

logs/models/invocation_log.py

logs/models/invocation_logs.py

logs/models/invocation_logs_retrieve_res.py

logs/models/log.py

logs/models/operation.py

logs/models/operation_any_of.py

logs/models/problem_details.py

logs/models/protocol.py

logs/models/protocol_any_of.py

logs/models/security_method.py

logs/models/security_method_any_of.py

logs/openapi/openapi.yaml

logs/test/__init__.py

logs/test/test_default_controller.py

logs/typing_utils.py

logs/util.py

requirements.txt

services/TS29222_CAPIF_Auditing_API/.openapi-generator/VERSION

+1 −1
Changes for services/TS29222_CAPIF_Auditing_API/.openapi-generator/VERSION: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
5.3.0-SNAPSHOT
 
 No newline at end of file
 
7.5.0

services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py

+26 −6
Changes for services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py: 26 added lines, 6 removed lines.
Original line number Diff line number Diff line 
import connexion

from typing import Dict

from typing import Tuple

from typing import Union



from logs.models.interface_description import InterfaceDescription  # noqa: E501

from logs.models.invocation_logs_retrieve_res import InvocationLogsRetrieveRes  # noqa: E501

from logs.models.operation import Operation  # noqa: E501

from logs.models.problem_details import ProblemDetails  # noqa: E501

from logs.models.protocol import Protocol  # noqa: E501

from logs import util



from ..util import deserialize_datetime

from ..core.auditoperations import AuditOperations
@@ -23,7 +34,7 @@ def api_invocation_logs_get(aef_id=None, api_invoker_id=None, time_range_start=N 
    :type time_range_end: str

    :param api_id: String identifying the API invoked.

    :type api_id: str

    :param api_name: API name, it is set as {apiName} part of the URI structure as defined in subclause 4.4 of 3GPP TS 29.501.

    :param api_name: API name, it is set as {apiName} part of the URI structure as defined in clause 5.2.4 of 3GPP TS 29.122. 

    :type api_name: str

    :param api_version: Version of the API which was invoked.

    :type api_version: str
@@ -36,13 +47,13 @@ def api_invocation_logs_get(aef_id=None, api_invoker_id=None, time_range_start=N 
    :param resource_name: Name of the specific resource invoked.

    :type resource_name: str

    :param src_interface: Interface description of the API invoker.

    :type src_interface: str

    :type src_interface: dict | bytes

    :param dest_interface: Interface description of the API invoked.

    :type dest_interface: str

    :type dest_interface: dict | bytes

    :param supported_features: To filter irrelevant responses related to unsupported features

    :type supported_features: str



    :rtype: InvocationLog

    :rtype: Union[InvocationLogsRetrieveRes, Tuple[InvocationLogsRetrieveRes, int], Tuple[InvocationLogsRetrieveRes, int, Dict[str, str]]

    """



    current_app.logger.info("Audit logs")
@@ -52,8 +63,17 @@ def api_invocation_logs_get(aef_id=None, api_invoker_id=None, time_range_start=N 
                                 cause="Mandatory parameters missing", invalid_params=[

                {"param": "aef_id or api_invoker_id", "reason": "missing"}])



    time_range_start = deserialize_datetime(time_range_start)

    time_range_end = deserialize_datetime(time_range_end)



    time_range_start = util.deserialize_datetime(time_range_start)

    time_range_end = util.deserialize_datetime(time_range_end)

    if connexion.request.is_json:

        protocol =  Protocol.from_dict(connexion.request.get_json())  # noqa: E501

    if connexion.request.is_json:

        operation =  Operation.from_dict(connexion.request.get_json())  # noqa: E501

    if connexion.request.is_json:

        src_interface =  InterfaceDescription.from_dict(connexion.request.get_json())  # noqa: E501

    if connexion.request.is_json:

        dest_interface =  InterfaceDescription.from_dict(connexion.request.get_json())  # noqa: E501



    query_params = {"aef_id": aef_id,

                    "api_invoker_id": api_invoker_id,

services/TS29222_CAPIF_Auditing_API/logs/controllers/security_controller_.py→services/TS29222_CAPIF_Auditing_API/logs/controllers/security_controller.py

+0 −0

File moved.

View file

services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py

+2 −6
Changes for services/TS29222_CAPIF_Auditing_API/logs/models/__init__.py: 2 added lines, 6 removed lines.
Original line number Diff line number Diff line 
# coding: utf-8



# flake8: noqa

from __future__ import absolute_import

# import models into model package

from logs.models.interface_description import InterfaceDescription

from logs.models.invalid_param import InvalidParam

from logs.models.invocation_log import InvocationLog

from logs.models.invocation_logs import InvocationLogs

from logs.models.invocation_logs_retrieve_res import InvocationLogsRetrieveRes

from logs.models.log import Log

from logs.models.operation import Operation

from logs.models.operation_any_of import OperationAnyOf

from logs.models.problem_details import ProblemDetails

from logs.models.protocol import Protocol

from logs.models.protocol_any_of import ProtocolAnyOf

from logs.models.security_method import SecurityMethod
 
from logs.models.security_method_any_of import SecurityMethodAnyOf