Commit 71076f17 authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix issue #77

parent 01a6bea9

SOL003/VNFPackageManagement-API/VNFPackageManagementKeywords.robot

+3 −3
Original line number Original line Diff line number Diff line
@@ -691,13 +691,13 @@ Send Delete request for individual VNF Package Subscription with invalid resourc 
    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}





Send Post request for individual VNF Package Subscription

Send Post request for individual VNF Package Subscription

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}





Send Put request for individual VNF Package Subscription

Send Put request for individual VNF Package Subscription

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    ${origOutput}=    Output    response

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    Set Suite Variable    ${origResponse}    ${origOutput}
@@ -706,7 +706,7 @@ Send Put request for individual VNF Package Subscription 
    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}

    

    

Send Patch request for individual VNF Package Subscription

Send Patch request for individual VNF Package Subscription

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

    ${origOutput}=    Output    response

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    Set Suite Variable    ${origResponse}    ${origOutput}

SOL003/VNFPerformanceManagement-API/IndividualReport.robot

+6 −6
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ DELETE Individual Performance Report - Method not implemented 
Get Individual Performance Report

Get Individual Performance Report

    Log    Trying to get a performance report present in the VNFM

    Log    Trying to get a performance report present in the VNFM

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -91,21 +91,21 @@ Get Individual Performance Report 
Get Individual Performance Report with invalid resource endpoint

Get Individual Performance Report with invalid resource endpoint

    Log    Trying to get a performance report with invalid resource endpoint

    Log    Trying to get a performance report with invalid resource endpoint

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${erroneousReportId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}





Send Post request for Individual Performance Report

Send Post request for Individual Performance Report

    Log    Trying to create new performance report

    Log    Trying to create new performance report

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${newReportId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}





Send Put request for Individual Performance Report

Send Put request for Individual Performance Report

    Log    Trying to update performance report

    Log    Trying to update performance report

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}

    ${origOutput}=    Output    response

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    Set Suite Variable    ${origResponse}    ${origOutput}
@@ -115,7 +115,7 @@ Send Put request for Individual Performance Report 
    

    

Send Patch request for Individual Performance Report

Send Patch request for Individual Performance Report

    Log    Trying to update performance report

    Log    Trying to update performance report

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}

    ${origOutput}=    Output    response

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    Set Suite Variable    ${origResponse}    ${origOutput}
@@ -125,7 +125,7 @@ Send Patch request for Individual Performance Report 




Send Delete request for Individual Performance Report

Send Delete request for Individual Performance Report

    Log    Trying to delete performance report   

    Log    Trying to delete performance report   

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}

SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot

+6 −6
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ PATCH Individual Threshold - Precondition failed 
GET Individual VNF Performance Threshold

GET Individual VNF Performance Threshold

    Log    Trying to get a Threhsold present in the VNFM

    Log    Trying to get a Threhsold present in the VNFM

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -121,28 +121,28 @@ GET Individual VNF Performance Threshold 
GET individual VNF Performance Threshold with invalid resource identifier

GET individual VNF Performance Threshold with invalid resource identifier

    Log    Trying to get a Threhsold with invalid resource endpoint

    Log    Trying to get a Threhsold with invalid resource endpoint

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}





Send Delete request for individual VNF Performance Threshold

Send Delete request for individual VNF Performance Threshold

    Log    Trying to delete a Threhsold in the VNFM

    Log    Trying to delete a Threhsold in the VNFM

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}





Send Delete request for individual VNF Performance Threshold with invalid resource identifier

Send Delete request for individual VNF Performance Threshold with invalid resource identifier

    Log    Trying to delete a Threhsold in the VNFM with invalid id

    Log    Trying to delete a Threhsold in the VNFM with invalid id

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${erroneousThresholdId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}





Send Post request for individual VNF Performance Threshold

Send Post request for individual VNF Performance Threshold

    Log    Trying to create new threshold

    Log    Trying to create new threshold

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${newThresholdId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -150,7 +150,7 @@ Send Post request for individual VNF Performance Threshold 
Send Put request for individual VNF Performance Threshold

Send Put request for individual VNF Performance Threshold

    Log    Trying to PUT threshold

    Log    Trying to PUT threshold

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}

    ${origOutput}=    Output    response

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    Set Suite Variable    ${origResponse}    ${origOutput}

SOL003/VNFPerformanceManagement-API/Thresholds.robot

+5 −5
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ GET Performance Thresholds - Bad Request Response too Big 
GET all Performance Thresholds

GET all Performance Thresholds

    Log    Trying to get all thresholds present in the VNFM    

    Log    Trying to get all thresholds present in the VNFM    

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -148,7 +148,7 @@ GET all Performance Thresholds 
GET Performance Thresholds with attribute-based filter

GET Performance Thresholds with attribute-based filter

    Log    Trying to get thresholds present in the VNFM with filter

    Log    Trying to get thresholds present in the VNFM with filter

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_OK}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -156,7 +156,7 @@ GET Performance Thresholds with attribute-based filter 
GET Performance Thresholds with invalid attribute-based filter

GET Performance Thresholds with invalid attribute-based filter

    Log    Trying to get thresholds present in the VNFM with invalid filter

    Log    Trying to get thresholds present in the VNFM with invalid filter

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds?${FILTER_KO}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -164,7 +164,7 @@ GET Performance Thresholds with invalid attribute-based filter 
GET VNF Performance Thresholds with invalid resource endpoint

GET VNF Performance Thresholds with invalid resource endpoint

    Log    Trying to get thresholds present in the VNFM with invalid resource endpoint

    Log    Trying to get thresholds present in the VNFM with invalid resource endpoint

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Set Headers    {"Accept": "${ACCEPT_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/threshold

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -200,7 +200,7 @@ Send PATCH Request for all Performance Thresholds 




Send DELETE Request for all Performance Thresholds

Send DELETE Request for all Performance Thresholds

    Log    DELETE THresholds

    Log    DELETE THresholds

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": ${AUTHORIZATION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}