Commit 5a2af762 authored by Michele Carignani's avatar Michele Carignani
Browse files

fixes to notifications

parent c4a5a9d8

SOL003/VNFLifecycleManagement-API/SubscriptionKeywords.robot

+11 −5
Original line number Original line Diff line number Diff line
@@ -47,15 +47,19 @@ Configure Notification VNF Instance Handler 
    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}

    &{notification_request}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON"    body=${BODY}

    &{headers}=  Create Dictionary  "Content-Type"="application/json"

    &{headers}=  Create Dictionary  "Content-Type"="application/json"

    &{notification_response}=  Create Mock Response     headers=${headers}  status_code=204

    &{notification_response}=  Create Mock Response     headers=${headers}  status_code=204

    Create Mock Expectation  ${Notification_request}  ${notification_response}

    ${exp}=  Create Mock Expectation  ${Notification_request}  ${notification_response}

    [Return]  ${notification_request}





Configure Notification Forward

Configure Notification Forward

    [Arguments]    ${element}    ${endpoint}    ${endpoint_fwd}

    [Arguments]    ${element}    ${endpoint}    ${endpoint_fwd}

    ${json}=    Get File    schemas/${element}.schema.json

    ${BODY}=	evaluate	json.loads('''${json}''')	json

    ${BODY}=	evaluate	json.loads('''${json}''')	json

    Log  ${BODY}

    Log  Creating mock HTTP forward to handle ${element}

    Log  Creating mock HTTP forward to handle ${element}

    &{notification_tmp}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON_SCHEMA"    body=${BODY}

    &{notification_tmp}=  Create Mock Request Matcher	POST  ${endpoint}  body_type="JSON_SCHEMA"    body=${BODY}

    &{notification_fwd}=  Create Mock Http Forward	${endpoint_fwd}

    &{notification_fwd}=  Create Mock Http Forward	${endpoint_fwd}

    Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}

    Create Mock Expectation With Http Forward  ${notification_tmp}  ${notification_fwd}

    [Return]  notification_tmp





Check Operation Notification

Check Operation Notification

    [Arguments]    ${element}    ${status}=""

    [Arguments]    ${element}    ${status}=""
@@ -63,14 +67,16 @@ Check Operation Notification 
    Configure Notification Forward    ${element}    ${callback_endpoint}    ${callback_endpoint_fwd}

    Configure Notification Forward    ${element}    ${callback_endpoint}    ${callback_endpoint_fwd}

    Configure Notification Status Handler    ${callback_endpoint_fwd}    ${status}

    Configure Notification Status Handler    ${callback_endpoint_fwd}    ${status}

    ${verify}=   Create Dictionary

    ${verify}=   Create Dictionary

    Wait Until Keyword Succeeds    2 min   10 sec   Verify Mock Expectation    ${verify}

    Wait Until Keyword Succeeds    10 sec   10 sec   Verify Mock Expectation    ${verify}

    Clear Requests    ${callback_endpoint}

    Clear Requests    ${callback_endpoint}

    Clear Requests    ${callback_endpoint_fwd}

    Clear Requests    ${callback_endpoint_fwd}





Check VNF Instance Operation Notification

Check VNF Instance Operation Notification

    [Arguments]    ${element}   ${instance_id}

    [Arguments]    ${element}   ${instance_id}

    ${json}=	Get File	schemas/${element}.schema.json

    ${json}=	Get File	schemas/${element}.schema.json

    Configure Notification Forward    ${element}    ${callback_endpoint}    ${callback_endpoint_fwd}

    ${req1}=  Configure Notification Forward    ${element}    ${callback_endpoint}    ${callback_endpoint_fwd}

    Configure Notification VNF Instance Handler    ${callback_endpoint_fwd}    ${instance_id}

    ${req2}=  Configure Notification VNF Instance Handler    ${callback_endpoint_fwd}    ${instance_id}

    Check Operation Notification  vnfLcmOperationOccurrenceNotification  204

    Wait Until Keyword Succeeds    12 sec   3 sec   Verify Mock Expectation    ${req1}

    Clear Requests    ${callback_endpoint}

    Clear Requests    ${callback_endpoint_fwd}

SOL003/VNFLifecycleManagement-API/CreateVNFWorkflow.robot

+5 −5

File changed.

Contains only whitespace changes.