diff --git a/SOL002/VNFConfiguration-API/ApiVersion.robot b/SOL002/VNFConfiguration-API/ApiVersion.robot
index 47abb5a5382ce8193565220f781dceea8d91104d..43b857994b0ddd5a49732b2f0be7f2ebb754e860 100644
--- a/SOL002/VNFConfiguration-API/ApiVersion.robot
+++ b/SOL002/VNFConfiguration-API/ApiVersion.robot
@@ -1,211 +1,211 @@
-*** Settings ***
-Resource environment/variables.txt
-Library REST ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT} ssl_verify=false
-Library DependencyLibrary
-Library JSONLibrary
-Library JSONSchemaLibrary schemas/
-
-*** Test Cases ***
-POST API Version - Method not implemented
- [Documentation] Test ID: 6.3.1.2.1
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- POST API Version
- Check HTTP Response Status Code Is 405
-
-GET API Version
- [Documentation] Test ID: 6.3.1.2.2
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- GET API Version
- Check HTTP Response Status Code Is 200
- Check HTTP Response Body Json Schema Is ApiVersionInformation
-
-PUT API Version - Method not implemented
- [Documentation] Test ID: 6.3.1.2.3
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- PUT API Version
- Check HTTP Response Status Code Is 405
-
-PATCH API Version - Method not implemented
- [Documentation] Test ID: 6.3.1.2.4
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- PATCH API Version
- Check HTTP Response Status Code Is 405
-
-DELETE API Version - Method not implemented
- [Documentation] Test ID: 6.3.1.2.5
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- DELETE API Version
- Check HTTP Response Status Code Is 405
-
-POST API Version with apiMajorVerion - Method not implemented
- [Documentation] Test ID: 6.3.1.2.6
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- POST API Version
- Check HTTP Response Status Code Is 405
-
-GET API Version with apiMajorVerion
- [Documentation] Test ID: 6.3.1.2.7
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- GET API Version
- Check HTTP Response Status Code Is 200
- Check HTTP Response Body Json Schema Is ApiVersionInformation
-
-PUT API Version with apiMajorVerion - Method not implemented
- [Documentation] Test ID: 6.3.1.2.8
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- PUT API Version
- Check HTTP Response Status Code Is 405
-
-PATCH API Version with apiMajorVerion - Method not implemented
- [Documentation] Test ID: 6.3.1.2.9
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- PATCH API Version
- Check HTTP Response Status Code Is 405
-
-DELETE API Version with apiMajorVerion - Method not implemented
- [Documentation] Test ID: 6.3.1.2.10
- ... 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.7.1
- ... Config ID: Config_prod_VNFM
- ... Applicability: none
- ... Post-Conditions: none
- DELETE API Version
- Check HTTP Response Status Code Is 405
-
-*** Keywords ***
-POST API Version
- Set Headers {"Accept":"${ACCEPT}"}
- Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
- Post ${apiRoot}/${apiName}/api_version
- ${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
- ${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
- ${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
- ${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
- ${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}/${apiMajorVersion}/api_version
- ${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}/${apiMajorVersion}/api_version
- ${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}/${apiMajorVersion}/api_version
- ${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}/${apiMajorVersion}/api_version
- ${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}/${apiMajorVersion}/api_version
- ${outputResponse}= Output response
- Set Global Variable ${response} ${outputResponse}
-
-Check HTTP Response Status Code Is
- [Arguments] ${expected_status}
- Should Be Equal As Strings ${response['status']} ${expected_status}
- Log Status code validated
-
-Check HTTP Response Body Json Schema Is
- [Arguments] ${input}
- ${schema} = Catenate ${input} .schema.json
- Validate Json ${schema} ${response['body']}
+*** Settings ***
+Resource environment/variables.txt
+Library REST ${EM-VNF_SCHEMA}://${EM-VNF_HOST}:${EM-VNF_PORT} ssl_verify=false
+Library DependencyLibrary
+Library JSONLibrary
+Library JSONSchemaLibrary schemas/
+
+*** Test Cases ***
+POST API Version - Method not implemented
+ [Documentation] Test ID: 6.3.1.2.1
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ POST API Version
+ Check HTTP Response Status Code Is 405
+
+GET API Version
+ [Documentation] Test ID: 6.3.1.2.2
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ GET API Version
+ Check HTTP Response Status Code Is 200
+ Check HTTP Response Body Json Schema Is ApiVersionInformation
+
+PUT API Version - Method not implemented
+ [Documentation] Test ID: 6.3.1.2.3
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ PUT API Version
+ Check HTTP Response Status Code Is 405
+
+PATCH API Version - Method not implemented
+ [Documentation] Test ID: 6.3.1.2.4
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ PATCH API Version
+ Check HTTP Response Status Code Is 405
+
+DELETE API Version - Method not implemented
+ [Documentation] Test ID: 6.3.1.2.5
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ DELETE API Version
+ Check HTTP Response Status Code Is 405
+
+POST API Version with apiMajorVerion - Method not implemented
+ [Documentation] Test ID: 6.3.1.2.6
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ POST API Version
+ Check HTTP Response Status Code Is 405
+
+GET API Version with apiMajorVerion
+ [Documentation] Test ID: 6.3.1.2.7
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ GET API Version
+ Check HTTP Response Status Code Is 200
+ Check HTTP Response Body Json Schema Is ApiVersionInformation
+
+PUT API Version with apiMajorVerion - Method not implemented
+ [Documentation] Test ID: 6.3.1.2.8
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ PUT API Version
+ Check HTTP Response Status Code Is 405
+
+PATCH API Version with apiMajorVerion - Method not implemented
+ [Documentation] Test ID: 6.3.1.2.9
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ PATCH API Version
+ Check HTTP Response Status Code Is 405
+
+DELETE API Version with apiMajorVerion - Method not implemented
+ [Documentation] Test ID: 6.3.1.2.10
+ ... 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.7.1
+ ... Config ID: Config_prod_VNFM
+ ... Applicability: none
+ ... Post-Conditions: none
+ DELETE API Version
+ Check HTTP Response Status Code Is 405
+
+*** Keywords ***
+POST API Version
+ Set Headers {"Accept":"${ACCEPT}"}
+ Run Keyword If ${AUTH_USAGE} == 1 Set Headers {"Authorization":"${AUTHORIZATION}"}
+ 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_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_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_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_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}/${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}/${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}/${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}/${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}/${apiMajorVersion}/api_versions
+ ${outputResponse}= Output response
+ Set Global Variable ${response} ${outputResponse}
+
+Check HTTP Response Status Code Is
+ [Arguments] ${expected_status}
+ Should Be Equal As Strings ${response['status']} ${expected_status}
+ Log Status code validated
+
+Check HTTP Response Body Json Schema Is
+ [Arguments] ${input}
+ ${schema} = Catenate ${input} .schema.json
+ Validate Json ${schema} ${response['body']}
Log Json Schema Validation OK
\ No newline at end of file