Commit 5616c8ce authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

updated authorization header and token use in SOL005 v2.7.1

parent b53baf87

SOL005/NSDManagement-API/ApiVersion.robot

+10 −10
Original line number Diff line number Diff line
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented 
*** Keywords ***

POST API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

GET API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PUT API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PATCH API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

DELETE API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

POST API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

GET API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PUT API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PATCH API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

DELETE API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+125 −125

File changed.

Preview size limit exceeded, changes collapsed.

SOL005/NSDManagement-API/NotificationConsumer.robot

+189 −189
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ Pnfd Deletion Notification 
Check resource existence and get CallbackUri

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

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

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

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

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

    Integer    response status    200

    Validate Json    response body    PkgmSubscription.schema.json
@@ -112,7 +112,7 @@ Post NSD Onboarding Notification 
    log    Trying to perform a POST to get notification

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

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

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

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

    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File

    ${template} =    Get File    jsons/notifications/NsdOnBoardingNotification.json

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}
@@ -124,7 +124,7 @@ Post NSD Onboarding Failure Notification 
    log    Trying to perform a POST to get notification

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

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

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

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

    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File    

    ${template} =    Get File    jsons/notifications/NsdOnBoardingFailureNotification.json

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}
@@ -136,7 +136,7 @@ Post NSD Change Notification 
    log    Trying to perform a POST to get notification

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

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

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

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

    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File        

    ${template} =    Get File    jsons/notifications/NsdChangeNotification.json

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}
@@ -148,7 +148,7 @@ Post NSD Deletion Notification 
    log    Trying to perform a POST to get notification

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

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

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

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

    Run Keyword If    ${check_descriptors} == 1    PARSE the NS Descriptor File        

    ${template} =    Get File    jsons/notifications/NsdDeletionNotification.json

    ${body}=        Format String   ${template}    subscriptionId=${subscriptionId}    nsdInfoId=${nsdInfoId}    nsdId=${NS_DescriptorID}
@@ -160,7 +160,7 @@ Post Pnfd Onboarding Notification 
    log    Trying to perform a POST to get notification

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

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

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

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

    ${template} =    Get File    jsons/notifications/PnfdOnBoardingNotification.json

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

    Post    ${callbackResp}    ${body}
@@ -171,7 +171,7 @@ Post Pnfd Onboarding Failure Notification 
    log    Trying to perform a POST to get notification

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

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

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

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

    ${template} =    Get File    jsons/notifications/PnfdOnBoardingFailureNotification.json

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

    Post    ${callbackResp}    ${body}
@@ -182,7 +182,7 @@ Post Pnfd Deletion Notification 
    log    Trying to perform a POST to get notification

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

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

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

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

    ${template} =    Get File    jsons/notifications/pnfdDeletionNotification.json

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

    Post    ${callbackResp}    ${body}

SOL005/NSDManagement-API/environment/variables.txt

+4 −3
Original line number Diff line number Diff line
@@ -2,12 +2,13 @@ 
${NFVO_HOST}    localhost    # Hostname of the NFVO

${NFVO_PORT}    8081    # Listening port of the NFVO

${NFVO_SCHEMA}    https

${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42

${AUTHORIZATION_HEADER}    Authorization

${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42

${CONTENT_TYPE_JSON}    application/json

${ACCEPT_JSON}    application/json

${apiRoot}        /

${AUTH_USAGE}     1

${NEG_AUTHORIZATION}    Bearer negativetoken

${NEG_AUTHORIZATION_TOKEN}    Bearer negativetoken

${apiMajorVersion}     v1

${apiName}        nsd

${FIELD_USAGE}    1
@@ -67,7 +68,7 @@ ${onboardingStateNsdInfoId} b992a851-08b1-45a8-9282-a5f7a7df04a6 
${contentZipNsd}    files/nsd.zip

${contentFileNsd}    files/nsd.yml

${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44

${BAD_AUTHORIZATION}    Bear sometoken

${BAD_AUTHORIZATION_TOKEN}    Bear sometoken

${original_etag}    1234

${wrong_etag}    abcd

${usageState}    state

SOL005/NSFaultManagement-API/ApiVersion.robot

+10 −10
Original line number Diff line number Diff line
@@ -133,70 +133,70 @@ DELETE API Version with apiMajorVerion - Method not implemented 
*** Keywords ***

POST API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

GET API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PUT API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PATCH API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

DELETE API Version

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

POST API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

GET API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PUT API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

PATCH API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse} 

	

DELETE API Version with apiMajorVersion

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

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

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

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

    ${outputResponse}=    Output    response

	Set Global Variable    ${response}    ${outputResponse}