Commit 0e0d6857 authored by Najam UI Hassan's avatar Najam UI Hassan
Browse files

added majorApiVersion

parent d19e1707

SOL003/VirtualisedResourcesQuotaAvailableNotification-API/ApiVersion.robot

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

POST API Version with apiMajorVersion

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

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

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

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

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

    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/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}"} 

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

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

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

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

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/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}"} 

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

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

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

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

    Put    ${apiRoot}/${apiName}/${apiMajorVersion}/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}"} 

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

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

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

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

    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/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}"} 

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

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

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

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

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

    ${outputResponse}=    Output    response

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	Set Global Variable    ${response}    ${outputResponse}

SOL003/VirtualisedResourcesQuotaAvailableNotification-API/VRQANOperationKeywords.robot

+16 −16
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ Create Sessions 
Check Individual Subscription existence

Check Individual Subscription existence

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

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

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

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

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

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

    Integer    response status    200

    Integer    response status    200





Check HTTP Response Status Code Is

Check HTTP Response Status Code Is
@@ -53,7 +53,7 @@ Send Post request for Virtualised Resources Quota Available Notification Individ 
    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}"}

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

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

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

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -61,7 +61,7 @@ Put Virtualised Resources Quota Available Notification individual 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}"}

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

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

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

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -69,7 +69,7 @@ Patch Virtualised Resources Quota Available Notification individual subscription 
    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}"}

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

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

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

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -77,7 +77,7 @@ Get Virtualised Resources Quota Available Notification individual subscription 
    log    Trying to get information about an individual subscription

    log    Trying to get information about an individual subscription

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

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

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

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

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -85,18 +85,18 @@ Delete Virtualised Resources Quota Available Notification individual subscriptio 
    log    Try to delete an individual subscription

    log    Try to delete an individual subscription

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

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

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

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

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}

    

    

Send Post request for new Virtualised Resources Quota Available Notification subscription 

Send Post request for new Virtualised Resources Quota Available Notification subscription 

    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiVersion}/subscriptions

    Log    Create subscription instance by POST to ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions

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

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

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

    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":"${AUTHORIZATION}"}

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

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

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -108,7 +108,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

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

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

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -120,7 +120,7 @@ Send Post request for new Virtualised Resources Quota Available Notification sub 
    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization": "${AUTHORIZATION}"}

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

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

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

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}

    ${body}=        Format String   ${template}    callback_uri=${callback_uri}    callback_subscribe=${callback_subscribe}

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -129,7 +129,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions 
    Set Headers  {"Accept":"${ACCEPT}"} 

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

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -138,7 +138,7 @@ GET Virtualised Resources Quota Available Notification Subscriptions with Filter 
    Set Headers  {"Accept":"${ACCEPT}"}

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

    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}/${apiVersion}/subscriptions?${sub_filter}

    Get    ${apiRoot}/${apiName}/${apiMajorVersion}/subscriptions?${sub_filter}

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -146,7 +146,7 @@ Get Virtualised Resources Quota Available Notification subscriptions with Bad Re 
     Log    Get the list of active subscriptions using an invalid filter

     Log    Get the list of active subscriptions using an invalid filter

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

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

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

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

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}

    Set Global Variable    ${response}    ${outputResponse}
@@ -155,7 +155,7 @@ Send Put request for Virtualised Resources Quota Available Notification subscrip 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

    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":"${AUTHORIZATION}"}

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse} 

    Set Global Variable    ${response}    ${outputResponse}
@@ -164,7 +164,7 @@ Send Patch request for Virtualised Resources Quota Available Notification subscr 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

    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":"${AUTHORIZATION}"}

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}  

    Set Global Variable    ${response}    ${outputResponse}
@@ -173,7 +173,7 @@ Send Delete request for Virtualised Resources Quota Available Notification subsc 
    Set Headers  {"Accept":"${ACCEPT}"}  

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

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

    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":"${AUTHORIZATION}"}

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

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

    ${outputResponse}=    Output    response 

    ${outputResponse}=    Output    response 

    Set Global Variable    ${response}    ${outputResponse}     

    Set Global Variable    ${response}    ${outputResponse}

SOL003/VirtualisedResourcesQuotaAvailableNotification-API/environment/variables.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ ${sleep_interval} 20s 




${apiRoot}        /

${apiRoot}        /

${apiName}        vrqan

${apiName}        vrqan

${apiVersion}     v1

${apiMajorVersion}     v1





${VrQuotaAvailNotification}    {}

${VrQuotaAvailNotification}    {}

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

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