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

updated authorization header and token use in SOL002 v2.4.1

parent fb9a409b

SOL002/VNFConfiguration-API/Configuration.robot

+6 −6
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ Get VNF configuration 
    Log    Query VNF The GET method queries information about a configuration.

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

    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

    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}/${apiVersion}/configuration

    ${output}=    Output    response
@@ -118,7 +118,7 @@ Send VNF configuration 
    log    Trying to perform a PATCH. This method modifies the configuration    

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

    Set Headers  {"Content-Type": "${CONTENT_TYPE}"} 

    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/vnfConfigModifications.json

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

    ${output}=    Output    response
@@ -164,7 +164,7 @@ Send Duplicated VNF configuration 
    Set Headers  {"Accept":"${ACCEPT}"}

    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

    Set Headers    {"If-Match": "${etag}"}

    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/vnfConfigModifications.json

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

    ${output}=    Output    response
@@ -173,7 +173,7 @@ Send Duplicated VNF configuration 
Send POST Request for VNF Configuration

    log    Trying to perform a POST. This method should not be implemented

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -181,7 +181,7 @@ Send POST Request for VNF Configuration 
Send PUT Request for VNF Configuration

    log    Trying to perform a POST. This method should not be implemented

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}
@@ -189,7 +189,7 @@ Send PUT Request for VNF Configuration 
Send DELETE Request for VNF Configuration

    log    Trying to perform a POST. This method should not be implemented

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${output}=    Output    response

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

SOL002/VNFConfiguration-API/environment/variables.txt

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ ${EM-VNF_SCHEMA} https 


${ACCEPT}         application/json

${AUTH_USAGE}     1

${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==



${AUTHORIZATION_HEADER}    Authorization

${AUTHORIZATION_TOKEN}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==

${CONTENT_TYPE}    application/json



${apiRoot}        /

SOL002/VNFFaultManagement-API/Alarms.robot

+11 −11
Original line number Diff line number Diff line
@@ -151,35 +151,35 @@ DELETE Alarms - Method not implemented 
POST Alarms Task

    log    Trying to perform a POST. This method should not be implemented

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

PUT Alarms Task

    log    Trying to perform a PUT. This method should not be implemented

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

    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}/${apiVersion}/alarms

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

PATCH Alarms Task

    log    Trying to perform a PATCH. This method should not be implemented

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

    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}/${apiVersion}/alarms

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

DELETE Alarms Task

    log    Trying to perform a DELETE. This method should not be implemented

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

    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}/${apiVersion}/alarms

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}			

GET Alarms Task	

	Log    Query VNF The GET method queries information about multiple alarms.

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

    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}/${apiVersion}/alarms

    ${outputResponse}=    Output    response
@@ -187,7 +187,7 @@ GET Alarms Task 
GET Alarms Task with filter

	Log    Query VNF The GET method queries information about multiple alarms with filters.

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

    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}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response
@@ -195,7 +195,7 @@ GET Alarms Task with filter 
GET Alarms Task with invalid filter

	Log    Query VNF The GET method queries information about multiple alarms with filters.

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

    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}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response
@@ -203,28 +203,28 @@ GET Alarms Task with invalid filter 
GET Alarms Task with all_fields attribute selector

    Log    Query VNF The GET method queries information about multiple alarms, 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}/${apiVersion}/alarms?exclude_default

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

GET Alarms Task with exclude_default attribute selector

    Log    Query VNF The GET method queries information about multiple alarms, 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}/${apiVersion}/alarms?exclude_default

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

GET Alarms Task with fields attribute selector

    Log    Query VNF The GET method queries information about multiple alarms, 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}/${apiVersion}/alarms?fields=${fields}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}	

GET Alarms Task with exclude_fields attribute selector

    Log    Query VNF The GET method queries information about multiple alarms, 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}/${apiVersion}/alarms?exclude_fields=${fields}

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot

+6 −6
Original line number Diff line number Diff line
@@ -70,38 +70,38 @@ DELETE Escalate the perceived severity - Method not implemented 
Check resource existence

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

    Set Headers    {"Content-Type": "${CONTENT_TYPE}"}

    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}/${apiVersion}/alarms/${alarmId}

    Integer    response status    200

POST escalate severity

    Log    escalate the perceived severity of an alarm with the VNFM

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

    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

    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}/${apiVersion}/alarms/${alarmId}/escalate    ${PerceivedSeverity}

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

GET escalate severity

    log    Trying to perform a GET. This method should not be implemented

    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}/${apiVersion}/alarms/${alarmId}/escalate 

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

PUT escalate severity	

	log    Trying to perform a PUT. This method should not be implemented

    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}/${apiVersion}/alarms/${alarmId}/escalate    

     ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

PATCH escalate severity

    log    Trying to perform a PATCH. This method should not be implemented

    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}/${apiVersion}/alarms/${alarmId}/escalate  

     ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

DELETE escalate severity        

    log    Trying to perform a DELETE. This method should not be implemented

    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}/${apiVersion}/alarms/${alarmId}/escalate  

     ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

SOL002/VNFFaultManagement-API/IndividualAlarm.robot

+8 −8
Original line number Diff line number Diff line
@@ -110,14 +110,14 @@ DELETE Alarm - Method not implemented 
POST Alarm Task

    log    Trying to perform a POST. This method should not be implemented

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

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

    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}

    Post    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

PUT Alarm Task

    log    Trying to perform a PUT. This method should not be implemented

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

    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/alarmModifications.json

    Put    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}     ${body}

    ${outputResponse}=    Output    response
@@ -127,7 +127,7 @@ PATCH Alarm Task 
    Set Headers  {"Accept":"${ACCEPT}"} 

    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}

    Set Headers  {"If-Match": "${original_etag[0]}"}

    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/alarmModifications.json

    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}

    ${outputResponse}=    Output    response
@@ -136,7 +136,7 @@ PATCH Alarm Task with wrong precondition 
    log    Trying to perform a PATCH. This method modifies an individual alarm resource

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

    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/alarmModifications.json

    Patch    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}    ${body}

    ${outputResponse}=    Output    response
@@ -144,14 +144,14 @@ PATCH Alarm Task with wrong precondition 
DELETE Alarm Task

    log    Trying to perform a DELETE. This method should not be implemented

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

    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}/${apiVersion}/alarms/${alarmId}

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}			

GET Alarm Task	

	Log    Query VNF The GET method queries information about individual alarm.

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

    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}/${apiVersion}/alarms/${alarmId}

    ${etag}    Output    response headers ETag
@@ -161,7 +161,7 @@ GET Alarm Task 
GET Alarm Task with filter

	Log    Query VNF The GET method queries information about individual alarm with filters.

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

    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}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response
@@ -169,7 +169,7 @@ GET Alarm Task with filter 
GET Alarm Task with invalid filter

	Log    Query VNF The GET method queries information about individual alarm with filters.

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

    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}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response