Commit 60c6bde8 authored by Pelayo Torres's avatar Pelayo Torres
Browse files

Merge branch... 

Merge branch 'OCF141-review-and-implement-changes-from-3gpp-specs-v18-4-0-to-v18-7-0-latest-rel18' into 'staging'

Ocf141 review and implement changes from 3gpp specs v18 4 0 to v18 7 0 latest rel18

See merge request !123
parents 08b49f82 71ca556b

services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator/FILES

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ api_invoker_management/models/ipv6_address_range.py 
api_invoker_management/models/local2d_point_uncertainty_ellipse.py

api_invoker_management/models/local3d_point_uncertainty_ellipsoid.py

api_invoker_management/models/local_origin.py

api_invoker_management/models/o_auth_grant_type.py

api_invoker_management/models/onboarding_information.py

api_invoker_management/models/onboarding_notification.py

api_invoker_management/models/operation.py

services/TS29222_CAPIF_API_Invoker_Management_API/.openapi-generator/VERSION

+1 −1
Original line number Diff line number Diff line 
7.5.0
 
7.11.0

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py

+4 −5
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ from datetime import datetime 
from logging.handlers import RotatingFileHandler



import connexion

import encoder

from config import Config

from core.consumer_messager import Subscriber

from flask_apscheduler import APScheduler

from flask_executor import Executor

from flask_jwt_extended import JWTManager
@@ -19,10 +22,6 @@ from opentelemetry.sdk.trace import TracerProvider 
from opentelemetry.sdk.trace.export import BatchSpanProcessor

from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator



import encoder

from config import Config

from core.consumer_messager import Subscriber



NAME = "Invoker-Service"



# Setting log level
@@ -36,7 +35,7 @@ def configure_monitoring(app, config): 
    fluent_bit_host = config['monitoring']['fluent_bit_host']

    fluent_bit_port = config['monitoring']['fluent_bit_port']

    fluent_bit_sender = sender.FluentSender('Invoker-Service', host=fluent_bit_host, port=fluent_bit_port)

    propagator = TraceContextTextMapPropagator()

    TraceContextTextMapPropagator()



    tracer_provider = TracerProvider(resource=resource)

    trace.set_tracer_provider(tracer_provider)

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/default_controller.py

+6 −10
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ from functools import wraps 


from cryptography import x509

from cryptography.hazmat.backends import default_backend

from flask import request, current_app

from flask_jwt_extended import jwt_required, get_jwt_identity

from flask import current_app, request

from flask_jwt_extended import get_jwt_identity, jwt_required



from ..core.apiinvokerenrolmentdetails import InvokerManagementOperations

from ..core.validate_user import ControlAccess
@@ -12,7 +12,6 @@ from ..models.api_invoker_enrolment_details import APIInvokerEnrolmentDetails # 
invoker_operations = InvokerManagementOperations()

valid_user = ControlAccess()





def cert_validation():

    def _cert_validation(f):

        @wraps(f)
@@ -47,9 +46,8 @@ def onboarded_invokers_onboarding_id_delete(onboarding_id): # noqa: E501 
    :param onboarding_id: String identifying an individual on-boarded API invoker resource

    :type onboarding_id: str



    :rtype: None

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

    """



    current_app.logger.info("Removing invoker")

    res = invoker_operations.remove_apiinvokerenrolmentdetail(onboarding_id)
@@ -66,7 +64,7 @@ def onboarded_invokers_onboarding_id_put(onboarding_id, body): # noqa: E501 
    :param api_invoker_enrolment_details: representation of the API invoker details to be updated in CAPIF core function

    :type api_invoker_enrolment_details: dict | bytes



    :rtype: APIInvokerEnrolmentDetails

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

    """

    current_app.logger.info("Updating invoker")

    if request.is_json:
@@ -76,7 +74,6 @@ def onboarded_invokers_onboarding_id_put(onboarding_id, body): # noqa: E501 


    return res





@jwt_required()

def onboarded_invokers_post(body):  # noqa: E501

    """onboarded_invokers_post
@@ -86,9 +83,8 @@ def onboarded_invokers_post(body): # noqa: E501 
    :param api_invoker_enrolment_details: 

    :type api_invoker_enrolment_details: dict | bytes



    :rtype: APIInvokerEnrolmentDetails

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

    """



    identity = get_jwt_identity()

    username, uuid = identity.split()

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/individual_api_invoker_enrolment_details_controller.py

+3 −2
Original line number Diff line number Diff line 
from api_invoker_management.models.api_invoker_enrolment_details_patch import APIInvokerEnrolmentDetailsPatch  # noqa: E501

from api_invoker_management.models.api_invoker_enrolment_details_patch import \

    APIInvokerEnrolmentDetailsPatch  # noqa: E501





def modify_ind_api_invoke_enrolment(onboarding_id, api_invoker_enrolment_details_patch):  # noqa: E501

def modify_ind_api_invoke_enrolment(onboarding_id, body):  # noqa: E501

    """modify_ind_api_invoke_enrolment



    Modify an individual API invoker details. # noqa: E501