diff --git a/SOL005/NSDManagement-API/NSDManagementKeywords.robot b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
index c5a26d96a99136e8647202b7f4e5b414e0f3586f..355128df62af3b372ab9f4ca61ddc3e4b3c7cfb1 100644
--- a/SOL005/NSDManagement-API/NSDManagementKeywords.robot
+++ b/SOL005/NSDManagement-API/NSDManagementKeywords.robot
@@ -16,7 +16,7 @@ GET all Network Service Descriptors Information
     Log    The GET method queries multiple NS descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -24,7 +24,7 @@ GET Network Service Descriptors Information with attribute-based filter
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NSD_NAME}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NSD_NAME}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -37,7 +37,7 @@ GET Network Service Descriptors Information with invalid attribute-based filter
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters. Negative case, with erroneous attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NEG_FIELDS}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -47,7 +47,7 @@ Get all Network Service Descriptors Information with malformed authorization tok
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -56,7 +56,7 @@ Get all Network Service Descriptors Information without authorization token
     Log    The GET method queries omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -66,7 +66,7 @@ Get all Network Service Descriptors Information with expired or revoked authoriz
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -74,7 +74,7 @@ GET all Network Service Descriptors Information with all_fields attribute select
     Log    The GET method queries multiple NS descriptors using Attribute-based filtering parameters "all_fields"
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?all_fields
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -88,7 +88,7 @@ GET all Network Service Descriptors Information with exclude_default attribute s
     Log    Trying to get all NSDs present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -102,7 +102,7 @@ GET all Network Service Descriptors Information with fields attribute selector
     Log    Trying to get all NSDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -110,7 +110,7 @@ GET all Network Service Descriptors Information with exclude_default and fields
     Log    Trying to get all NSDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default&fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_default&fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
 
@@ -125,7 +125,7 @@ GET all Network Service Descriptors Information with exclude_fields attribute se
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use exclude_fields option
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -141,7 +141,7 @@ Send Post Request to create new Network Service Descriptor Resource
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/createNsdInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -149,7 +149,7 @@ Check Postcondition NsdInfo Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${response['body']['id']}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -160,7 +160,7 @@ Send PUT Request for all Network Service Descriptors
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -169,7 +169,7 @@ Send PATCH Request for all Network Service Descriptors
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -178,7 +178,7 @@ Send DELETE Request for all Network Service Descriptors
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -190,7 +190,7 @@ GET Individual Network Service Descriptor Information
     Log    The GET method reads information about an individual NS descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -203,7 +203,7 @@ GET Individual Network Service Descriptor Information with invalid resource iden
     Log    Trying to perform a GET on an erroneous nsDescriptorInfoId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}
     Integer    response status    404
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -215,7 +215,7 @@ Send PATCH to disable Individual Network Service Descriptor
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationDisable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -236,7 +236,7 @@ Send PATCH to enable Individual Network Service Descriptor
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -247,7 +247,7 @@ Send PATCH to enable Individual Network Service Descriptor in onboarding state d
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -258,7 +258,7 @@ Send PATCH to enable Individual Network Service Descriptor in onboarding state d
     Set Headers    {"If-Match": "${wrong_etag}"}
     ${body}=    Get File    jsons/NsdInfoModificationEnable.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -266,21 +266,21 @@ Send DELETE Request for Individual Network Service Descriptor
     Log    Trying to perform a DELETE nsdInfo. The nsdInfo should be in "NOT_USED" usageState and in "DISABLED" operationalState.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition Network Service Descriptor is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${disabledNsdInfoId}
     Integer    response status    404
 
 Send DELETE Request for Individual Network Service Descriptor in operational state ENABLED
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -292,7 +292,7 @@ Send POST Request for Individual Network Service Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -301,7 +301,7 @@ Send PUT Request for Individual Network Service Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -329,7 +329,7 @@ Get NSD Content in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -337,7 +337,7 @@ Get NSD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -345,7 +345,7 @@ Get NSD Content with conflict due to onboarding state
     Log    Trying to get a VNFD from a given NSD Management present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -355,7 +355,7 @@ GET NSD Content with Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -365,7 +365,7 @@ GET NSD Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -413,7 +413,7 @@ Send POST Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -421,7 +421,7 @@ Send PATCH Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -429,7 +429,7 @@ Send DELETE Request for NSD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -437,7 +437,7 @@ GET all PNF Descriptors Information
     Log    The GET method queries multiple PNF descriptors
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -445,7 +445,7 @@ GET PNF Descriptors Information with attribute-based filter
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${PNFD_NAME}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${PNFD_NAME}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -458,7 +458,7 @@ GET PNF Descriptors Information with invalid attribute-based filter
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters. Negative case, with erroneous attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${NEG_FIELDS}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?${NEG_FIELDS}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -466,7 +466,7 @@ GET all PNF Descriptors Information with all_fields attribute selector
     Log    The GET method queries multiple PNF descriptors using Attribute-based filtering parameters "all_fields"
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?all_fields
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -480,7 +480,7 @@ GET all PNF Descriptors Information with exclude_default attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -494,7 +494,7 @@ GET all PNF Descriptors Information with fields attribute selector
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
     
@@ -502,7 +502,7 @@ GET all PNF Descriptors Information with exclude_default and fields attribute se
     Log    Trying to get all PNFDs present in the NFVO Catalogue, using fields filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default&fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_default&fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}  
 
@@ -517,7 +517,7 @@ GET all PNF Descriptors Information with exclude_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use exclude_fields option
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -533,7 +533,7 @@ Send Post Request to create new PNF Descriptor Resource
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/createPnfdInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -541,7 +541,7 @@ Check Postcondition PnfdInfo Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${response['body']['id']}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -552,7 +552,7 @@ Send PUT Request for all PNF Descriptors
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -561,7 +561,7 @@ Send PATCH Request for all PNF Descriptors
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -570,7 +570,7 @@ Send DELETE Request for all PNF Descriptors
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -578,7 +578,7 @@ GET Individual PNF Descriptor Information
     Log    The GET method reads information about an individual PNF descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -591,7 +591,7 @@ GET Individual PNF Descriptor Information with invalid resource identifier
     Log    Trying to perform a GET on an erroneous nsDescriptorInfoId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -602,7 +602,7 @@ Send PATCH to update Individual PNF Descriptor
     Set Headers    {"If-Match": "${original_etag}"}
     ${body}=    Get File    jsons/PnfdInfoModification.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Set Suite Variable    ${body["userDefinedData"]}    ${userDefinedDataSet}
@@ -618,7 +618,7 @@ Send PATCH to update Individual PNF Descriptor with HTTP Etag precondition failu
     Set Headers    {"If-Match": "${wrong_etag}"}
     ${body}=    Get File    jsons/PnfdInfoModification.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -626,14 +626,14 @@ Send DELETE Request for Individual PNF Descriptor
     Log    Trying to perform a DELETE pnfdInfo.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition PNF Descriptor is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     Integer    response status    404
 
 Send POST Request for Individual PNF Descriptor
@@ -641,7 +641,7 @@ Send POST Request for Individual PNF Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -650,7 +650,7 @@ Send PUT Request for Individual PNF Descriptor
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -658,7 +658,7 @@ Get PNFD Content
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -667,7 +667,7 @@ Get PNFD Content with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -676,7 +676,7 @@ Get PNFD Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -684,7 +684,7 @@ Get PNFD Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${erroneous_pnfdInfoId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -692,7 +692,7 @@ Get PNFD Content with conflict due to onboarding state
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${onboardingStatePnfdId}/pnfd_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${onboardingStatePnfdId}/pnfd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -710,7 +710,7 @@ Send PUT Request to upload PNFD Content with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get Binary File  ${contentFilePnfd}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingNsdInfoId}/pnfd_content    ${body}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${creatingNsdInfoId}/pnfd_content    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -718,7 +718,7 @@ Send POST Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -726,7 +726,7 @@ Send PATCH Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -734,7 +734,7 @@ Send DELETE Request for PNFD Content
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/pnf_descriptors/${pnfdInfoId}/nsd_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -747,7 +747,7 @@ Get all NSD Management Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -755,7 +755,7 @@ Get NSD Management Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -764,7 +764,7 @@ Get NSD Management Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -773,7 +773,7 @@ Get NSD Management Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -787,21 +787,21 @@ Send Post Request for NSD Management Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
     ...    Check Notification Endpoint  
 
 
-Send Post Request for Duplicated NSD Management Subscription
+Send POST Request for Duplicated NSD Management Subscription
     Log    Trying to create a subscription with an already created content
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     notifCallbackUri=${notifCallbackUri}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
@@ -814,7 +814,7 @@ Send Put Request for NSD Management Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -824,7 +824,7 @@ Send Patch Request for NSD Management Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -833,7 +833,7 @@ Send Delete Request for NSD Management Subscriptions
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -877,7 +877,7 @@ Check Postcondition NSD Management Subscription Is Set
     Log    Trying to get the subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -886,7 +886,7 @@ Check Postcondition NSD Management Subscription Is Set
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${response['headers']['Location']}
+    REST.GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
     ${contentType}=    Output    response headers Content-Type
@@ -904,7 +904,7 @@ Get Individual NSD Management Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -912,7 +912,7 @@ GET individual NSD Management Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -920,7 +920,7 @@ Send Delete request for individual NSD Management Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -933,31 +933,31 @@ Send Delete request for individual NSD Management Subscription with invalid reso
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual NSD Management Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual NSD Management Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual NSD Management Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -996,7 +996,7 @@ Check HTTP Response Header Contain Link
 Check PostCondition GET Individual Network Service Descriptor Information
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoId}
     Should Be Equal As Strings     ${response['status']}    200
     
 Wait for individual grant successful notification
@@ -1006,7 +1006,7 @@ Get single file NSD in Plain Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1014,7 +1014,7 @@ Get NSD in Zip Format
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1023,7 +1023,7 @@ Get single file NSD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1032,7 +1032,7 @@ Get multi file NSD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1040,7 +1040,7 @@ Get multi file NSD in Plain Format
     Log    Trying to get a negative case performing a get on a NSD present in the NFVO Catalogue. Accept will be text/plain but NSD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1049,7 +1049,7 @@ Get NSD with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_nsdInfoId}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1058,7 +1058,7 @@ Get NSD with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1066,7 +1066,7 @@ Send POST Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1074,7 +1074,7 @@ Send PUT Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1082,7 +1082,7 @@ Send PATCH Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1090,7 +1090,7 @@ Send DELETE Request for NSD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1098,14 +1098,14 @@ Get NSD with security information
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/nsd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get NSD Archive Manifest
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdPlain}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1113,7 +1113,7 @@ Get NSD Archive Manifest with security information
     Log    Trying to get a NSD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1122,7 +1122,7 @@ Get NSD Archive Manifest with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1130,7 +1130,7 @@ Send POST Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1138,7 +1138,7 @@ Send PUT Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1146,7 +1146,7 @@ Send PATCH Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1154,7 +1154,7 @@ Send DELETE Request for NSD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${nsdInfoIdZip}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1162,7 +1162,7 @@ Get single file PNFD in Plain Format
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1170,7 +1170,7 @@ Get PNFD in Zip Format
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1179,7 +1179,7 @@ Get single file PNFD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1188,7 +1188,7 @@ Get multi file PNFD in Plain or Zip Format
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1196,7 +1196,7 @@ Get multi file PNFD in Plain Format
     Log    Trying to get a negative case performing a get on a PNFD present in the NFVO Catalogue. Accept will be text/plain but PNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1205,7 +1205,7 @@ Get PNFD with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_PNFDInfoId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${erroneous_PNFDInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1214,7 +1214,7 @@ Get PNFD with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${onboardingStatePnfdId}/pnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${onboardingStatePnfdId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -1222,7 +1222,7 @@ Get PNFD with security information
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1230,7 +1230,7 @@ Send POST Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1238,7 +1238,7 @@ Send PUT Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1246,7 +1246,7 @@ Send PATCH Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1254,14 +1254,14 @@ Send DELETE Request for PNFD
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/pnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
 Get PNFD Archive Manifest
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1269,7 +1269,7 @@ Get PNFD Archive Manifest with security information
     Log    Trying to get a PNFD present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1278,7 +1278,7 @@ Get PNFD Archive Manifest with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${notOnboardedNsdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1286,7 +1286,7 @@ Send POST Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a POST. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1294,7 +1294,7 @@ Send PUT Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1302,7 +1302,7 @@ Send PATCH Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a PATCH. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -1310,6 +1310,6 @@ Send DELETE Request for PNFD Archive Manifest
     Pass Execution If    ${testOptionalMethods} == 0    optional methods are not implemented on the FUT. Skipping test.
     Log    Trying to perform a DELETE. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/ns_descriptors/${pnfdInfoId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
index 38977de8ba81e21e49693202837172cf7b15a6f3..e32dacda4b41d56ed8f56040f044fb5c1633415d 100644
--- a/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
+++ b/SOL005/VNFPackageManagement-API/VNFPackageManagementKeywords.robot
@@ -15,7 +15,7 @@ Get all VNF Packages
     Log    Trying to get all VNF Packages present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}   
 
@@ -47,7 +47,7 @@ GET VNF Packages with attribute-based filter
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${POS_FILTER}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${POS_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -62,7 +62,7 @@ GET VNF Packages with invalid attribute-based filter
     Log    Trying to perform a negative get, filtering by the inexistent filter 'nfvId'
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${NEG_FILTER}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?${NEG_FILTER}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -72,7 +72,7 @@ Get all VNF Packages with malformed authorization token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -81,7 +81,7 @@ Get all VNF Packages without authorization token
     Log    The GET method queries omitting token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Log    Execute Query and validate response
-    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -89,7 +89,7 @@ GET VNF Packages with all_fields attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using filter params
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?all_fields
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?all_fields
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
    
@@ -110,7 +110,7 @@ GET VNF Packages with exclude_default attribute selector
     Log    Trying to get all VNF Packages present in the NFVO Catalogue, using exclude_default filter.
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_default   
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_default   
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -129,7 +129,7 @@ GET VNF Packages with fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -148,7 +148,7 @@ GET VNF Packages with exclude_fields attribute selector
     Pass Execution If    ${NFVO_FIELDS} == 0    The NFVO is not able to use fields parameter
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_fields=${fields}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -166,7 +166,7 @@ GET all VNF Packages with invalid resource endpoint
     Log    Trying to perform a GET on a erroneous URI
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -176,7 +176,7 @@ Send Post Request to create new VNF Package Resource
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/CreateVnfPkgInfoRequest.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -184,7 +184,7 @@ Check Postcondition VNF Package Resource Exists
     Log    Checking that nsd info exists
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${response['body']['id']}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${response['body']['id']}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -194,7 +194,7 @@ Send PUT Request for all VNF Packages
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -202,7 +202,7 @@ Send PATCH Request for all VNF Packages
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -210,7 +210,7 @@ Send DELETE Request for all VNF Packages
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -218,7 +218,7 @@ GET Individual VNF Package
     Log    Trying to get a VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -231,7 +231,7 @@ GET Individual VNF Package with invalid resource identifier
     Log    Trying to perform a negative get, using wrong authorization bearer
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPackageId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -239,7 +239,7 @@ Send POST Request for individual VNF Package
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -247,7 +247,7 @@ Send PUT Request for individual VNF Package
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -257,7 +257,7 @@ Send PATCH to disable Individual VNF Package
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/VnfPkgInfoModificationsDisabled.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -272,7 +272,7 @@ Send PATCH to enable Individual VNF Package
     Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     ${body}=    Get File    jsons/VnfPkgInfoModifications.json
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -280,21 +280,21 @@ Send DELETE Request for individual VNF Package
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Check Postcondition VNF Package is Deleted
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${disabledVnfPackageId}
     Integer    response status    404
 
 Send DELETE Request for Individual VNF Package in operational state ENABLED
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -306,7 +306,7 @@ Send DELETE Request for Individual VNF Package used for instantiated VNF instanc
     Log    Trying to perform a DELETE nsdInfo in ENABLED operational state
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${instantiatedVnfPackageId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${instantiatedVnfPackageId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -314,7 +314,7 @@ Get VNFD in Individual VNF Package in Zip Format
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -322,7 +322,7 @@ Get VNFD in Individual VNF Package with security information
     Log    Trying to get a VNFD from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -334,7 +334,7 @@ Get multi file VNFD in Individual VNF Package in Plain Format
     Log    Trying to get a negative case performing a get on a VNFD from a given VNF Package present in the NFVO Catalogue. Accept will be text/plain but VNFD is composed my multiple files.
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -343,7 +343,7 @@ Get VNFD in Individual VNF Package with invalid resource identifier
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -352,7 +352,7 @@ Get VNFD in Individual VNF Package with conflict due to onboarding state
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -360,7 +360,7 @@ Send POST Request for VNFD in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -368,7 +368,7 @@ Send PUT Request for VNFD in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -376,7 +376,7 @@ Send PATCH Request for VNFD in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -384,7 +384,7 @@ Send DELETE Request for VNFD in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgZipVNFD}/vnfd
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -392,7 +392,7 @@ GET Individual VNF Package Content
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -406,7 +406,7 @@ GET Individual VNF Package Content with Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -428,7 +428,7 @@ GET Individual VNF Package Content with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -436,7 +436,7 @@ GET Individual VNF Package Content with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -444,7 +444,7 @@ GET Content for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package content present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -452,7 +452,7 @@ Send POST Request for individual VNF Package Content
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -460,7 +460,7 @@ Send PUT Request for individual VNF Package Content
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -478,7 +478,7 @@ Check Postcondition VNF Package Content is uploaded and available in the NFVO
     Log    Trying to get a VNF Package Content
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${newVnfPackageId}/package_content
     Integer    response status    200
  
 Send PUT Request to upload VNF Package Content with conflict due to onboarding state
@@ -494,7 +494,7 @@ Send PATCH Request for individual VNF Package Content
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -502,21 +502,21 @@ Send DELETE Request for individual VNF Package Content
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/package_content
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Individual VNF Package Artifact
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Individual VNF Package Artifact in octet stream format  
     Log    Trying to get a VNF Package Artifact
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageOctetStreamId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -525,7 +525,7 @@ GET Individual VNF Package Artifact with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -535,21 +535,21 @@ GET Individual VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
 GET Individual VNF Package Artifact with invalid resource identifier
     Log    Trying to perform a negative get, using an erroneous package ID
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${erroneousVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 GET Artifact for VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -557,7 +557,7 @@ Send POST Request for individual VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -565,7 +565,7 @@ Send PUT Request for individual VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -573,7 +573,7 @@ Send PATCH Request for individual VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -581,7 +581,7 @@ Send DELETE Request for individual VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/${artifactPath}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -591,7 +591,7 @@ Send POST Request to upload VNF Package Content from URI
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
     ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -601,7 +601,7 @@ Send POST Request to upload VNF Package Content from URI with conflict due to on
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${template}=    Get File    jsons/UploadVnfPkgFromUriRequest.json
     ${body}=        Format String   ${template}     vnfPkgUri=${vnfPkgUri}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPkgViaUriId}/package_content/upload_from_uri    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${creatingVnfPkgViaUriId}/package_content/upload_from_uri    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -609,7 +609,7 @@ Send GET Request for individual VNF Package Content from URI
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -617,7 +617,7 @@ Send PUT Request for individual VNF Package Content from URI
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -625,7 +625,7 @@ Send PATCH Request for individual VNF Package Content from URI
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -633,7 +633,7 @@ Send DELETE Request for individual VNF Package Content from URI
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgViaUriId}/package_content/upload_from_uri
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -641,7 +641,7 @@ Get all VNF Package Subscriptions
     Log    Trying to get the list of subscriptions
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -649,7 +649,7 @@ Get VNF Package Subscriptions with attribute-based filters
     Log    Trying to get the list of subscriptions using filters
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ok}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -657,7 +657,7 @@ Get VNF Package Subscriptions with invalid attribute-based filters
     Log    Trying to get the list of subscriptions using filters with wrong attribute name
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${filter_ko}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -665,7 +665,7 @@ Get VNF Package Subscriptions with invalid resource endpoint
     Log    Trying to perform a request on a Uri which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -676,7 +676,7 @@ Send Post Request for VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     Run Keyword If    ${NFVO_CHECKS_NOTIF_ENDPOINT} == 1
@@ -689,7 +689,7 @@ Send Post Request for Duplicated VNF Package Subscription
     ${template}=    Get File    jsons/subscriptions.json
     ${body}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}      vnfPkgId=${vnfPkgId}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -697,7 +697,7 @@ Send Put Request for VNF Package Subscriptions
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -705,7 +705,7 @@ Send Patch Request for VNF Package Subscriptions
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -713,7 +713,7 @@ Send Delete Request for VNF Package Subscriptions
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}    
 
@@ -732,9 +732,9 @@ Check Postcondition VNF Package Subscription Is Set
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     Run Keyword If    ${location} == Location
-    ...    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
+    ...    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}
     Run Keyword If    ${location} == Location
-    ...    GET    ${response['headers']['Location']}  
+    ...    REST.GET    ${response['headers']['Location']}  
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    200
@@ -742,7 +742,7 @@ Check Postcondition VNF Package Subscription Is Set
 Check Postcondition Subscription Resource Returned in Location Header Is Available
     Log    Going to check postcondition
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${response['headers']['Location']}
+    REST.GET    ${response['headers']['Location']}
     Integer    response status    200
     Log    Received a 200 OK as expected
     ${contentType}=    Output    response headers Content-Type
@@ -760,7 +760,7 @@ Get Individual VNF Package Subscription
     Log    Trying to get a single subscription identified by subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -768,7 +768,7 @@ GET individual VNF Package Subscription with invalid resource identifier
     Log    Trying to perform a request on a subscriptionID which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -776,7 +776,7 @@ Send Delete request for individual VNF Package Subscription
     Log    Trying to perform a DELETE on a subscriptionId
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -789,31 +789,31 @@ Send Delete request for individual VNF Package Subscription with invalid resourc
     Log    Trying to perform a DELETE on a subscriptionId which doesn't exist
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Post request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Put request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Send Patch request for individual VNF Package Subscription
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
    
@@ -829,7 +829,7 @@ Check Postcondition VNF Package Subscription is not Created
     Log    Trying to get a new subscription
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     Check HTTP Response Status Code Is    404
@@ -863,7 +863,7 @@ Check HTTP Response Body Subscription Identifier matches the requested Subscript
     Log    Subscription identifier as expected
 
 Check Notification Endpoint
-    &{notification_request}=  Create Mock Request Matcher	GET  ${callback_endpoint}    
+    &{notification_request}=  Create Mock Request Matcher	REST.GET  ${callback_endpoint}    
     &{headers} =	Create Dictionary	Content-Type=application/json
     &{notification_response}=  Create Mock Response	headers=${headers}  status_code=204
     Create Mock Expectation  ${notification_request}  ${notification_response}
@@ -892,7 +892,7 @@ Check HTTP Response Header Contains Location
 
 Get access configuration information for external artifacts
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -900,7 +900,7 @@ Send PUT Request to access configuration information for external artifacts
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
     ${body}=  Get File     jsons/ExternalArtifactsAccessConfig.json
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access    ${body}
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -914,7 +914,7 @@ Send POST Request for access configuration for external artifacts
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -922,7 +922,7 @@ Send PATCH Request for access configuration for external artifacts
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -930,14 +930,14 @@ Send DELETE Request for Access configuration for external artifacts
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/ext_artifacts_access
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Manifest in Individual VNF Package in plainFormat
         Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -945,14 +945,14 @@ Get Manifest in Individual VNF Package with security information
     Log    Trying to get a manifest from a given VNF Package present in the NFVO Catalogue
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Manifest in Individual VNF Package with unacceptable request
     Set Headers    {"Accept": "${ACCEPT_PLAIN}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -960,7 +960,7 @@ Send POST Request for manifest in individual VNF Package
     Log    Trying to perform a POST. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -968,7 +968,7 @@ Send PUT Request for manifest in individual VNF Package
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -976,7 +976,7 @@ Send PATCH Request for manifest in individual VNF Package
     Log    Trying to perform a PATCH. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
 
@@ -984,7 +984,7 @@ Send DELETE Request for manifest in individual VNF Package
     Log    Trying to perform a DELETE. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPkgId}/manifest
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output} 
     
@@ -992,7 +992,7 @@ Get Artifact in VNF Package
     Log    Trying to get Artifact in VNF Package
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1000,7 +1000,7 @@ Get Artifact in VNF Package with exclude_all_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with exclude_all_mano_artifacts
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1008,7 +1008,7 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1017,7 +1017,7 @@ Get Artifact in VNF Package with select_non_mano_artifact_sets parameter
     Pass Execution If    ${NFVO_non-MANO_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1025,7 +1025,7 @@ Get Artifact in VNF Package with include_signatures parameter
     Log    Trying to get Artifact in VNF Package with security certificates
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/include_signatures
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1034,7 +1034,7 @@ Get Artifact in VNF Package with Range Request
     Pass Execution If    ${NFVO_RANGE_OK} == 0    Skipping this test as NFVO is not able to handle partial Requests.
     Set Headers    {"Range": "${range}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1042,7 +1042,7 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and select_non_m
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&select_non_mano_artifact_sets=${non_mano_artifact_sets}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1050,14 +1050,14 @@ Get Artifact in VNF Package with exclude_all_non_mano_artifacts and exclude_all_
     Log    Trying to get Artifact in VNF Package 
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts/exclude_all_non_mano_artifacts&exclude_all_non_mano_artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 GET Artifact of VNF Package in onboarding state different from ONBOARDED
     Log    Trying to get a VNF Package artifact present in the NFVO Catalogue, but not in ONBOARDED operationalStatus
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${onboardingStateVnfPkgId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1067,7 +1067,7 @@ GET VNF Package Artifact with invalid Range Request
     Set Headers    {"Accept": "${ACCEPT_ZIP}"}
     Set Headers    {"Range": "${erroneousRange}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.GET    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
@@ -1075,7 +1075,7 @@ Send POST Request for VNF Package Artifact
     Log    Trying to perform a POST (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.POST    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1083,7 +1083,7 @@ Send PUT Request for VNF Package Artifact
     Log    Trying to perform a PUT (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
  
@@ -1091,7 +1091,7 @@ Send PATCH Request for VNF Package Artifact
     Log    Trying to perform a PATCH (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
@@ -1099,6 +1099,6 @@ Send DELETE Request for VNF Package Artifact
     Log    Trying to perform a DELETE (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
-    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
+    REST.DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_packages/${vnfPackageId}/artifacts
     ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
\ No newline at end of file
+    Set Suite Variable    ${response}    ${output}
diff --git a/requirements.txt b/requirements.txt
index d7793f4797794b44b56b184c25285afd670fe2fc..bafc102d3843316cb6cca0a589fffb5deb65e8f5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,11 @@
-###### List of required python libraries ######
 ## To install the libraries, use:
 # pip -r requirements.txt
 
 
-robotframework==3.2.2
+robotframework==3.1
 RESTinstance==1.0.0rc4
 robotframework-dependencylibrary==1.0.0.post1
 robotframework-jsonlibrary==0.3
 robotframework-jsonschemalibrary==1.0
-robotframework-mockserver==0.0.4
+robotframework-mockserver==0.0.7
 robotframework-requests==0.7.1
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 3aa85403141e1156b0e41463a80ba4b9060618a4..9f753df87329ee5f9811c52fab79cee8e0018b36 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -28,21 +28,13 @@ RUN DEBIAN_FRONTEND=noninteractive \
         && mkdir -p /home/etsi/dev/robot \
         && cd /home/etsi/dev/robot 
 
-RUN DEBIAN_FRONTEND=noninteractive \
-        && cd /home/etsi/dev/robot \
-	&& git clone https://github.com/etsi-cti-admin/robotframework-mockserver 
+#RUN pip3 install robotframework
 
 ADD requirements.txt /home/etsi/dev/robot/
 ADD extensions /home/etsi/dev/robot/extensions
 
 RUN ls /home/etsi/dev/robot
 
-RUN DEBIAN_FRONTEND=noninteractive \
-	&& cd /home/etsi/dev/robot \
-	&& pip3 install -r requirements.txt \
-	&& cd  robotframework-mockserver \
-	&& patch -p1 < ../extensions/mockserverlibrary.patch \
-	&& python3 -m pip install -e .
 
 RUN DEBIAN_FRONTED=noninteractive \
 	cd /home/etsi/dev/ \
@@ -52,6 +44,11 @@ RUN DEBIAN_FRONTED=noninteractive \
 	&& pip3 install -r requirements.txt \
 	&& python3 -m pip install -e .
 
+RUN DEBIAN_FRONTEND=noninteractive \
+	&& cd /home/etsi/dev/robot \
+	&& pip3 install -r requirements.txt
+
+
 ADD . /home/etsi/dev/robot
 
 RUN	chmod +x /home/etsi/dev/robot/scripts/*