Commit ec4cdcda authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch '2.7.1-dev' into '2.7.1-dev-SOL003-VNFPerformanceManagement-API' 

# Conflicts:
#   SOL003/VNFPerformanceManagement-API/IndividualReport.robot
#   SOL003/VNFPerformanceManagement-API/IndividualThreshold.robot
#   SOL003/VNFPerformanceManagement-API/Thresholds.robot
#   SOL003/VNFPerformanceManagement-API/VNFPerformanceManagementKeywords.robot
parents cc297a36 bb406382

.jenkins.sh

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright ETSI 2018

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt



#set -vx

#set -e



cd "$(dirname "$0")"



run_dir="$(pwd)"



bash ./scripts/build-container.sh

bash ./scripts/run-container.sh "${run_dir}"



ret=$?

echo "Final validation result: $ret"

exit $ret

README.md

+2 −0
Original line number Diff line number Diff line
@@ -28,3 +28,5 @@ Please report errors, bugs or other issues [here](https://forge.etsi.org/rep/nfv 


ETSI Forge uses Gitlab to manage submissions to the repository.

For more information on setting up your environment and contributing, you may refer to the [ETSI Forge wiki](https://forge.etsi.org/wiki/index.php/Main_Page).

SOL002/VNFConfiguration-API/ApiVersion.robot

+210 −210
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ POST API Version - Method not implemented 
    ...    Test title: POST API version - Method not implemented

    ...    Test objective: The objective is to test that POST method is not implemented

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -23,7 +23,7 @@ GET API Version 
    ...    Test title: GET API Version

    ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -36,7 +36,7 @@ PUT API Version - Method not implemented 
    ...    Test title: PUT API Version - Method not implemented

    ...    Test objective: The objective is to test that PUT method is not implemented

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented 
    ...    Test title: PATCH API Version - Method not implemented

    ...    Test objective: The objective is to test that PATCH method is not implemented

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented 
    ...    Test title: DELETE API Version - Method not implemented

    ...    Test objective: The objective is to test that DELETE method is not implemented

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented 
    ...    Test title: POST API version with apiMajorVerion - Method not implemented

    ...    Test objective: The objective is to test that POST method is not implemented

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion 
    ...    Test title: GET API Version with apiMajorVerion

    ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented 
    ...    Test title: PUT API Version with apiMajorVerion - Method not implemented

    ...    Test objective: The objective is to test that PUT method is not implemented

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented 
    ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented

    ...    Test objective: The objective is to test that PATCH method is not implemented

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented 
    ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented

    ...    Test objective: The objective is to test that DELETE method is not implemented

    ...    Pre-conditions: none

    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.6.1

    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1

    ...    Config ID: Config_prod_VNFM

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -132,70 +132,70 @@ DELETE API Version with apiMajorVerion - Method not implemented 
POST API Version

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

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

    Post    ${apiRoot}/${apiName}/api_version

    Post    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

GET API Version

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

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

    Get    ${apiRoot}/${apiName}/api_version

    Get    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PUT API Version

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

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

    Put    ${apiRoot}/${apiName}/api_version

    Put    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PATCH API Version

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

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

    Patch    ${apiRoot}/${apiName}/api_version

    Patch    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

DELETE API Version

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

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

    Delete    ${apiRoot}/${apiName}/api_version

    Delete    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

POST API Version with apiMajorVersion

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

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

    Post    ${apiRoot}/${apiName}/v1/api_version

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

GET API Version with apiMajorVersion

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

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

    Get    ${apiRoot}/${apiName}/v1/api_version

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PUT API Version with apiMajorVersion

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

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

    Put    ${apiRoot}/${apiName}/v1/api_version

    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PATCH API Version with apiMajorVersion

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

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

    Patch    ${apiRoot}/${apiName}/v1/api_version

    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

DELETE API Version with apiMajorVersion

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

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

    Delete    ${apiRoot}/${apiName}/v1/api_version

    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_versions

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

SOL002/VNFConfiguration-API/Configuration.robot

+17 −22
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Set new VNF Configuration 
    ...    Test title: Set a new VNF Configuration

    ...    Test objective: The objective is to test the creation of a new VNF configuration and perform a JSON schema validation of the returned configuration data structure

    ...    Pre-conditions: A VNF instance is instantiated

    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1

    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers

    ...    Post-Conditions: The configuration is successfully set in the VNF and it matches the issued configuration
@@ -28,7 +28,7 @@ Get information about a VNF configuration 
    ...    Test title: Get information about a VNF configuration

    ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration and perform a JSON schema validation of the collected configuration data structure

    ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is already configured.

    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1

    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -42,7 +42,7 @@ Get information about a VNF configuration with HTTP Etag 
    ...    Test title: Get information about a VNF configuration with HTTP Etag

    ...    Test objective: The objective is to test the retrieval of an existing VNF instance configuration, check the generation by the VNF of an HTTP Etag opaque identifier, and perform a JSON schema validation of the collected configuration data structure

    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured

    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.6.1

    ...    Reference: Clause 9.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers

    ...    Post-Conditions: none
@@ -57,7 +57,7 @@ Set new VNF Configuration - HTTP Etag precondition unsuccessful 
    ...    Test title: Set a new VNF Configuration - HTTP Etag precondition unsuccessful

    ...    Test objective: The objective is to test the unsuccess in setting a duplication of VNF configuration identified by an already used HTTP Etag identifier. The test also checks the JSON schema of the unsuccessful operation HTTP response.

    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured (Test ID 6.3.1.1.1) with a given HTTP Etag identifier.

    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.6.1

    ...    Reference: Clause 9.4.2.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: The VNF supports the generation of HTTP Etag opaque identifiers

    ...    Post-Conditions:  The VNF configuration is not modified by the unsuccessful operation and it matches the configuration issued in Test ID 6.3.1.1.1
@@ -70,8 +70,8 @@ POST VNF Configuration - Method not implemented 
    [Documentation]    Test ID: 6.3.1.1.5

    ...    Test title: POST VNF Configuration - Method not implemented

    ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF configuration

    ...    Pre-conditions: A VNF instance is instantiated. The VNF instance is alrseady configured

    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.6.1

    ...    Pre-conditions: none

    ...    Reference: Clause 9.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -82,8 +82,8 @@ PUT VNF Configuration - Method not implemented 
    [Documentation]    Test ID: 6.3.1.1.6

    ...    Test title: PUT VNF Configuration - Method not implemented

    ...    Test objective: The objective is to test that PUT method is not allowed to modify an existing VNF configuration

    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured

    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.6.1

    ...    Pre-conditions:  none

    ...    Reference: Clause 9.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: none

    ...    Post-Conditions: none
@@ -94,14 +94,13 @@ DELETE VNF Configuration - Method not implemented 
    [Documentation]    Test ID: 6.3.1.1.7

    ...    Test title: Delete VNF Configuration - Method not implemented

    ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF configuration

    ...    Pre-conditions:  A VNF instance is instantiated. The VNF instance is already configured

    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.6.1

    ...    Pre-conditions:  none

    ...    Reference: Clause 9.4.2.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1

    ...    Config ID: Config_prod_VE

    ...    Applicability: none

    ...    Post-Conditions: The VNF configuration is not deleted by the unsuccessful operation

    ...    Post-Conditions: none

    Send DELETE Request for VNF Configuration

    Check HTTP Response Status Code Is    405

    Check Postcondition VNF Configuration Exists

    

*** Keywords ***    

Get VNF configuration
@@ -110,7 +109,7 @@ Get VNF configuration 
    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

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

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/configuration

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -120,7 +119,7 @@ Send VNF configuration 
    Set Headers  {"Content-Type": "${CONTENT_TYPE}"} 

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

    ${body}=    Get File    jsons/vnfConfigModifications.json

    Patch    ${apiRoot}/${apiName}/${apiVersion}/configuration    ${body}

    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration    ${body}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -146,10 +145,6 @@ Check Postcondition VNF Configuration Unmodified (Implicit) 
    Log    Check Implicit Postcondition

    Check Postcondition VNF Is Configured

    

Check Postcondition VNF Configuration Exists

    Log    Check Postcondition VNF exists

    Check Postcondition VNF Is Configured

    

Check Postcondition VNF Is Configured

    Log    Check Postcondition for VNF Configuration

    Get VNF configuration
@@ -165,7 +160,7 @@ Send Duplicated VNF configuration 
    Set Headers    {"If-Match": "${etag}"}

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

    ${body}=    Get File    jsons/vnfConfigModifications.json

    Patch    ${apiRoot}/${apiName}/${apiVersion}/configuration    ${body}

    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration    ${body}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -173,7 +168,7 @@ Send POST Request for VNF Configuration 
    log    Trying to perform a POST. This method should not be implemented

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

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

    Post    ${apiRoot}/${apiName}/${apiVersion}/configuration

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -181,7 +176,7 @@ Send PUT Request for VNF Configuration 
    log    Trying to perform a POST. This method should not be implemented

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

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

    Put    ${apiRoot}/${apiName}/${apiVersion}/configuration

    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -189,6 +184,6 @@ Send DELETE Request for VNF Configuration 
    log    Trying to perform a POST. This method should not be implemented

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

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

    Delete    ${apiRoot}/${apiName}/${apiVersion}/configuration

    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/configuration

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
 
 No newline at end of file

SOL002/VNFConfiguration-API/environment/variables.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ ${CONTENT_TYPE} application/json 


${apiRoot}        /

${apiName}        vnfconfig

${apiVersion}     v1

${apiMajorVersion}     v1



${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX