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

Fix issue #188: Set version headers

parent 9ce95381

SOL003/VNFFaultManagement-API/ApiVersion.robot

+10 −0
Original line number Diff line number Diff line
@@ -133,6 +133,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
@@ -140,6 +141,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
@@ -147,6 +149,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
@@ -154,6 +157,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
@@ -161,6 +165,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
@@ -168,6 +173,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
@@ -175,6 +181,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
@@ -182,6 +189,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
@@ -189,6 +197,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
@@ -196,6 +205,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/VNFFaultManagement-API/FaultManagement-APIKeyword.robot

+59 −2

File changed.

Preview size limit exceeded, changes collapsed.

SOL003/VNFFaultManagement-API/NotificationEndpoint.robot

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ VNF Fault Alarm List Reulit 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
@@ -64,6 +65,7 @@ Post Alarm 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/AlarmNotification.json

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}
@@ -75,6 +77,7 @@ Post Alarm Cleared 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/AlarmClearedNotification.json

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}   alarmId=${alarmId}
@@ -86,6 +89,7 @@ Post Alarm List Rebuilt 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/AlarmListRebuiltNotification.json

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

SOL003/VNFFaultManagement-API/environment/variables.txt

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ ${NFVO_FIELDS} 1 
${apiRoot}        /

${apiName}        vnffm

${apiMajorVersion}     v1

${API_VERSION}    1.14.0



${nextPageUri}    /some_uri