Commit b4790308 authored by Mudassar Khan's avatar Mudassar Khan Committed by Giacomo Bernini
Browse files

Fix issue #188: Set Version Header

parent 81952403

SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot

+10 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ DELETE API Version with apiMajorVerion - Method not implemented 
*** Keywords ***

POST API Version

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    Post    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -138,6 +139,7 @@ POST API Version 
	

GET API Version

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    Get    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -145,6 +147,7 @@ GET API Version 
	

PUT API Version

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    Put    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -152,6 +155,7 @@ PUT API Version 
	

PATCH API Version

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    Patch    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -159,6 +163,7 @@ PATCH API Version 
	

DELETE API Version

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    Delete    ${apiRoot}/${apiName}/api_versions

    ${outputResponse}=    Output    response
@@ -166,6 +171,7 @@ DELETE API Version 
	

POST API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -173,6 +179,7 @@ POST API Version with apiMajorVersion 
	

GET API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -180,6 +187,7 @@ GET API Version with apiMajorVersion 
	

PUT API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -187,6 +195,7 @@ PUT API Version with apiMajorVersion 
	

PATCH API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -194,6 +203,7 @@ PATCH API Version with apiMajorVersion 
	

DELETE API Version with apiMajorVersion

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response

SOL003/VirtualisedResourcesQuotaAvailableNotification-API/NotificationEndpoint.robot

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Vr Quota Availibility Notification 
Check resource existence and get CallbackUri

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    Integer    response status    200
@@ -39,6 +40,7 @@ Post Vr Quota Avail Notification 
    log    Trying to perform a POST to get notification

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    ${template} =    Get File    jsons/VrQuotaAvailNotification.json

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}

SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot

+20 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Create Sessions 
    

Check Individual Subscription existence

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    Integer    response status    200
@@ -54,6 +55,7 @@ Check Postcondition VNF Virtualised Resources Quota Available Notification indiv 
Send Post request for Virtualised Resources Quota Available Notification Individual Subscription

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -62,6 +64,7 @@ Send Post request for Virtualised Resources Quota Available Notification Individ 
Put Virtualised Resources Quota Available Notification individual Subscription

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -70,6 +73,7 @@ Put Virtualised Resources Quota Available Notification individual Subscription 
Patch Virtualised Resources Quota Available Notification individual subscription

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -78,6 +82,7 @@ Patch Virtualised Resources Quota Available Notification individual subscription 
Get Virtualised Resources Quota Available Notification individual subscription 

    log    Trying to get information about an individual subscription

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -88,6 +93,7 @@ Get Virtualised Resources Quota Available Notification individual subscription w 
    Set Headers    {"Accept":"${ACCEPT}"}  

    ${scopeValue}=    Create Dictionary    scopeValue=${VRQAN_PERMITTED_SCOPE}

    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -98,6 +104,7 @@ Get Virtualised Resources Quota Available Notification individual subscription w 
    Set Headers    {"Accept":"${ACCEPT}"}  

    ${scopeValue}=    Create Dictionary    scopeValue=${VRQAN_NOT_PERMITTED_SCOPE}

    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -106,6 +113,7 @@ Get Virtualised Resources Quota Available Notification individual subscription w 
Delete Virtualised Resources Quota Available Notification individual subscription

    log    Try to delete an individual subscription

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -115,6 +123,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub 
    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
@@ -134,6 +143,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub 
    Pass Execution If    ${NFVO_DUPLICATION} == 0    NVFO is not permitting duplication. Skipping the test

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
@@ -153,6 +163,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub 
    Pass Execution If    ${NFVO_DUPLICATION} == 1    VNFM permits duplication. Skipping the test

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
@@ -173,6 +184,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub 
    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

    ${scopeValue}=    Create Dictionary    scopeValue=${VRQAN_PERMITTED_SCOPE}

    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}

    Set Headers    {"Version": "${API_VERSION}"}

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

    ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
@@ -193,6 +205,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub 
    Set Headers  {"Content-Type": "${CONTENT_TYPE}"}

    ${scopeValue}=    Create Dictionary    scopeValue=${VRQAN_NOT_PERMITTED_SCOPE}

    ${authorizationToken}=    JWT Encode    payload=${scopeValue}    key=${OAUTH_KEY}    algorithm=${OAUTH_ENCRYPTION_ALGORITHM}

    Set Headers    {"Version": "${API_VERSION}"}

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

    ${template}=    Get File    jsons/vrQuotaAvailSubscriptionRequest.json

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}:${callback_port}    callback_subscribe=${callback_subscribe}
@@ -210,6 +223,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub 
GET Virtualised Resources Quota Available Notification Subscriptions

    Log    Get the list of active subscriptions

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions
@@ -219,6 +233,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions 
GET Virtualised Resources Quota Available Notification Subscriptions with nextpage_opaque_marker parameter

    Log    Get next page of subscriptions

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    Log    Execute Query using the URI provided in the previous GET request and validate response

    Get    ${nextPageUri}
@@ -228,6 +243,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions with nextpa 
GET Virtualised Resources Quota Available Notification Subscriptions with Filter

    Log    Get the list of active subscriptions

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

    Set Headers    {"Version": "${API_VERSION}"}

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

    Log    Execute Query and validate response

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}
@@ -237,6 +253,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions with Filter 
Get Virtualised Resources Quota Available Notification subscriptions with Bad Request Invalid attribute-based filtering parameters    

     Log    Get the list of active subscriptions using an invalid filter

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -246,6 +263,7 @@ Send Put request for Virtualised Resources Quota Available Notification subscrip 
    log    Trying to perform a PUT. This method should not be implemented

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -255,6 +273,7 @@ Send Patch request for Virtualised Resources Quota Available Notification subscr 
    log    Trying to perform a Patch. This method should not be implemented

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response
@@ -264,6 +283,7 @@ Send Delete request for Virtualised Resources Quota Available Notification subsc 
    log    Trying to perform a Delete. This method should not be implemented

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

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

    Set Headers    {"Version": "${API_VERSION}"}

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

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

    ${outputResponse}=    Output    response

SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ ${notification_response} [] 
${apiRoot}        /

${apiName}        vrqan

${apiMajorVersion}     v1

${API_VERSION}    1.12.0



${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar