Commit ba41f1dc authored by Najam UI Hassan's avatar Najam UI Hassan
Browse files

Revert "added majorApiVersion" 

This reverts commit a61a6b84.
parent a61a6b84

SOL002/VNFIndicator-API/ApiVersion.robot

+5 −5
Original line number Original line Diff line number Diff line
@@ -169,35 +169,35 @@ DELETE API Version 
POST API Version with apiMajorVersion

POST API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_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":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    Post    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

GET API Version with apiMajorVersion

GET API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_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":"${AUTHORIZATION}"}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    Get    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

PUT API Version with apiMajorVersion

PUT API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_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":"${AUTHORIZATION}"}

    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    Put    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

PATCH API Version with apiMajorVersion

PATCH API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_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":"${AUTHORIZATION}"}

    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    Patch    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse} 

	

	

DELETE API Version with apiMajorVersion

DELETE API Version with apiMajorVersion

    Set Headers    {"Accept":"${ACCEPT_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":"${AUTHORIZATION}"}

    Delete    ${apiRoot}/${apiName}/${apiMajorVersion}/api_version

    Delete    ${apiRoot}/${apiName}/v1/api_version

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse}

SOL002/VNFIndicator-API/IndividualSubscription.robot

+9 −9
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ Get Individual VNF Indicator Subscription 
    Log    Trying to get a given subscription identified by subscriptionId

    Log    Trying to get a given subscription identified by subscriptionId

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -110,7 +110,7 @@ GET Individual VNF Indicator Subscription with invalid resource identifier 
    Log    Trying to perform a request on a subscriptionID which doesn't exist

    Log    Trying to perform a request on a subscriptionID which doesn't exist

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -118,7 +118,7 @@ Send Delete Request for Individual VNF Indicator Subscription 
    Log    Trying to perform a DELETE on a subscriptionId

    Log    Trying to perform a DELETE on a subscriptionId

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -126,14 +126,14 @@ Send Delete Request for Individual VNF Indicator Subscription with invalid resou 
    Log    Trying to perform a DELETE on a subscriptionId which doesn't exist

    Log    Trying to perform a DELETE on a subscriptionId which doesn't exist

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}

    DELETE    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}

    

    

Send Post Request for Individual VNF Indicator Subscription

Send Post Request for Individual VNF Indicator Subscription

    Log    Trying to create a new subscription

    Log    Trying to create a new subscription

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

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

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${erroneousSubscriptionId}

    POST    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${erroneousSubscriptionId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}   

    Set Suite Variable    ${response}    ${output}
@@ -141,20 +141,20 @@ Send Put Request for Individual VNF Indicator Subscription 
    Log    Trying to perform a PUT. This method should not be implemented

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

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

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

    ${origOutput}=    Output    response

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    Set Suite Variable    ${origResponse}    ${origOutput}

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}   

    Set Suite Variable    ${response}    ${output}   





Send Patch Request for Individual VNF Indicator Subscription

Send Patch Request for Individual VNF Indicator Subscription

    Log    Trying to create a new subscription

    Log    Trying to create a new subscription

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

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

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

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

    ${origOutput}=    Output    response

    ${origOutput}=    Output    response

    Set Suite Variable    ${origResponse}    ${origOutput}

    Set Suite Variable    ${origResponse}    ${origOutput}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${subscriptionId}

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}

SOL002/VNFIndicator-API/IndividualVNFindicator.robot

+13 −13
Original line number Original line Diff line number Diff line
@@ -163,7 +163,7 @@ Get Individual Indicator for a VNF instance 
    Log    This resource represents a VNF indicator related to a VNF instance.

    Log    This resource represents a VNF indicator related to a VNF instance.

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -171,7 +171,7 @@ Get Individual Indicator for a VNF instance with invalid indicator identifier 
    Log    Trying to perform a negative get, using wrong identifier

    Log    Trying to perform a negative get, using wrong identifier

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${erroneousIndicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -179,7 +179,7 @@ Send POST Request for individual indicator in VNF instance 
    Log    Trying to perform a POST (method should not be implemented)

    Log    Trying to perform a POST (method should not be implemented)

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}

    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -187,7 +187,7 @@ Send PUT Request for individual indicator in VNF instance 
    Log    Trying to perform a PUT. This method should not be implemented

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

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -195,7 +195,7 @@ Send PATCH Request for individual indicator in VNF instance 
    Log    Trying to perform a PATCH. This method should not be implemented

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

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}

    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output} 

    Set Suite Variable    ${response}    ${output}
@@ -203,7 +203,7 @@ Send DELETE Request for individual indicator in VNF instance 
    Log    Trying to perform a DELETE. This method should not be implemented

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

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}

    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output} 

    Set Suite Variable    ${response}    ${output}
@@ -244,7 +244,7 @@ Get Individual Indicator 
    Log    This resource represents a VNF indicator related to a VNF instance.

    Log    This resource represents a VNF indicator related to a VNF instance.

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -252,7 +252,7 @@ Get Individual Indicator with invalid indicator identifier 
    Log    Trying to perform a negative get, using wrong identifier

    Log    Trying to perform a negative get, using wrong identifier

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${erroneousIndicatorId}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${erroneousIndicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -260,7 +260,7 @@ Send POST Request for individual indicator 
    Log    Trying to perform a POST (method should not be implemented)

    Log    Trying to perform a POST (method should not be implemented)

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}

    POST    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${notAllowedIndicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -268,7 +268,7 @@ Send PUT Request for individual indicator 
    Log    Trying to perform a PUT. This method should not be implemented

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

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}

    PUT    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -276,7 +276,7 @@ Send PATCH Request for individual indicator 
    Log    Trying to perform a PATCH. This method should not be implemented

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

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}

    PATCH    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -284,7 +284,7 @@ Send DELETE Request for individual indicator 
    Log    Trying to perform a DELETE. This method should not be implemented

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

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${indicatorId}

    DELETE    ${apiRoot}/${apiName}/${apiVersion}/indicators/${indicatorId}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output} 

    Set Suite Variable    ${response}    ${output}
@@ -292,5 +292,5 @@ Check PostCondition Individual Indicator exist 
    Log    This resource represents a VNF indicator related to a VNF instance.

    Log    This resource represents a VNF indicator related to a VNF instance.

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators/${vnfInstanceId}/${indicatorId}

    GET    ${apiRoot}/${apiName}/${apiVersion}/indicators/${vnfInstanceId}/${indicatorId}

    Integer    response status    200	
    Integer    response status    200	
 No newline at end of file

SOL002/VNFIndicator-API/Subscriptions.robot

+9 −9
Original line number Original line Diff line number Diff line
@@ -146,7 +146,7 @@ Get VNF Indicators Subscriptions 
    Log    Trying to get the list of subscriptions

    Log    Trying to get the list of subscriptions

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -154,7 +154,7 @@ Get VNF Indicators Subscriptions with filter 
    Log    Trying to get the list of subscriptions using filters

    Log    Trying to get the list of subscriptions using filters

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${POS_FILTER}

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -162,7 +162,7 @@ Get VNF Indicators Subscriptions with invalid filter 
    Log    Trying to get the list of subscriptions using filters with wrong attribute name

    Log    Trying to get the list of subscriptions using filters with wrong attribute name

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${NEG_FILTER}

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}   

    Set Suite Variable    ${response}    ${output}
@@ -170,7 +170,7 @@ Get VNF Indicators Subscriptions with invalid resource endpoint 
        Log    Trying to perform a request on a Uri which doesn't exist

        Log    Trying to perform a request on a Uri which doesn't exist

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscription

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscription

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}   

    Set Suite Variable    ${response}    ${output}
@@ -180,7 +180,7 @@ Send Post Request for VNF Indicator Subscription 
    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}

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

    ${body}=    Get File    jsons/subscriptions.json

    ${body}=    Get File    jsons/subscriptions.json

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

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

    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions    ${body}

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}  

    Set Suite Variable    ${response}    ${output}  

    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1

    Run Keyword If    ${VNFM_CHECKS_NOTIF_ENDPOINT} == 1
@@ -190,7 +190,7 @@ Send Put Request for VNF Indicator Subscriptions 
    Log    Trying to create a new subscription

    Log    Trying to create a new subscription

    ${body}=    Get File    jsons/subscriptions.json

    ${body}=    Get File    jsons/subscriptions.json

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

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

    PUT    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -198,7 +198,7 @@ Send Patch Request for VNF Indicator Subscriptions 
    Log    Trying to create a new subscription

    Log    Trying to create a new subscription

    ${body}=    Get File    jsons/subscriptions.json

    ${body}=    Get File    jsons/subscriptions.json

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

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

    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -206,7 +206,7 @@ Send Delete Request for VNF Indicator Subscriptions 
    Log    Trying to create a new subscription

    Log    Trying to create a new subscription

    ${body}=    Get File    jsons/subscriptions.json

    ${body}=    Get File    jsons/subscriptions.json

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

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

    DELETE    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -240,7 +240,7 @@ Check Postcondition VNF Indicator Subscription Is Set 
    Log    Trying to get the subscription

    Log    Trying to get the subscription

    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions/${response['body']['id']}

    GET    ${apiRoot}/${apiName}/${apiVersion}/subscriptions/${response['body']['id']}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}

    Check HTTP Response Status Code Is    200

    Check HTTP Response Status Code Is    200

SOL002/VNFIndicator-API/VNFIndicators.robot

+11 −11
Original line number Original line Diff line number Diff line
@@ -177,7 +177,7 @@ Get all VNF indicators 
    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -186,7 +186,7 @@ Get VNF indicators with filter 
    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${POS_FIELDS}

    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${POS_FIELDS}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -195,7 +195,7 @@ Get VNF indicators with invalid filter 
    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators?${NEG_FIELDS}

    Get    ${apiRoot}/${apiName}/${apiVersion}/indicators?${NEG_FIELDS}

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -205,7 +205,7 @@ Get all VNF indicators with malformed authorization token 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

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

    Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}

    Set Headers    {"Authorization": "${BAD_AUTHORIZATION}"}

    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -215,7 +215,7 @@ Get all VNF indicators with expired or revoked authorization token 
    Set Headers    {"Accept": "${ACCEPT_JSON}"}

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

    Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}

    Set Headers    {"Authorization": "${NEG_AUTHORIZATION}"}

    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -224,7 +224,7 @@ Get all VNF indicators without authorization token 
    Log    The GET method queries multiple VNF indicators omitting token

    Log    The GET method queries multiple VNF indicators omitting token

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

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

    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -233,7 +233,7 @@ Get all VNF indicators with invalid resource endpoint 
    Set Headers    {"Accept": "${ACCEPT_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": "${AUTHORIZATION}"}

    Log    Execute Query and validate response

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/indicator

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -241,7 +241,7 @@ Send POST Request for all VNF indicators 
    log    Trying to perform a POST. This method should not be implemented

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

    Set Headers  {"Accept":"${ACCEPT_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":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -249,7 +249,7 @@ Send PUT Request for all VNF indicators 
    log    Trying to perform a PUT. This method should not be implemented

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

    Set Headers  {"Accept":"${ACCEPT_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":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -257,7 +257,7 @@ Send PATCH Request for all VNF indicators 
    log    Trying to perform a PATCH. This method should not be implemented

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

    Set Headers  {"Accept":"${ACCEPT_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":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}
@@ -265,7 +265,7 @@ Send DELETE Request for all VNF indicators 
    log    Trying to perform a DELETE. This method should not be implemented

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

    Set Headers  {"Accept":"${ACCEPT_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":"${AUTHORIZATION}"}

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/indicators

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

    ${output}=    Output    response

    ${output}=    Output    response

    Set Suite Variable    ${response}    ${output}

    Set Suite Variable    ${response}    ${output}