Commit 2df4abec authored by Stavros-Anastasios Charismiadis's avatar Stavros-Anastasios Charismiadis
Browse files

Merge branch... 

Merge branch 'OCF78-discover-api-with-comm_type-protocol-and-data_format-as-query-parameters-is-failing' into 'staging'

Ocf78 discover api with comm type protocol and data format as query parameters is failing

See merge request !94
parents a5a9c537 761d437d

services/TS29222_CAPIF_Discover_Service_API/service_apis/controllers/default_controller.py

+1 −12
Original line number Diff line number Diff line
@@ -55,18 +55,7 @@ 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 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,

services/TS29222_CAPIF_Discover_Service_API/service_apis/openapi/openapi.yaml

+3 −0
Original line number Diff line number Diff line
@@ -1183,6 +1183,7 @@ components: 
          type: string

      type: object

    CommunicationType:

      type: string

      anyOf:

      - enum:

        - REQUEST_RESPONSE
@@ -1197,6 +1198,7 @@ components: 
        \ type subscribe-notify.\n"

      title: CommunicationType

    Protocol:

      type: string

      anyOf:

      - enum:

        - HTTP_1_1
@@ -1214,6 +1216,7 @@ components: 
        \ Indicates that the protocol is Websocket.\n"

      title: Protocol

    DataFormat:

      type: string

      anyOf:

      - enum:

        - JSON