Commit 8bec2f1d authored by Stavros-Anastasios Charismiadis's avatar Stavros-Anastasios Charismiadis
Browse files

Add zfill to negotiation function and edit supportedFeatures in tests to contain 3 characters

parent ad9eb066

services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py

+7 −1
Changes for services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ def return_negotiated_supp_feat_dict(supp_feat): 
        "RNAA": True if final_supp_feat[7] == "1" else False,

        "VendorExt": True if final_supp_feat[8] == "1" else False,

        "SliceBasedAPIExposure": True if final_supp_feat[9] == "1" else False,

        "Final": hex(int(final_supp_feat[::-1], 2))[2:]

        "Final": hex(int(final_supp_feat[::-1], 2))[2:].zfill(3)

    }



class PublishServiceOperations(Resource):
@@ -317,7 +317,13 @@ class PublishServiceOperations(Resource): 
            service_api_description["apf_id"] = serviceapidescription_old["apf_id"]

            service_api_description["onboarding_date"] = serviceapidescription_old["onboarding_date"]

            service_api_description["api_id"] = serviceapidescription_old["api_id"]

            current_app.logger.debug("************** Diff of suppfeat **************")

            current_app.logger.debug(service_api_description["supported_features"])

            service_api_description["supported_features"] = return_negotiated_supp_feat_dict(service_api_description["supported_features"])["Final"]

            current_app.logger.debug(service_api_description["supported_features"])

            current_app.logger.debug(service_api_description["supported_features"])

            current_app.logger.debug(service_api_description.get("supported_features"))

            current_app.logger.debug("************** Diff of suppfeat **************")



            if not return_negotiated_supp_feat_dict(service_api_description.get("supported_features"))["ApiStatusMonitoring"] and service_api_description.get("api_status", None) is not None:

                return bad_request_error(

tests/features/Api Status/api_status.robot

+3 −3
Changes for tests/features/Api Status/api_status.robot: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -1155,7 +1155,7 @@ Update published API with apiStatus empty and apiStatusMonitoring active 
    ${service_api_description_modified}=    Create Service Api Description

    ...    service_1

    ...    aef_id=${aef_ids}

    ...    supported_features=20

    ...    supported_features=020

    ...    api_status=${aef_empty_list}

    ${resp}=    Put Request Capif

    ...    ${resource_url.path}
@@ -1260,7 +1260,7 @@ Update published API with apiStatus only aef2 and apiStatusMonitoring active 
    ${service_api_description_modified}=    Create Service Api Description

    ...    service_1

    ...    aef_id=${aef_ids}

    ...    supported_features=20

    ...    supported_features=020

    ...    api_status=${aef_id_2}

    ${resp}=    Put Request Capif

    ...    ${resource_url.path}
@@ -1357,7 +1357,7 @@ Published API without aefs available updated to one aef available 
    ${service_api_description_modified}=    Create Service Api Description

    ...    service_1

    ...    aef_id=${aef_ids}

    ...    supported_features=20

    ...    supported_features=020

    ...    api_status=${aef_id_2}

    ${resp}=    Put Request Capif

    ...    ${resource_url.path}

tests/features/Event Filter/event_filter.robot

+1 −1
Changes for tests/features/Event Filter/event_filter.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ Invoker subscribed to SERVICE_API_AVAILABLE, SERVICE_API_UNAVAILABLE and SERVICE 
    ${service_api_description_modified}=    Create Service Api Description

    ...    service_1

    ...    aef_id=${aef_ids}

    ...    supported_features=20

    ...    supported_features=020

    ...    api_status=${aef_ids}

    ${resp}=    Put Request Capif

    ...    ${resource_url.path}