Commit 1a4e6423 authored by Pelayo Torres's avatar Pelayo Torres
Browse files

Merge branch 'REL18-Logging' into 'OCF64-rel17-to-rel18' 

REL18 Logging Service

See merge request !57
parents 88811475 9b6d5c66

services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator/FILES

+5 −6
Original line number Original line Diff line number Diff line 
.dockerignore

.dockerignore

.gitignore

.gitignore

.openapi-generator-ignore

.travis.yml

.travis.yml

Dockerfile

Dockerfile

README.md

README.md

git_push.sh

api_invocation_logs/__init__.py

api_invocation_logs/__init__.py

api_invocation_logs/__main__.py

api_invocation_logs/__main__.py

api_invocation_logs/controllers/__init__.py

api_invocation_logs/controllers/__init__.py

api_invocation_logs/controllers/default_controller.py

api_invocation_logs/controllers/default_controller.py

api_invocation_logs/controllers/security_controller_.py

api_invocation_logs/controllers/security_controller.py

api_invocation_logs/encoder.py

api_invocation_logs/encoder.py

api_invocation_logs/models/__init__.py

api_invocation_logs/models/__init__.py

api_invocation_logs/models/base_model_.py

api_invocation_logs/models/base_model.py

api_invocation_logs/models/interface_description.py

api_invocation_logs/models/interface_description.py

api_invocation_logs/models/invalid_param.py

api_invocation_logs/models/invalid_param.py

api_invocation_logs/models/invocation_log.py

api_invocation_logs/models/invocation_log.py

api_invocation_logs/models/log.py

api_invocation_logs/models/log.py

api_invocation_logs/models/operation.py

api_invocation_logs/models/operation.py

api_invocation_logs/models/operation_any_of.py

api_invocation_logs/models/problem_details.py

api_invocation_logs/models/problem_details.py

api_invocation_logs/models/protocol.py

api_invocation_logs/models/protocol.py

api_invocation_logs/models/protocol_any_of.py

api_invocation_logs/models/security_method.py

api_invocation_logs/models/security_method.py

api_invocation_logs/models/security_method_any_of.py

api_invocation_logs/openapi/openapi.yaml

api_invocation_logs/openapi/openapi.yaml

api_invocation_logs/test/__init__.py

api_invocation_logs/test/__init__.py

api_invocation_logs/test/test_default_controller.py

api_invocation_logs/typing_utils.py

api_invocation_logs/typing_utils.py

api_invocation_logs/util.py

api_invocation_logs/util.py

git_push.sh

requirements.txt

requirements.txt

setup.py

setup.py

test-requirements.txt

test-requirements.txt

services/TS29222_CAPIF_Logging_API_Invocation_API/.openapi-generator/VERSION

+1 −1
Original line number Original line Diff line number Diff line 
5.3.0-SNAPSHOT
 
7.5.0
 
 No newline at end of file

services/TS29222_CAPIF_Logging_API_Invocation_API/README.md

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ To run the server, please execute the following from the root directory: 




```

```

pip3 install -r requirements.txt

pip3 install -r requirements.txt

python3 -m api_invocation_logs

python3 -m openapi_server

```

```





and open your browser to here:

and open your browser to here:

services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/default_controller.py

+7 −5
Original line number Original line Diff line number Diff line 
import connexion

import connexion

from typing import Dict

from typing import Tuple

from typing import Union





from ..models.invocation_log import InvocationLog  # noqa: E501

from api_invocation_logs.models.invocation_log import InvocationLog  # noqa: E501

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

from api_invocation_logs import util





from ..core.invocationlogs import LoggingInvocationOperations

from ..core.invocationlogs import LoggingInvocationOperations
@@ -14,7 +19,6 @@ logging_invocation_operations = LoggingInvocationOperations() 




valid_user = ControlAccess()

valid_user = ControlAccess()







def cert_validation():

def cert_validation():

    def _cert_validation(f):

    def _cert_validation(f):

        @wraps(f)

        @wraps(f)
@@ -51,17 +55,15 @@ def aef_id_logs_post(aef_id, body): # noqa: E501 
    :param invocation_log: 

    :param invocation_log: 

    :type invocation_log: dict | bytes

    :type invocation_log: dict | bytes





    :rtype: InvocationLog

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

    """

    """

    current_app.logger.info("API Invocation Logs")

    current_app.logger.info("API Invocation Logs")





    if connexion.request.is_json:

    if connexion.request.is_json:

        body = InvocationLog.from_dict(connexion.request.get_json())  # noqa: E501

        body = InvocationLog.from_dict(connexion.request.get_json())  # noqa: E501



    res = logging_invocation_operations.add_invocationlog(aef_id, body)

    res = logging_invocation_operations.add_invocationlog(aef_id, body)





    if res.status_code == 201:

    if res.status_code == 201:

        current_app.logger.info("Invocation Logs stored successfully")

        current_app.logger.info("Invocation Logs stored successfully")





    return res
 
    return res

services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/security_controller_.py→services/TS29222_CAPIF_Logging_API_Invocation_API/api_invocation_logs/controllers/security_controller.py

+0 −0

File moved.

View file