Commit 20381ed6 authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

fix variables

parent 023ca445

SOL002/VNFPerformanceManagement-API/IndividualReport.robot

+7 −7
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ Get Individual Performance Report 
    Log    Trying to get a performance report present in the VNFM

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -92,21 +92,21 @@ Get Individual Performance Report with invalid resource endpoint 
    Log    Trying to get a performance report with invalid resource endpoint

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}



Send Post request for Individual Performance Report

    Log    Trying to create new performance report

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}



Send Put request for Individual Performance Report

    Log    Trying to update performance report

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

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

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

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
@@ -116,7 +116,7 @@ Send Put request for Individual Performance Report 
Send Patch request for Individual Performance Report

    Log    Trying to update performance report

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

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

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

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}/reports/${reportId}
@@ -126,7 +126,7 @@ Send Patch request for Individual Performance Report 
Send Delete request for Individual Performance Report

    Log    Trying to delete performance report   

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -138,7 +138,7 @@ Check Postcondition VNF Individual Performance Report is not Created 
    Log    Trying to get a new report

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

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/pm_jobs/${pmJobId}/reports/${newReportId}

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot

+8 −8
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ GET Individual VNF Performance Threshold 
    Log    Trying to get a Threhsold present in the VNFM

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -123,28 +123,28 @@ GET individual VNF Performance Threshold with invalid resource identifier 
    Log    Trying to get a Threhsold with invalid resource endpoint

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}



Send Delete request for individual VNF Performance Threshold

    Log    Trying to delete a Threhsold in the VNFM

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}



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

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}



Send Post request for individual VNF Performance Threshold

    Log    Trying to create new threshold

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -152,7 +152,7 @@ Send Put request for individual VNF Performance Threshold 
    Log    Trying to PUT threshold

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

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

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

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

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
@@ -163,10 +163,10 @@ Send Patch request for individual VNF Performance Threshold 
    Log    Trying to PUT threshold

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

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

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

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

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    PATCH    ${apiRoot}/${apiName}/${apiVersion}/thresholds/${thresholdId}

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

SOL002/VNFPerformanceManagement-API/Thresholds.robot

+5 −5
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ GET all Performance Thresholds 
    Log    Trying to get all thresholds present in the VNFM    

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -150,7 +150,7 @@ GET Performance Thresholds with attribute-based filter 
    Log    Trying to get thresholds present in the VNFM with filter

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -158,7 +158,7 @@ GET Performance Thresholds with invalid attribute-based filter 
    Log    Trying to get thresholds present in the VNFM with invalid filter

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

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -166,7 +166,7 @@ GET VNF Performance Thresholds with invalid resource endpoint 
    Log    Trying to get thresholds present in the VNFM with invalid resource endpoint

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

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

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

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

    ${output}=    Output    response

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

    Log    DELETE THresholds

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

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

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

SOL002/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Get all VNF Performance Subscriptions 
    Set headers    {"Accept": "application/json"}

    Set headers    {"Content-Type": "application/json"}

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    200
@@ -40,7 +40,7 @@ Get all VNF Performance Subscriptions 
    ...    request and response data structures, and response codes.

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

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ok}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    200
@@ -60,7 +60,7 @@ Get VNF Performance Subscriptions with invalid attribute-based filters 
    ...    request and response data structures, and response codes.

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

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${filter_ko}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    400
@@ -79,7 +79,7 @@ Get VNF Performance Subscriptions with invalid resource endpoint 
    ...    request and response data structures, and response codes.

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

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    # Integer    response status    404