Commit 707ed408 authored by Stavros-Anastasios Charismiadis's avatar Stavros-Anastasios Charismiadis
Browse files

ALL APIs upgraded to Flask 3, all tests passed

parent 21f54c3d

services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ connexion[flask, swagger-ui, uvicorn] == 3.1.0; python_version>="3.6" 
swagger-ui-bundle >= 0.0.2

python_dateutil >= 2.6.0

setuptools == 68.2.2

Flask[async] == 3.0.3

Flask == 3.0.3

pymongo == 4.7.3

redis ==  4.5.4

flask_jwt_extended == 4.6.0
@@ -13,7 +13,7 @@ opentelemetry-instrumentation-flask == 0.40b0 
opentelemetry-instrumentation-redis == 0.40b0

opentelemetry-instrumentation-pymongo == 0.40b0

opentelemetry-exporter-otlp == 1.19.0

opentelemetry-exporter-jaeger == 1.17.0

opentelemetry-exporter-jaeger == 1.19.0

fluent == 0.10.0

fluent-logger == 0.10.0

opentelemetry-api == 1.19.0

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/app.py

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ def verbose_formatter(): 
        datefmt='%d/%m/%Y %H:%M:%S'

    )



app = connexion.App(__name__, specification_dir='./openapi/')

app.app.json_encoder = encoder.JSONEncoder

app = connexion.App(__name__, specification_dir='openapi/')

app.app.json_encoder = encoder.CustomJSONEncoder

app.add_api('openapi.yaml',

            arguments={'title': 'CAPIF_Access_Control_policy_API'},

            pythonic_params=True)

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/redis_event.py

+2 −2
Original line number Diff line number Diff line 
from encoder import JSONEncoder

from encoder import CustomJSONEncoder

from .publisher import Publisher

import json
@@ -32,7 +32,7 @@ class RedisEvent(): 
            self.redis_event['information'] = information



    def to_string(self):

        return json.dumps(self.redis_event, cls=JSONEncoder)

        return json.dumps(self.redis_event, cls=CustomJSONEncoder)



    def send_event(self):

        publisher_ops.publish_message("events", self.to_string())

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/responses.py

+6 −6
Original line number Diff line number Diff line 
from ..models.problem_details import ProblemDetails

from ..encoder import JSONEncoder

from ..encoder import CustomJSONEncoder

from flask import Response

from ..util import dict_to_camel_case, clean_empty, serialize_clean_camel_case

import json
@@ -8,7 +8,7 @@ mimetype = "application/json" 




def make_response(object, status):

    res = Response(json.dumps(object, cls=JSONEncoder), status=status, mimetype=mimetype)

    res = Response(json.dumps(object, cls=CustomJSONEncoder), status=status, mimetype=mimetype)



    return res
@@ -17,25 +17,25 @@ def internal_server_error(detail, cause): 
    prob = ProblemDetails(title="Internal Server Error", status=500, detail=detail, cause=cause)

    prob = serialize_clean_camel_case(prob)



    return Response(json.dumps(prob, cls=JSONEncoder), status=500, mimetype=mimetype)

    return Response(json.dumps(prob, cls=CustomJSONEncoder), status=500, mimetype=mimetype)





def forbidden_error(detail, cause):

    prob = ProblemDetails(title="Forbidden", status=403, detail=detail, cause=cause)

    prob = serialize_clean_camel_case(prob)



    return Response(json.dumps(prob, cls=JSONEncoder), status=403, mimetype=mimetype)

    return Response(json.dumps(prob, cls=CustomJSONEncoder), status=403, mimetype=mimetype)





def bad_request_error(detail, cause, invalid_params):

    prob = ProblemDetails(title="Bad Request", status=400, detail=detail, cause=cause, invalid_params=invalid_params)

    prob = serialize_clean_camel_case(prob)



    return Response(json.dumps(prob, cls=JSONEncoder), status=400, mimetype=cause)

    return Response(json.dumps(prob, cls=CustomJSONEncoder), status=400, mimetype=cause)





def not_found_error(detail, cause):

    prob = ProblemDetails(title="Not Found", status=404, detail=detail, cause=cause)

    prob = serialize_clean_camel_case(prob)



    return Response(json.dumps(prob, cls=JSONEncoder), status=404, mimetype=mimetype)
 
 No newline at end of file
 
    return Response(json.dumps(prob, cls=CustomJSONEncoder), status=404, mimetype=mimetype)
 
 No newline at end of file

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/encoder.py

+3 −3
Original line number Diff line number Diff line 
from connexion.apps.flask_app import FlaskJSONEncoder

from connexion.jsonifier import JSONEncoder

import six



from models.base_model_ import Model





class JSONEncoder(FlaskJSONEncoder):

class CustomJSONEncoder(JSONEncoder):

    include_nulls = False



    def default(self, o):
@@ -17,4 +17,4 @@ class JSONEncoder(FlaskJSONEncoder): 
                attr = o.attribute_map[attr]

                dikt[attr] = value

            return dikt

        return FlaskJSONEncoder.default(self, o)
 
        return JSONEncoder.default(self, o)