Commit 1634f430 authored by Pelayo Torres's avatar Pelayo Torres
Browse files

Fix issues from staging merge

parent 78705964

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/controllers/individual_api_invoker_enrolment_details_controller.py

+2 −2
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ def modify_ind_api_invoke_enrolment(onboarding_id, api_invoker_enrolment_details 


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

    """

    if connexion.request.is_json:

        api_invoker_enrolment_details_patch = APIInvokerEnrolmentDetailsPatch.from_dict(connexion.request.get_json())  # noqa: E501

    if request.is_json:

        api_invoker_enrolment_details_patch = APIInvokerEnrolmentDetailsPatch.from_dict(request.get_json())  # noqa: E501

    return 'do some magic!'

services/TS29222_CAPIF_API_Provider_Management_API/api_provider_management/encoder.py

+1 −1
Original line number Diff line number Diff line 
from connexion.jsonifier import JSONEncoder

import six



from .models.base_model_ import Model

from .models.base_model import Model





class CustomJSONEncoder(JSONEncoder):

services/TS29222_CAPIF_Auditing_API/logs/controllers/default_controller.py

+8 −8
Original line number Diff line number Diff line
@@ -66,14 +66,14 @@ def api_invocation_logs_get(aef_id=None, api_invoker_id=None, time_range_start=N 


    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

    if request.is_json:

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

    if request.is_json:

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

    if request.is_json:

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

    if request.is_json:

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



    query_params = {"aef_id": aef_id,

                    "api_invoker_id": api_invoker_id,

services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/default_controller.py

+12 −13
Original line number Diff line number Diff line 
import connexion

from typing import Dict

from typing import Tuple

from typing import Union
@@ -55,18 +54,18 @@ def all_service_apis_get(api_invoker_id, api_name=None, api_version=None, comm_t 


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

    """

    if connexion.request.is_json:

        comm_type =  CommunicationType.from_dict(connexion.request.get_json())  # noqa: E501

    if connexion.request.is_json:

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

    if connexion.request.is_json:

        data_format =  DataFormat.from_dict(connexion.request.get_json())  # noqa: E501

    if connexion.request.is_json:

        preferred_aef_loc =  AefLocation.from_dict(connexion.request.get_json())  # noqa: E501

    if connexion.request.is_json:

        ue_ip_addr =  IpAddrInfo.from_dict(connexion.request.get_json())  # noqa: E501

    if connexion.request.is_json:

        service_kpis =  ServiceKpis.from_dict(connexion.request.get_json())  # noqa: E501

    if request.is_json:

        comm_type =  CommunicationType.from_dict(request.get_json()())  # noqa: E501

    if request.is_json:

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

    if request.is_json:

        data_format =  DataFormat.from_dict(request.get_json()())  # noqa: E501

    if request.is_json:

        preferred_aef_loc =  AefLocation.from_dict(request.get_json()())  # noqa: E501

    if request.is_json:

        ue_ip_addr =  IpAddrInfo.from_dict(request.get_json()())  # noqa: E501

    if request.is_json:

        service_kpis =  ServiceKpis.from_dict(request.get_json()())  # noqa: E501

    current_app.logger.info("Discovering service apis")

    query_params = {"api_name":api_name, "api_version":api_version, "comm_type":comm_type, 

    "protocol":protocol, "aef_id":aef_id, "data_format":data_format,

services/TS29222_CAPIF_Events_API/capif_events/controllers/default_controller.py

+4 −4
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ def subscriber_id_subscriptions_subscription_id_patch(subscriber_id, subscriptio 


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

    """

    if connexion.request.is_json:

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

    if request.is_json:

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

    

    res = events_ops.patch_event(body, subscriber_id, subscription_id)

    return res
@@ -122,8 +122,8 @@ def subscriber_id_subscriptions_subscription_id_put(subscriber_id, subscription_ 


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

    """

    if connexion.request.is_json:

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

    if request.is_json:

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

    

    res = events_ops.put_event(body, subscriber_id, subscription_id)

    return res