Commit afa6fd2f authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'OCF49-change-netapp-to-network-app' into 'staging' 

Change NetApp to Network App

See merge request !39
parents ea6a13f4 dc5918c2

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class InvokerManagementOperations(Resource): 


        if old_values is None:

            current_app.logger.error("Not found api invoker id")

            return not_found_error(detail="Please provide an existing Netapp ID", cause= "Not exist NetappID" )

            return not_found_error(detail="Please provide an existing Network App ID", cause= "Not exist Network App ID" )



        return old_values
@@ -161,7 +161,7 @@ class InvokerManagementOperations(Resource): 


            current_app.logger.debug("Invoker resource removed from database")

            current_app.logger.debug("Netapp offboarded sucessfuly")

            out =  "The Netapp matching onboardingId  " + onboard_id + " was offboarded."

            out =  "The Network App matching onboardingId  " + onboard_id + " was offboarded."

            res = make_response(out, status=204)

            if res.status_code == 204:

                current_app.logger.info("Invoker Removed")

services/TS29222_CAPIF_Security_API/capif_security/core/servicesecurity.py

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ class SecurityOperations(Resource): 


                current_app.logger.debug(

                    "Removed security context from database")

                out = "The security info of Netapp with Netapp ID " + \

                out = "The security info of Network App with Network App ID " + \

                    api_invoker_id + " were deleted.", 204

                return make_response(out, status=204)

tests/features/CAPIF Api Invoker Management/capif_api_invoker_managenet.robot

+12 −12
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ ${API_INVOKER_NOT_REGISTERED} not-valid 




*** Test Cases ***

Onboard NetApp

Onboard Network App

    [Tags]    capif_api_invoker_management-1

    # Register Netapp

    # Register Network App

    ${register_user_info}=    Register User At Jwt Auth

    ...    username=${INVOKER_USERNAME}    role=${INVOKER_ROLE}
@@ -42,7 +42,7 @@ Onboard NetApp 
    # Store dummy signed certificate

    Store In File    ${INVOKER_USERNAME}.crt    ${resp.json()['onboardingInformation']['apiInvokerCertificate']}



Register NetApp Already Onboarded

Register Network App Already Onboarded

    [Tags]    capif_api_invoker_management-2

    # Default Invoker Registration and Onboarding

    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
@@ -61,7 +61,7 @@ Register NetApp Already Onboarded 
    ...    detail=Invoker already registered

    ...    cause=Identical invoker public key



Update Onboarded NetApp

Update Onboarded Network App

    [Tags]    capif_api_invoker_management-3

    ${new_notification_destination}=    Set Variable

    ...    http://${CAPIF_CALLBACK_IP}:${CAPIF_CALLBACK_PORT}/netapp_new_callback
@@ -83,7 +83,7 @@ Update Onboarded NetApp 
    Check Response Variable Type And Values    ${resp}    200    APIInvokerEnrolmentDetails

    ...    notificationDestination=${new_notification_destination}



Update Not Onboarded NetApp

Update Not Onboarded Network App

    [Tags]    capif_api_invoker_management-4

    # Default Invoker Registration and Onboarding

    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
@@ -99,10 +99,10 @@ Update Not Onboarded NetApp 
    Check Response Variable Type And Values    ${resp}    404    ProblemDetails

    ...    status=404

    ...    title=Not Found

    ...    detail=Please provide an existing Netapp ID

    ...    cause=Not exist NetappID

    ...    detail=Please provide an existing Network App ID

    ...    cause=Not exist Network App ID



Offboard NetApp

Offboard Network App

    [Tags]    capif_api_invoker_management-5

    # Default Invoker Registration and Onboarding

    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
@@ -118,7 +118,7 @@ Offboard NetApp 
    # Check Results

    Should Be Equal As Strings    ${resp.status_code}    204



Offboard Not Previously Onboarded NetApp

Offboard Not Previously Onboarded Network App

    [Tags]    capif_api_invoker_management-6

    # Default Invoker Registration and Onboarding

    ${register_user_info}    ${url}    ${request_body}=    Invoker Default Onboarding
@@ -133,10 +133,10 @@ Offboard Not Previously Onboarded NetApp 
    Check Response Variable Type And Values    ${resp}    404    ProblemDetails

    ...    status=404

    ...    title=Not Found

    ...    detail=Please provide an existing Netapp ID

    ...    cause=Not exist NetappID

    ...    detail=Please provide an existing Network App ID

    ...    cause=Not exist Network App ID



Update Onboarded NetApp Certificate

Update Onboarded Network App Certificate

    [Tags]    capif_api_invoker_management-7

    ${new_notification_destination}=    Set Variable

    ...    http://${CAPIF_CALLBACK_IP}:${CAPIF_CALLBACK_PORT}/netapp_new_callback