Commit aacc11c9 authored by Frank Bryden's avatar Frank Bryden Committed by Frank Bryden
Browse files

Templated JSON files in SOL005/ along with minor bug fixes 



Signed-off-by: default avatarbrydenf <frank.bryden@etsi.org>
parent b30d067e

SOL005/NSDManagement-API/NSDManagementKeywords.robot

+9 −4
Original line number Original line Diff line number Diff line
@@ -815,7 +815,8 @@ Send Post Request for NSD Management Subscription 
    Log    Trying to create a new subscription

    Log    Trying to create a new subscription

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

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

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

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

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

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

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

    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    ${body}

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

    ${output}=    Output    response

    ${output}=    Output    response
@@ -828,7 +829,8 @@ Send Post Request for Duplicated NSD Management Subscription 
    Log    Trying to create a subscription with an already created content

    Log    Trying to create a subscription with an already created content

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

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

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

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

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

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

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

    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    ${body}

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

    ${output}=    Output    response

    ${output}=    Output    response
@@ -880,6 +882,7 @@ Check HTTP Response Body Json Schema Is 
    [Arguments]    ${input}

    [Arguments]    ${input}

    Should Contain    ${response['headers']['Content-Type']}    application/json

    Should Contain    ${response['headers']['Content-Type']}    application/json

    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json

    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json

    Log     ${response['body']}

    Validate Json    ${schema}    ${response['body']}

    Validate Json    ${schema}    ${response['body']}

    Log    Json Schema Validation OK  

    Log    Json Schema Validation OK
@@ -895,7 +898,8 @@ Check HTTP Response Body Subscriptions Match the requested Attribute-Based Filte 




Check HTTP Response Body NsdmSubscription Attributes Values Match the Issued Subscription

Check HTTP Response Body NsdmSubscription Attributes Values Match the Issued Subscription

    Log    Check Response matches subscription

    Log    Check Response matches subscription

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

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

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

    ${subscription}=    evaluate    json.loads('''${body}''')    json

    ${subscription}=    evaluate    json.loads('''${body}''')    json

    Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}

    Should Be Equal As Strings    ${response['body']['callbackUri']}    ${subscription['callbackUri']}
@@ -922,7 +926,8 @@ Check Postcondition Subscription Resource Returned in Location Header Is Availab 
    ${result}=    Output    response body

    ${result}=    Output    response body

    Validate Json    NsdmSubscription.schema.json    ${result}

    Validate Json    NsdmSubscription.schema.json    ${result}

    Log    Validated NsdmSubscription schema

    Log    Validated NsdmSubscription schema

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

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

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

    ${subscription}=    evaluate    json.loads('''${body}''')    json

    ${subscription}=    evaluate    json.loads('''${body}''')    json

    Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}

    Should Be Equal    ${result['callbackUri']}    ${subscription['callbackUri']}

    Log    Validated Issued subscription is same as original

    Log    Validated Issued subscription is same as original

SOL005/NSDManagement-API/environment/nsDescriptors.txt

+4 −4
Original line number Original line Diff line number Diff line 
*** Variables ***

*** Variables ***

${POS_FIELDS}     name=nsdOnboardingState

${POS_FIELDS}     name=nsdOnboardingState

${NEG_FIELDS}     wrongName=any_value

${NEG_FIELDS}     wrongName=any_value

${nsdInfoId}    	7abbe544-6a51-4c86-af55-3a345f80e7cc

${nsdInfoId}    	9e708376-4f96-4972-89c2-243760626f20

${nsdInfoIdPlain}    20734bbb-abf6-4cd8-a35d-f416f95dc180

${nsdInfoIdPlain}    01872c48-3631-4060-afa8-ca7cbef8a4d8

${nsdInfoIdZip}    	352fac1d-ddce-454b-b072-184cf5ed94f5

${nsdInfoIdZip}    	01872c48-3631-4060-afa8-ca7cbef8a4d8

${nsdDownloadableZip}   f3ce866a-a935-49db-9f39-8b14b662cedc

${nsdDownloadableZip}   cac6ac71-0fdf-45d1-a056-775cbb8157b5

${erroneous_nsdInfoId}  erroneous_nsdInfoId

${erroneous_nsdInfoId}  erroneous_nsdInfoId

${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56

${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56

${fields}    _links

${fields}    _links

SOL005/NSDManagement-API/environment/pnfDescriptors.txt

+2 −2
Original line number Original line Diff line number Diff line 
*** Variables ***

*** Variables ***

${POS_FIELDS}     name=pnfdOnboardingState

${POS_FIELDS}     name=pnfdOnboardingState

${NEG_FIELDS}     wrongName=any_value

${NEG_FIELDS}     wrongName=any_value

${pnfdInfoId}     3327be9e-f716-43ac-aaeb-fcd54b0a5369 #used for testing downloads

${pnfdInfoId}     b227e618-cdb9-485b-8bfe-d4b8dee8e678 #used for testing downloads

${pnfdInfoUpld}   93c4cca6-b68b-4aa0-b06a-0e3725995585 #used for testing uploads 

${pnfdInfoUpld}   dd7ff0f8-0e63-41b4-a572-568d0db30153 #used for testing uploads 

${erroneous_pnfdInfoId}  erroneous_pnfdInfoId

${erroneous_pnfdInfoId}  erroneous_pnfdInfoId

${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348

${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348

${NFVO_FIELDS}    1

${NFVO_FIELDS}    1

SOL005/NSDManagement-API/environment/subscriptions.txt

+2 −1
Original line number Original line Diff line number Diff line 
*** Variables ***

*** Variables ***

${filter_ok}      callbackUri=http://172.22.1.7:9091/nsd/subscriptions

${notifCallbackUri}     http://172.22.1.7:9091/nsd/subscriptions

${filter_ok}      callbackUri=${notifCallbackUri}

${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based

${filter_ko}      nfvId=f9f130e4-05eb-4082-a676-4c97d13a883d    # Not existant filter attribute-based

${SEPERATOR}      =
 
${SEPERATOR}      =
 
 No newline at end of file

SOL005/NSDManagement-API/environment/variables.txt

+1 −2
Original line number Original line Diff line number Diff line
@@ -2,8 +2,7 @@ 
${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO

${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO

${NFVO_PORT}    9999    # Listening port of the NFVO

${NFVO_PORT}    9999    # Listening port of the NFVO

${NFVO_SCHEMA}    https

${NFVO_SCHEMA}    https

#auth token for OSM Access

${AUTHORIZATION}    Bearer lTxE0BXRcVPjlIUwHLVH5Dtjl39sZ9qp 

${AUTHORIZATION}    Bearer YguA4klaSzOxwE65MJ7aAWZvkOj2gAup 

${CONTENT_TYPE_JSON}    application/json

${CONTENT_TYPE_JSON}    application/json

${ACCEPT_JSON}    application/json

${ACCEPT_JSON}    application/json

${apiRoot}        /osm/

${apiRoot}        /osm/