From a9091851991cba9d8ffac157cd1130b42890b5c8 Mon Sep 17 00:00:00 2001
From: "M. Rehan Abbasi" <mrehanabbasi@yahoo.com>
Date: Tue, 19 Oct 2021 11:10:40 +0500
Subject: [PATCH] comment out unused variabes from CIM API variables.txt file

---
 .../NFVMANOCimKeywords.robot                  | 164 +++++++++---------
 .../environment/variables.txt                 |  16 +-
 2 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot
index a8865879..c7761789 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/NFVMANOCimKeywords.robot
@@ -33,7 +33,7 @@ Check HTTP Response Body Json Schema Is
 Send Post request for NFV-MANO Entity
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -41,7 +41,7 @@ Send Post request for NFV-MANO Entity
 GET NFV-MANO entity resource
     Log    Trying to get a NFV-MANO entity resource 
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -49,7 +49,7 @@ GET NFV-MANO entity resource
 Send Put request for NFV-MANO Entity  
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/log_jobs/mano_entity
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -61,7 +61,7 @@ Send Patch request for NFV-MANO Entity
     log    Trying to modify an NFV-MANO Entity
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/ManoConfigModificationRequest.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity   ${body}	
     ${outputResponse}=    Output    response
@@ -70,7 +70,7 @@ Send Patch request for NFV-MANO Entity
 Send Delete request for NFV-MANO Entity
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -78,7 +78,7 @@ Send Delete request for NFV-MANO Entity
 Send Post request for NFV-MANO functional entity application state change
     Log    Trying to perform a POST for NFV-MANO functional entity application state change
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/ChangeStateRequest.json
     ${body}=        Format String   ${template}    state=${state}     stateAction=${stateAction} 
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/change_state
@@ -90,7 +90,7 @@ Wait for entity state change success notification and validate status
     
 Check entity state
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${response['headers']['Location']}
     Log    Validate Status code
     Integer    response status    200
@@ -101,7 +101,7 @@ Check entity state
 Send Get request for NFV-MANO functional entity application state change
     Log    Trying to perform a GET (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/change_state
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -109,7 +109,7 @@ Send Get request for NFV-MANO functional entity application state change
 Send Put request for NFV-MANO functional entity application state change
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/log_jobs/mano_entity/change_state
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -120,7 +120,7 @@ Send Put request for NFV-MANO functional entity application state change
 Send Patch request for NFV-MANO functional entity application state change
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/change_state
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -128,7 +128,7 @@ Send Patch request for NFV-MANO functional entity application state change
 Send Delete request for NFV-MANO functional entity application state change
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/change_state
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -136,7 +136,7 @@ Send Delete request for NFV-MANO functional entity application state change
 Send Post request for Change State Operation Occurrences
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -144,7 +144,7 @@ Send Post request for Change State Operation Occurrences
 Get Change State Operation Occurrences
     Log    Query to GET information about multiple change state operation occurrences.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops
     ${outputResponse}=    Output    response
@@ -152,7 +152,7 @@ Get Change State Operation Occurrences
 	
 Get Change State Operation Occurrences with invalid filter
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops?attribute_not_exist=some_value
     ${outputResponse}=    Output    response
@@ -160,7 +160,7 @@ Get Change State Operation Occurrences with invalid filter
 	
 Get Change State Operation Occurrences with invalid selector
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops?fields=wrong_field
     ${outputResponse}=    Output    response
@@ -169,7 +169,7 @@ Get Change State Operation Occurrences with invalid selector
 Get Change State Operation Occurrences with filter
     Log    Query  information about multiple change state operation occurrences with attribute filters.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops?${filter}=${filter_value} 
     ${outputResponse}=    Output    response
@@ -178,7 +178,7 @@ Get Change State Operation Occurrences with filter
 Get Change State Operation Occurrences with all_fields attribute selector
     Log    Queries information about multiple change state operation occurrences, using all_fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -186,7 +186,7 @@ Get Change State Operation Occurrences with all_fields attribute selector
 Get Change State Operation Occurrences with fields attribute selector
     Log    Queries information about multiple change state operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -194,7 +194,7 @@ Get Change State Operation Occurrences with fields attribute selector
 Get Change State Operation Occurrences with exclude_default attribute selector
     Log    Queries information about multiple change state operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -202,7 +202,7 @@ Get Change State Operation Occurrences with exclude_default attribute selector
 Get Change State Operation Occurrences with exclude_fields attribute selector
     Log    Queries information about multiple change state operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -210,7 +210,7 @@ Get Change State Operation Occurrences with exclude_fields attribute selector
 Get Change State Operation Occurrences with fields and exclude_default attribute selector
     Log    Queries information about multiple change state operation occurrences, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops?exclude_default&fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -222,7 +222,7 @@ Check HTTP Response Header Contains Link
 Send PUT request for Change State Operation Occurrences
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -230,7 +230,7 @@ Send PUT request for Change State Operation Occurrences
 Send PATCH request for Change State Operation Occurrences
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -238,7 +238,7 @@ Send PATCH request for Change State Operation Occurrences
 Send DELETE request for Change State Operation Occurrences
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -246,7 +246,7 @@ Send DELETE request for Change State Operation Occurrences
 Send Post request for Individual Change State Operation Occurrence
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops/${changeStateOpOccId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -254,7 +254,7 @@ Send Post request for Individual Change State Operation Occurrence
 Get Individual Change State Operation Occurrence
     Log    Query to GET information about individual change state operation occurrences.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops/${changeStateOpOccId}
     ${outputResponse}=    Output    response
@@ -263,7 +263,7 @@ Get Individual Change State Operation Occurrence
 Send Put request for Individual Change State Operation Occurrence
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops/${changeStateOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -271,7 +271,7 @@ Send Put request for Individual Change State Operation Occurrence
 Send Patch request for Individual Change State Operation Occurrence
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops/${changeStateOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -279,7 +279,7 @@ Send Patch request for Individual Change State Operation Occurrence
 Send Delete request for Individual Change State Operation Occurrence
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/change_state_ops/${changeStateOpOccId}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -287,7 +287,7 @@ Send Delete request for Individual Change State Operation Occurrence
 Send Post request for NFV-MANO Service Interfaces
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -295,7 +295,7 @@ Send Post request for NFV-MANO Service Interfaces
 Get NFV-MANO Service Interfaces
     Log    Query to GET information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces
     ${outputResponse}=    Output    response
@@ -303,7 +303,7 @@ Get NFV-MANO Service Interfaces
 	
 Get NFV-MANO Service Interfaces with invalid filter
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces?attribute_not_exist=some_value
     ${outputResponse}=    Output    response
@@ -311,7 +311,7 @@ Get NFV-MANO Service Interfaces with invalid filter
 	
 Get NFV-MANO Service Interfaces with invalid selector
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces?fields=wrong_field
     ${outputResponse}=    Output    response
@@ -320,7 +320,7 @@ Get NFV-MANO Service Interfaces with invalid selector
 Get NFV-MANO Service Interfaces with filter
     Log    Query  information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity with attribute filters.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces?${filter}=${filter_value} 
     ${outputResponse}=    Output    response
@@ -329,7 +329,7 @@ Get NFV-MANO Service Interfaces with filter
 Get NFV-MANO Service Interfaces with all_fields attribute selector
     Log    Queries information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity, using all_fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -337,7 +337,7 @@ Get NFV-MANO Service Interfaces with all_fields attribute selector
 Get NFV-MANO Service Interfaces with exclude_default and fields attribute selector
     Log    Queries information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity, using all_fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces?exclude_default&fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -345,7 +345,7 @@ Get NFV-MANO Service Interfaces with exclude_default and fields attribute select
 Get NFV-MANO Service Interfaces with fields attribute selector
     Log    Queries information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -353,7 +353,7 @@ Get NFV-MANO Service Interfaces with fields attribute selector
 Get NFV-MANO Service Interfaces with exclude_fields attribute selector
     Log    Queries information about multiple NFV-MANO service interfaces of the NFV-MANO functional entity, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -361,7 +361,7 @@ Get NFV-MANO Service Interfaces with exclude_fields attribute selector
 Send PUT request for NFV-MANO Service Interfaces
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -369,7 +369,7 @@ Send PUT request for NFV-MANO Service Interfaces
 Send PATCH request for NFV-MANO Service Interfaces
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -377,7 +377,7 @@ Send PATCH request for NFV-MANO Service Interfaces
 Send DELETE request for NFV-MANO Service Interfaces
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -385,14 +385,14 @@ Send DELETE request for NFV-MANO Service Interfaces
 Send Post request for Individual NFV-MANO Service Interface
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces/${manoServiceInterfaceId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Individual NFV-MANO Service Interface
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces/${manoServiceInterfaceId}
     ${outputResponse}=    Output    response
@@ -401,7 +401,7 @@ Get Individual NFV-MANO Service Interface
 Send Put request for Individual NFV-MANO Service Interface
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces/${manoServiceInterfaceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -410,7 +410,7 @@ Send Patch request for Individual NFV-MANO Service Interface
     log    Trying to modify an NFV-MANO Entity
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/ManoServiceInterfaceModificationRequest.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces/${manoServiceInterfaceId}   ${body}	
     ${outputResponse}=    Output    response
@@ -419,7 +419,7 @@ Send Patch request for Individual NFV-MANO Service Interface
 Send Delete request for Individual NFV-MANO Service Interface
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces/${manoServiceInterfaceId}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -427,7 +427,7 @@ Send Delete request for Individual NFV-MANO Service Interface
 Send Post request for Change interface state task
     Log    Trying to perform a POST for Change interface state task
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}   
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}   
     ${template}=    Get File    jsons/ChangeStateRequest.json
     ${body}=        Format String   ${template}    state=${state}     stateAction=${stateAction}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces/${manoServiceInterfaceId}/change_state    ${body}
@@ -439,7 +439,7 @@ Check PostCondition NFV-MANO service interface state matches the requested state
     
 Check interface state
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Get    ${response['headers']['Location']}
     Log    Validate Status code
     Integer    response status    200
@@ -450,7 +450,7 @@ Check interface state
 Send Get request for Change interface state task
     Log    Trying to perform a GET (method should not be implemented)
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces/${manoServiceInterfaceId}/change_state
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -458,7 +458,7 @@ Send Get request for Change interface state task
 Send Put request for Change interface state task
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces/${manoServiceInterfaceId}/change_state
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -469,7 +469,7 @@ Send Put request for Change interface state task
 Send Patch request for Change interface state task
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/mano_entity/mano_interfaces/${manoServiceInterfaceId}/change_state
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -477,7 +477,7 @@ Send Patch request for Change interface state task
 Send Delete request for Change interface state task
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}//mano_entity/mano_interfaces/${manoServiceInterfaceId}/change_state
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -485,7 +485,7 @@ Send Delete request for Change interface state task
 Send Post request for Peer Entity
     Log    Trying to perform a POST for Peer Entity
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}  
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}  
     ${template}=    Get File    jsons/CreatePeerEntityRequest.json
     ${body}=        Format String   ${template}     peerEntityId=${peerEntityId}    name=${name}    type=${type}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities    ${body}
@@ -495,7 +495,7 @@ Send Post request for Peer Entity
 Get Peer Entities
     Log    Query to GET information about multiple peer entities.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities
     ${outputResponse}=    Output    response
@@ -503,7 +503,7 @@ Get Peer Entities
 	
 Get Peer Entities with invalid filter
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities?attribute_not_exist=some_value
     ${outputResponse}=    Output    response
@@ -511,7 +511,7 @@ Get Peer Entities with invalid filter
 	
 Get Peer Entities with invalid selector
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities?fields=wrong_field
     ${outputResponse}=    Output    response
@@ -520,7 +520,7 @@ Get Peer Entities with invalid selector
 Get Peer Entities with filter
     Log    Query  information about multiple peer entities with attribute filters.
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities?${filter}=${filter_value} 
     ${outputResponse}=    Output    response
@@ -529,7 +529,7 @@ Get Peer Entities with filter
 Get Peer Entities with all_fields attribute selector
     Log    Queries information about multiple peer entities, using all_fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities?exclude_default
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -537,7 +537,7 @@ Get Peer Entities with all_fields attribute selector
 Get Peer Entities with fields attribute selector
     Log    Queries information about multiple peer entities, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities?fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -545,7 +545,7 @@ Get Peer Entities with fields attribute selector
 Get Peer Entity with exclude_default and fields attribute selector
     Log    Queries information about multiple peer entities, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities?exclude_default&fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -553,7 +553,7 @@ Get Peer Entity with exclude_default and fields attribute selector
 Get Peer Entities with exclude_fields attribute selector
     Log    Queries information about multiple peer entities, using fields
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities?exclude_fields=${fields}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -561,7 +561,7 @@ Get Peer Entities with exclude_fields attribute selector
 Send PUT request for Peer Entities
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -569,7 +569,7 @@ Send PUT request for Peer Entities
 Send PATCH request for Peer Entities
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -577,7 +577,7 @@ Send PATCH request for Peer Entities
 Send DELETE request for Peer Entities
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -585,14 +585,14 @@ Send DELETE request for Peer Entities
 Send Post request for Individual Peer Entity
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities/${peerEntityId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Individual Peer Entity
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities/${peerEntityId}
     ${outputResponse}=    Output    response
@@ -601,7 +601,7 @@ Get Individual Peer Entity
 Send Put request for Individual Peer Entity
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Put    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities/${peerEntityId}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -610,7 +610,7 @@ Send Patch request for Individual Peer Entity
     log    Trying to modify an NFV-MANO Entity
     Set Headers    {"Accept":"${ACCEPT_JSON}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${body}=    Get File    jsons/PeerEntityConfigModificationRequest.json
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities/${peerEntityId}   ${body}	
     ${outputResponse}=    Output    response
@@ -619,7 +619,7 @@ Send Patch request for Individual Peer Entity
 Send Delete request for Individual Peer Entity
     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}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities/${peerEntityId}
     ${outputResponse}=    Output    response
 	Set Global Variable    @{response}    ${outputResponse}
@@ -706,7 +706,7 @@ Check Postcondition Subscription Is Set
 Send Post Request for Duplicated Subscription
     Set headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template}=    Get File    jsons/CimSubscriptionRequest.json
     ${body_request}=        Format String   ${template}     callback_uri=${callback_uri}    callback_endpoint=${callback_endpoint}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body_request}    allow_redirects=false
@@ -735,7 +735,7 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab
 Send Put Request for Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the NFV-MANO shall return a "405 Method
     ...    Not Allowed" response as defined in clause 4.3.5.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -743,7 +743,7 @@ Send Put Request for Subscriptions
 Send Patch Request for Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the NFV-MANO shall return a "405 Method
     ...    Not Allowed" response as defined in clause 4.3.5.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -751,14 +751,14 @@ Send Patch Request for Subscriptions
 Send Delete Request for Subscriptions
     [Documentation]    This method is not supported. When this method is requested on this resource, the NFV-MANO shall return a "405 Method
     ...    Not Allowed" response as defined in clause 4.3.5.4.
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
     
 Get Individual Subscription
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -770,14 +770,14 @@ Check HTTP Response Body Subscription Identifier matches the requested Subscript
     
 GET individual Subscription with invalid resource identifier
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
 Send Delete request for individual Subscription
     Set headers    {"Accept": "${ACCEPT_JSON}"}
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
@@ -789,19 +789,19 @@ Check Postcondition Subscription is Deleted
 
 Send Delete request for individual Subscription with invalid resource identifier
     Log    Trying to delete a subscription in the VNFM with invalid id
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    @{response}    ${output}
     
 Send Post request for individual Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${newSubscriptionId}
     ${output}=    Output    response
     Set Suite Variable    @{response}    ${output}
 
 Send Put request for individual Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -810,7 +810,7 @@ Send Put request for individual Subscription
     Set Suite Variable    @{response}    ${output}
     
 Send Patch request for individual Subscription
-    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
@@ -834,7 +834,7 @@ GET Peer Entities with malformed authorization token
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as NFVO is not supporting authentication
     Log    The GET method queries using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}": "${BAD_AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities
     ${output}=    Output    response
@@ -853,7 +853,7 @@ GET Peer Entities with expired or revoked authorization token
     Pass Execution If    ${AUTH_USAGE} == 0    Skipping test as it is not supporting authentication
     Log    The GET method queries  using invalid token
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
-    Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}
+    Set Headers    {"${AUTHORIZATION_HEADER}": "${NEG_AUTHORIZATION_TOKEN}"}
     Log    Execute Query and validate response
     Get    ${apiRoot}/${apiName}/${apiMajorVersion}/peer_entities
     ${output}=    Output    response
diff --git a/SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt b/SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt
index b86b897a..887bff0d 100644
--- a/SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt
+++ b/SOL009/NFVManoConfigurationAndInformationManagement-API/environment/variables.txt
@@ -3,19 +3,19 @@ ${NFVMANOHOST}      localhost
 ${NFVMANO_PORT}      8080    
 ${NFVMANO_SCHEMA}    https
 
-${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
-${NEG_AUTHORIZATION}    Bearer negativetoken
-${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
-${BAD_AUTHORIZATION}    Bear sometoken
+${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
+${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken
+#${WRONG_AUTHORIZATION_TOKEN}    Bearer    XXXXXWRONGXXXXX
+${BAD_AUTHORIZATION_TOKEN}    Bear sometoken
 
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${AUTH_USAGE}     1
-${FIELD_USAGE}    1
+#${FIELD_USAGE}    1
 ${NFVMANO_CHECKS_NOTIF_ENDPOINT}    1        ## If true, during subscription, the FUT performs a get to the notification endpoint
 
-${NFVMANO_ALLOWS_DUPLICATE_SUBS}    1
+#${NFVMANO_ALLOWS_DUPLICATE_SUBS}    1
 
 ${apiRoot}        /
 ${apiMajorVersion}     v2
@@ -41,8 +41,8 @@ ${callback_endpoint}    /subscriptions
 ${filter_ok}      callbackUri=${callbackUri}
 ${filter_ko}      erroneousFilter=erroneous
 ${callback_endpoint_fwd}    /endpoint/check
-${callback_endpoint_error}    /subs_404
-${sleep_interval}    20s
+#${callback_endpoint_error}    /subs_404
+#${sleep_interval}    20s
 
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec
-- 
GitLab