Commit 3761d8d8 authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix on mixed usage of dictionaries and objects for the responses

parent d7db5d73

SOL002/VNFFaultManagement-API/Alarms.robot

+7 −7
Original line number Diff line number Diff line
@@ -154,28 +154,28 @@ POST Alarms Task 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	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}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	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}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	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}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}			

	Set Global Variable    ${response}    ${outputResponse}			

GET Alarms Task	

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -183,7 +183,7 @@ GET Alarms Task 
    Log    Execute Query and validate response

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

GET Alarms Task with filter

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -191,7 +191,7 @@ GET Alarms Task with filter 
    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	   	

	Set Global Variable    ${response}    ${outputResponse}	   	

GET Alarms Task with invalid filter

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -199,7 +199,7 @@ GET Alarms Task with invalid filter 
    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	

	Set Global Variable    ${response}    ${outputResponse}	

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}"}

SOL002/VNFFaultManagement-API/EscalatePerceivedSeverityTask.robot

+5 −5
Original line number Diff line number Diff line
@@ -80,31 +80,31 @@ POST escalate severity 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	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}"}

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate 

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	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}"}

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

     ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	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}"}

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

     ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	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}"}

    Delete    ${apiRoot}/${apiName}/${apiVersion}/alarms/${alarmId}/escalate  

     ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}

SOL002/VNFFaultManagement-API/IndividualAlarm.robot

+8 −8
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ POST Alarm Task 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

PUT Alarm Task

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -121,7 +121,7 @@ PUT Alarm Task 
    ${body}=    Get File    jsons/alarmModifications.json

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

PATCH Alarm Task

    log    Trying to perform a PATCH. This method modifies an individual alarm resource

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -131,7 +131,7 @@ PATCH Alarm Task 
    ${body}=    Get File    jsons/alarmModifications.json

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

PATCH Alarm Task with wrong precondition

    log    Trying to perform a PATCH. This method modifies an individual alarm resource

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -140,14 +140,14 @@ PATCH Alarm Task with wrong precondition 
    ${body}=    Get File    jsons/alarmModifications.json

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	

	Set Global Variable    ${response}    ${outputResponse}	

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}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}			

	Set Global Variable    ${response}    ${outputResponse}			

GET Alarm Task	

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -157,7 +157,7 @@ GET Alarm Task 
    ${etag}    Output    response headers ETag

    Set Suite Variable    &{original_etag}    ${etag}

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}

	Set Global Variable    ${response}    ${outputResponse}

GET Alarm Task with filter

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -165,7 +165,7 @@ GET Alarm Task with filter 
    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	

	Set Global Variable    ${response}    ${outputResponse}	

GET Alarm Task with invalid filter

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -173,7 +173,7 @@ GET Alarm Task with invalid filter 
    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/alarms?${invalid_alarm_filter}=${managedObjectId} 

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	

	Set Global Variable    ${response}    ${outputResponse}	

Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}    

    Should Be Equal As Strings    ${response['status']}    ${expected_status}

SOL002/VNFFaultManagement-API/IndividualSubscription.robot

+7 −7
Original line number Diff line number Diff line
@@ -84,35 +84,35 @@ Post Create individual subscription 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}  

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}				

	Set Global Variable    ${response}    ${outputResponse}				

Get individual subscription

    log    Trying to get information about an individual subscription

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

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

    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	

	Set Global Variable    ${response}    ${outputResponse}	

Get individual subscription - filter

    Log    Get the list of active individual subscription using a filter

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

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}		

	Set Global Variable    ${response}    ${outputResponse}		

Get individual subscription - invalid filter  

    Log    Get the list of active individual subscription using an invalid filter

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

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}		

	Set Global Variable    ${response}    ${outputResponse}		

PUT individual subscription

    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}"}

    Put    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}        

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	

	Set Global Variable    ${response}    ${outputResponse}	

PATCH individual subscription

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

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -120,14 +120,14 @@ PATCH individual subscription 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId} 

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}		

	Set Global Variable    ${response}    ${outputResponse}		

DELETE individual subscription

    log    Try to delete an individual subscription

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

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

    Delete    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${subscriptionId}    	   

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	      

	Set Global Variable    ${response}    ${outputResponse}	      

	

Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}

SOL002/VNFFaultManagement-API/Subscriptions.robot

+9 −9
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ Post Create subscription 
    ${body}=    Get File    jsons/fmSubscriptionRequest.json

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}				

	Set Global Variable    ${response}    ${outputResponse}				

Post Create subscription - DUPLICATION

    Log    Trying to create a subscription with an already created content

    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 0    NVFO is not permitting duplication. Skipping the test
@@ -192,7 +192,7 @@ Post Create subscription - DUPLICATION 
    ${body}=    Get File    jsons/fmSubscriptionRequest.json

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}		

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}			

	Set Global Variable    ${response}    ${outputResponse}			

Post Create subscription - NO-DUPLICATION	

    Log    Trying to create a subscription with an already created content

    Pass Execution If    ${VNFM_ALLOWS_DUPLICATE_SUBS} == 1    VNFM permits duplication. Skipping the test
@@ -202,7 +202,7 @@ Post Create subscription - NO-DUPLICATION 
    ${body}=    Get File    jsons/fmSubscriptionRequest.json

    Post    ${apiRoot}/${apiName}/${apiVersion}/subscriptions    ${body}

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}		

	Set Global Variable    ${response}    ${outputResponse}		

Get subscriptions

    Log    Get the list of active subscriptions

    Set Headers  {"Accept":"${ACCEPT}"}
@@ -211,21 +211,21 @@ Get subscriptions 
    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiVersion}/subscriptions	

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	

	Set Global Variable    ${response}    ${outputResponse}	

Get subscriptions - filter

    Log    Get the list of active subscriptions using a filter

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

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter}

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}		

	Set Global Variable    ${response}    ${outputResponse}		

Get subscriptions - invalid filter  

    Log    Get the list of active subscriptions using an invalid filter

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

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

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions?${sub_filter_invalid}

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}		

	Set Global Variable    ${response}    ${outputResponse}		

Get subscriptions with all_fields attribute selector

    Log    Get the list of active subscriptions, using fields

    Set Headers    {"Accept": "${ACCEPT_JSON}"}
@@ -260,21 +260,21 @@ PUT subscriptions 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	

	Set Global Variable    ${response}    ${outputResponse}	

PATCH subscriptions

    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}"}

    Patch    ${apiRoot}/${apiName}/${apiVersion}/subscriptions     

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}		

	Set Global Variable    ${response}    ${outputResponse}		

DELETE subscriptions

    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}"}

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

    ${outputResponse}=    Output    response

	Set Global Variable    @{response}    ${outputResponse}	  

	Set Global Variable    ${response}    ${outputResponse}	  



Check HTTP Response Status Code Is

    [Arguments]    ${expected_status}