updated ApiVersion tests

SOL002/VNFConfiguration-API/ApiVersion.robot

 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -199,4 +197,15 @@ DELETE API Version with apiMajorVersion
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response[0]['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file

SOL002/VNFFaultManagement-API/ApiVersion.robot

 *** Settings ***
-Resource    environment/configuration.txt
+
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
+
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -199,4 +199,15 @@ DELETE API Version with apiMajorVersion
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response[0]['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file

SOL002/VNFIndicator-API/ApiVersion.robot

 *** Settings ***
-Resource    environment/configuration.txt
+
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
+
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -132,71 +132,82 @@ DELETE API Version with apiMajorVerion - Method not implemented
 
 *** Keywords ***
 POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response[0]['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file

SOL002/VNFIndicator-API/environment/variables.txt

@@ -22,4 +22,6 @@ ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.
 ${callback_uri}    http://localhost
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
-${callback_endpoint_error}    /endpoint_404
\ No newline at end of file
+${callback_endpoint_error}    /endpoint_404
+
+${response}       some_response_object
\ No newline at end of file

SOL002/VNFLifecycleManagement-API/ApiVersion.robot

 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -199,4 +197,15 @@ DELETE API Version with apiMajorVersion
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response[0]['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file

SOL002/VNFLifecycleManagement-API/environment/variables.txt

@@ -57,3 +57,6 @@ ${response}=    httpresponse
 
 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
 
+${fields}
+
+${original_etag}    some_etag
\ No newline at end of file

SOL002/VNFPerformanceManagement-API/ApiVersion.robot

 *** Settings ***
-Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -132,71 +130,82 @@ DELETE API Version with apiMajorVerion - Method not implemented
 
 *** Keywords ***
 POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response[0]['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file

SOL002/VNFPerformanceManagement-API/environment/variables.txt

@@ -21,4 +21,6 @@ ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_error}    /endpoint_404
 ${sleep_interval}    20s
-${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
\ No newline at end of file
+${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar
+
+${response}        http-response
\ No newline at end of file

SOL003/VNFFaultManagement-API/ApiVersion.robot

 *** Settings ***
-Resource    environment/configuration.txt
+
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
+
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -199,4 +199,15 @@ DELETE API Version with apiMajorVersion
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response[0]['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file

SOL003/VNFIndicator-API/ApiVersion.robot

 *** Settings ***
-Resource    environment/configuration.txt
+
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
+
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -132,71 +132,82 @@ DELETE API Version with apiMajorVerion - Method not implemented
 
 *** Keywords ***
 POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Patch    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 DELETE API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response[0]['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file

SOL003/VNFLifecycleManagement-API/ApiVersion.robot

 *** Settings ***
 Resource    environment/configuration.txt
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -199,4 +198,16 @@ DELETE API Version with apiMajorVersion
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+	
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response[0]['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file

SOL003/VNFLifecycleOperationGranting-API/ApiVersion.robot

 *** Settings ***
-Resource    environment/configuration.txt
+
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
+
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -199,4 +199,15 @@ DELETE API Version with apiMajorVersion
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Delete    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
-	Set Global Variable    @{response}    ${outputResponse} 
\ No newline at end of file
+	Set Global Variable    @{response}    ${outputResponse} 
+	
+Check HTTP Response Status Code Is
+    [Arguments]    ${expected_status}    
+    Should Be Equal    ${response.status_code}    ${expected_status}
+    Log    Status code validated 
+
+Check HTTP Response Body Json Schema Is
+    [Arguments]    ${input}
+    ${schema} =    Catenate    ${input}    .schema.json
+    Validate Json    ${schema}    ${response[0]['body']}
+    Log    Json Schema Validation OK
\ No newline at end of file

SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt

@@ -17,7 +17,7 @@ ${SYNC_MODE}    1
 
 
 
-
+${response}
 
 
 

SOL003/VNFPackageManagement-API/ApiVersion.robot

 *** Settings ***
-Resource    environment/configuration.txt
+
 Resource    environment/variables.txt
-Resource    VnfLcmOperationKeywords.robot
+
 Library    REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT} 
 Library    DependencyLibrary
 Library    JSONLibrary
@@ -132,71 +132,83 @@ DELETE API Version with apiMajorVerion - Method not implemented
 
 *** Keywords ***
 POST API Version
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     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}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Post    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 GET API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Get    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 PUT API Version with apiMajorVersion
-    Set Headers    {"Accept":"${ACCEPT}"} 
+    Set Headers    {"Accept":"${ACCEPT_JSON}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
     Put    ${apiRoot}/${apiName}/v1/api_version
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse} 
 	
 PATCH API Version with apiMajorVersion