Commit f722719a authored by Mudassar Khan's avatar Mudassar Khan Committed by Giacomo Bernini
Browse files

implement Version tag in the header of VNF Performance Management API requests... 

implement Version tag in the header of VNF Performance Management API requests as per clause 9.1 S0L013
parent ac332c61

SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot

+12 −2
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ DELETE Individual VNF Performance Job with NOT permitted authorization scope 
GET individual VNF Performance Job

    Log    Trying to get a Pm Job present in the NFVO Catalogue

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response
@@ -164,6 +165,7 @@ GET individual VNF Performance Job 
GET individual VNF Performance Job with invalid resource identifier  

    Log    Trying to perform a negative get, using erroneous PM Job identifier

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response
@@ -172,6 +174,7 @@ GET individual VNF Performance Job with invalid resource identifier 
Send Delete request for individual VNF Performance Job

    Log    Trying to delete an existing PM Job

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response
@@ -180,6 +183,7 @@ Send Delete request for individual VNF Performance Job 
Send Delete request for individual VNF Performance Job with invalid resource identifier

    Log    Trying to perform a negative delete, using erroneous PM Job identifier

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${erroneousPmJobId}

    ${output}=    Output    response
@@ -188,6 +192,7 @@ Send Delete request for individual VNF Performance Job with invalid resource ide 
Send Post request for individual VNF Performance Job    

    Log    Trying to perform a POST (method should not be implemented)

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${newPmJobId}

    ${output}=    Output    response
@@ -196,6 +201,7 @@ Send Post request for individual VNF Performance Job 
Send Put request for individual VNF Performance Job    

    Log    Trying to perform a POST (method should not be implemented)

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${origOutput}=    Output    response
@@ -206,6 +212,8 @@ Send Put request for individual VNF Performance Job 
    

Send Patch request for individual VNF Performance Job    

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

    Set Headers    {"Version": "${API_VERSION}"}

    Set Headers    {"Version": "${API_VERSION}"} 

    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${template}=    Get File    jsons/PMJobModification.json
@@ -216,6 +224,8 @@ Send Patch request for individual VNF Performance Job 


Send Patch request for individual VNF Performance Job with Unreachable Callback URI    

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

    Set Headers    {"Version": "${API_VERSION}"}

    Set Headers    {"Version": "${API_VERSION}"} 

    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${template}=    Get File    jsons/PMJobModification.json

SOL002/VNFPerformanceManagement-API/IndividualReport.robot

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ Get Individual Performance Report with NOT permitted authorization scope 
Get Individual Performance Report

    Log    Trying to get a performance report present in the VNFM

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response
@@ -116,6 +117,7 @@ Get Individual Performance Report 
Get Individual Performance Report with invalid resource endpoint

    Log    Trying to get a performance report with invalid resource endpoint

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response
@@ -162,6 +164,7 @@ Check Postcondition VNF Individual Performance Report Exists 
Check Postcondition VNF Individual Performance Report is not Created

    Log    Trying to get a new report

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response

SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot

+7 −2
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ GET Individual Threshold with NOT permitted authorization scope 
GET Individual VNF Performance Threshold

    Log    Trying to get a Threhsold present in the VNFM

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response
@@ -166,6 +167,7 @@ GET Individual VNF Performance Threshold 
GET individual VNF Performance Threshold with invalid resource identifier

    Log    Trying to get a Threhsold with invalid resource endpoint

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response
@@ -195,6 +197,7 @@ Send Post request for individual VNF Performance Threshold 
Send Put request for individual VNF Performance Threshold

    Log    Trying to perform a PUT. This method should not be supported.

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response
@@ -202,6 +205,7 @@ Send Put request for individual VNF Performance Threshold 
    

Send Patch request for individual VNF Performance Threshold

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

    Set Headers    {"Version": "${API_VERSION}"}

    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
@@ -215,6 +219,7 @@ Send Patch request for individual VNF Performance Threshold 


Send Patch request for individual VNF Performance Threshold with Unreachable Callback URI    

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

    Set Headers    {"Version": "${API_VERSION}"}

    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot

+7 −3
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ VNF Threshold Crossed Notification 
*** Keywords ***

Check resource existence and get CallbackUri

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

    Set Headers    {"Version": "${API_VERSION}"}

    Set Headers    {"Version": "${API_VERSION}"}  

    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}
@@ -51,6 +53,7 @@ Check HTTP Response Status Code Is 
Post VNF Performance Information Availability Notification

    log    Trying to perform a POST to get notification

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

    Set Headers    {"Version": "${API_VERSION}"}

    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${template} =    Get File    jsons/PerformanceInformationAvaliableNotification.json
@@ -62,6 +65,7 @@ Post VNF Performance Information Availability Notification 
Post VNF Threshold Crossed Notification

    log    Trying to perform a POST to get notification

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

    Set Headers    {"Version": "${API_VERSION}"} 

    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${template} =    Get File    jsons/ThresholdCrossedNotification.json

SOL002/VNFPerformanceManagement-API/PMJobs.robot

+15 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ GET all VNF Performance Monitoring Jobs with NOT permitted authorization scope 
GET all VNF Performance Monitoring Jobs

    Log    Trying to get all PM Jobs present in the VNFM

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response
@@ -255,6 +256,7 @@ GET all VNF Performance Monitoring Jobs 
GET VNF Performance Monitoring Jobs with attribute-based filter

    Log    Trying to get all PM Jobs present in the VNFM, using filter params

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${POS_FILTER}

    ${output}=    Output    response
@@ -263,6 +265,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter 
GET VNF Performance Monitoring Jobs with all_fields attribute selector

    Log    Trying to get all PM Jobs present in the VNFM, using 'all_fields' filter

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?all_fields

    ${output}=    Output    response
@@ -271,6 +274,7 @@ GET VNF Performance Monitoring Jobs with all_fields attribute selector 
GET VNF Performance Monitoring Jobs with exclude_default attribute selector

    Log    Trying to get all VNF Packages present in the VNFM, using filter params

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?exclude_default

    ${output}=    Output    response
@@ -280,6 +284,7 @@ GET VNF Performance Monitoring Jobs with fields attribute selector 
    Log    Trying to get all VNF Packages present in the VNFM, using filter params

    Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}

    ${output}=    Output    response
@@ -288,6 +293,7 @@ GET VNF Performance Monitoring Jobs with fields attribute selector 
GET VNF Performance Monitoring Jobs with exclude_default and fields attribute selector

    Log    Trying to get all VNF Packages present in the VNFM, using filter params

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}&exclude_default

    ${output}=    Output    response
@@ -297,6 +303,7 @@ GET VNF Performance Monitoring Jobs with exclude_fields attribute selector 
    Log    Trying to get all VNF Packages present in the VNFM, using filter params

    Pass Execution If    ${FIELD_USAGE} == 0    Skipping test as VNFM is not supporting 'fields'

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?fields=${fields}

    ${output}=    Output    response
@@ -305,6 +312,7 @@ GET VNF Performance Monitoring Jobs with exclude_fields attribute selector 
GET VNF Performance Monitoring Jobs with invalid attribute-based filter

    Log    Trying to get all PM Jobs present in the VNFM, using an erroneous filter param

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs?${NEG_FILTER}

    ${output}=    Output    response
@@ -313,6 +321,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter 
GET VNF Performance Monitoring Jobs with invalid resource endpoint    

    Log    Trying to perform a GET on a erroneous URI

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_job    # wrong URI /pm_job instead of /pm_jobs

    ${output}=    Output    response
@@ -321,6 +330,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint 
Send Post Request Create new VNF Performance Monitoring Job

    Log    Creating a new PM Job

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

    Set Headers    {"Version": "${API_VERSION}"}

    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${template}=    Get File    jsons/CreatePmJobRequest.json
@@ -332,6 +342,7 @@ Send Post Request Create new VNF Performance Monitoring Job 
Send Post Request Create new VNF Performance Monitoring Job with Unreachable Callback URI

    Log    Creating a new PM Job

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

    Set Headers    {"Version": "${API_VERSION}"}

    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    ${template}=    Get File    jsons/CreatePmJobRequest.json
@@ -343,6 +354,7 @@ Send Post Request Create new VNF Performance Monitoring Job with Unreachable Cal 
Send PUT Request for all VNF Performance Monitoring Jobs 

    Log    Trying to perform a PUT. This method should not be implemented

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs

    ${output}=    Output    response
@@ -351,6 +363,7 @@ Send PUT Request for all VNF Performance Monitoring Jobs 
Send PATCH Request for all VNF Performance Monitoring Jobs 

    Log    Trying to perform a PUT. This method should not be implemented

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs

    ${output}=    Output    response
@@ -359,6 +372,7 @@ Send PATCH Request for all VNF Performance Monitoring Jobs 
Send DELETE Request for all VNF Performance Monitoring Jobs 

    Log    Trying to perform a PUT. This method should not be implemented

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs

    ${output}=    Output    response
@@ -367,6 +381,7 @@ Send DELETE Request for all VNF Performance Monitoring Jobs 
Check Postcondition PmJob Exists

    Log    Checking that Pm Job exists

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

    Set Headers    {"Version": "${API_VERSION}"}

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${response['body']['id']}

    ${output}=    Output    response